summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-10-13Merge branch 'master' into talmdal_devTim Almdal
Conflicts:
2009-10-13refactor the user and group helpers into the gallery core module. 2 reason, ↵Tim Almdal
first it makes sense that users and groups are a gallery requirement and belong in core. secondly, prepares the way for the Identity refactor.
2009-10-13Refactor the ui component of the user module into the gallery core module.Tim Almdal
2009-10-13remove duplicate function definitionTim Almdal
2009-10-13Merge branch 'master' into talmdal_devTim Almdal
2009-10-13forgot to add a break statement when i pastedTim Almdal
2009-10-13Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/helpers/gallery_block.php modules/gallery/helpers/gallery_theme.php modules/gallery/helpers/user.php modules/user/helpers/user_event.php
2009-10-13Continue to refactor locale and gallery3 ui from the user module to the ↵Tim Almdal
gallery module
2009-10-13remove the unused private function user::_md5Salt()Tim Almdal
2009-10-13refactor locale related functionality out of the user module and into the ↵Tim Almdal
gallery module.
2009-10-13Correct typo in method nameTim Almdal
2009-10-13Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/controllers/admin_users.php modules/gallery/controllers/password.php modules/gallery/helpers/group.php modules/gallery/helpers/user.php modules/notification/helpers/notification.php
2009-10-09Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-10-13Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-10-13Don't allow users to change the file extension of photos/moviesBharat Mediratta
If you can change the extension, then you can alter the way the server handles the file, which is a security problem. So for example, you can change a .JPG to a .PHP and then if you put some malicious PHP code in the EXIF data, you can get the server to execute it. Vulnerability is low because only users who have edit permissions could do this. Fixes ticket #846
2009-10-11Use SQL_CALC_FOUND_ROWS instead of doing the search twice, for better ↵Bharat Mediratta
performance. Fixes ticket #835, thanks Joe7!
2009-10-11Make the slug field required for all items.Bharat Mediratta
Make the filename field required for photos/movies. Fixes ticket #838
2009-10-09Fixed resized photo float issue, added g-clearfix to g-pager on the photo ↵Chad Kieffer
view. Tightened up g-pager styles. Removed a few unecessary !importants.
2009-10-09update the Access_Helper_Test to use the user::lookup_by_name API method.Tim Almdal
2009-10-09Add support for the in filter to get_user_list and get_group_list. Convert ↵Tim Almdal
the notifications to use user::get_user_list instead of accessing the table directly.
2009-10-09Convert direct lookups for the user table using ORM to using the ↵Tim Almdal
user::lookup_by_name and user_lookup API methods. Convert the Admin_User controller Convert the login and password change controller Change the item model to call user::lookup to get the owner. On the log model, delete the relationship between the log and user table, and replace with a call to user::lookup (cherry picked from commit 194cc3b27a73afe5119da9f09407c1e068dc6fa3) Create the get_user_list, lookup_by_name, lookup_by_hash and get_group_list api functions
2009-10-08Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/helpers/user.php
2009-10-08Change the users.php controller so its no longer restful. The problem with ↵Tim Almdal
our approach to restfulness is that it assumes that the resource will be found in the gallery database. It may well be there, but in the case of using plugable drivers for users management, there are no guarantees that it is in our database or it could be in a ldap directory. So it was just easier to remove the restfulness and just call user::lookup instead. (cherry picked from commit b3211cb2a8282556d410c91771baeb764d47ed10)
2009-10-08Apply commit 80bb78fa to the nightwind themeTim Almdal
2009-10-08Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-10-08Add the rotate clockwise and counter clockwise to the theme imagesTim Almdal
2009-10-08Darken the body background.Tim Almdal
2009-10-08Change the color of the icon pack to darker shades instead of orangeTim Almdal
2009-10-08A clone of the Gallery Wind theme that is based on darker colors. We can ↵Tim Almdal
move it to -contrib if that's the desire, but i'd thought i'd put it here for now.
2009-10-08Part of the previous commit, forgot to save... againTim Almdal
2009-10-08If the Identity backend is not writable don't display the "Forgot Your ↵Tim Almdal
Password" link
2009-10-07Forgot to save these before the last commitTim Almdal
2009-10-07Merge branch 'master' into talmdal_devTim Almdal
2009-10-07Implement a user::is_writable() API method and disable the user add, updates ↵Tim Almdal
and display if the Identity driver does not support writes. This is set in the config.identity.php
2009-10-07Grouped rtl styles in the admin theme. Removed #g-forgot-password-link, it ↵Chad Kieffer
doesn't style the element. Added g-left and g-right in missing places.
2009-10-07Change the users.php controller so its no longer restful. The problem with ↵Tim Almdal
our approach to restfulness is that it assumes that the resource will be found in the gallery database. It may well be there, but in the case of using plugable drivers from users, it could be in a ldap directory, it could be the gallery3 database, but the model could be wrapped in a control structure. So it was just easier to remove the restfulness and just call user::lookup instead.
2009-10-07Change the __set method on User_Definition to actually set the value as ↵Tim Almdal
opposed to return it.
2009-10-07Update fix ie style sheets to include .g-clearfix.Chad Kieffer
2009-10-07Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-10-07D'oh! Forgot the :after pseudo selector for .g-clearfixChad Kieffer
2009-10-07Replaced most clear fix hacks with generic class.Chad Kieffer
2009-10-07Merge branch 'master' of github.com:gallery/gallery3Chad Kieffer
2009-10-07Consolidated the rest of the base message styles into lib/gallery.common.css ↵Chad Kieffer
and applied updates to views. Moved over draggable/droppable styles. Use g-target consistently for drag/drop interactions. Minor re-ordering of selectors in gallery.common.css. Updates to css comments.
2009-10-06Remove debugging lines (thanks talmdal!)Bharat Mediratta
2009-10-06Update gallery::find_file to look for subdirectories in lib, then fallBharat Mediratta
back to looking in just lib itself. This is not consistent behavior with the rest of our module structure, though so we should probably make it more consistent. Fix up the permission images to use gallery::find_file again.
2009-10-06Rename permissions icons to correspond to view states, move to lib/images. ↵Chad Kieffer
Fixed references to them in the edit permissions view.
2009-10-06Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-10-06Change the focus of the user module from providing user/group management to ↵Tim Almdal
providing the default Identity implementation. * Remove the user_event callbacks and move them to the gallery_event callbacks. This will insure that the active user is always loaded (because the gallery callbacks are always called first) to its available to other gallery_ready handlers. Moved the method set_request_locale to the locales helper as it is more related to locales. * Move the user controllers and views into the gallery module. * Move the theme and block processing out of the user module and into core.
2009-10-06Allow a groups property on the User implementation and load the Identity ↵Tim Almdal
drivers early in the process so the session deserialization works.
2009-10-06Clean up extra single quotes from copy and pasteTim Almdal