stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-30 19:50:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph
2269 Commits
Author SHA1 Message Date
Tim Almdal cdf5a4fcbf Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/gallery/helpers/gallery_event.php
 2009-10-23 19:58:15 -07:00
Tim Almdal 68411cc903 Allow themes to override event handlers. In gallery::ready() grab the server 
PATH_INFO and pass it to the theme::load_themes method.  If it starts with
\"/admin\", then set the theme to the active admin theme, otherwise set it to
the active site theme.  Fixes ticket #841: Themes cannot overload event classes."
 2009-10-23 17:58:55 -07:00
Tim Almdal d0186436de Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/gallery/tests/Albums_Controller_Test.php
	modules/user/helpers/user.php
 2009-10-23 10:01:40 -07:00
Tim Almdal aa85d27eab Initialize the slug field when doing the update tests 2009-10-23 09:52:03 -07:00
Tim Almdal 703f22abcb Only look for tests that are in the active modules. Update the controller golden file to reflect the current location of files. 2009-10-23 09:41:33 -07:00
Tim Almdal 2e998664d5 move controllers and views to the user module to make the Identity Provider refactor smaller 2009-10-23 09:23:02 -07:00
Tim Almdal b3e175006c Move the filters that the File_Structure_Test use into a seperate file so other tests. can use them. Add a No_Direct_ORM_Access_Test to find all places that the user or group table are accessed outside of the user module. This test will fail at this point, as it in preparation for the IdentityProvider refactor. 2009-10-23 07:48:07 -07:00
Tim Almdal 9297325c27 Minor changes to more closely align this branch with master 2009-10-23 06:52:08 -07:00
Tim Almdal 923a322ef5 Change the Admin_Identity_Controller to not destroy the session until after the new provider is installed. 2009-10-23 06:09:24 -07:00
Chad KiefferandTim Almdal 040c840b66 Make g-inline more specific, replace universal selector with an li since this class will most often be used with order and unordered lists. Apply g-inline to the the login menu and footer credits. 2009-10-23 05:41:49 -07:00
Chad KiefferandTim Almdal 367e6a8983 Standardize message markup, make the update block status message translatable. 2009-10-23 05:41:41 -07:00
Chad Kieffer da73c0c25f Poor man's merge. Note to self, git pull before working. Next pound the steps to merge into your head. 2009-10-22 23:36:05 -06:00
Tim Almdal b74b131e25 Change Identity adminstration to use the uninstall/install methods when changing providers. 2009-10-22 22:30:25 -07:00
Tim Almdal 89ca1590e4 When uninstalling a module call graphics:remove_rules instead of graphics remove_rule. 2009-10-22 22:30:24 -07:00
Chad Kieffer 80c6bf789b Make g-inline more specific, replace universal selector with an li since this class will most often be used with order and unordered lists. Apply g-inline to the the login menu and footer credits. 2009-10-22 22:28:55 -06:00
Chad Kieffer ba62fb4b0e Standardize message markup, make the update block status message translatable. 2009-10-22 22:06:36 -06:00
Tim Almdal 36adc11f05 move the direct orm test to the users module. 2009-10-22 13:30:32 -07:00
Tim Almdal f4176ae97d Rename No_Direct_access_Test and change the require_once to fully qualify the path to Gallery_Filters.php 2009-10-22 13:29:12 -07:00
Tim Almdal 6b51de49c5 Change the modifier on activate and deactivate methods to static as they are in a helper class. 2009-10-22 13:28:23 -07:00
Tim Almdal 3c936d661a Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class 2009-10-22 13:11:03 -07:00
Tim Almdal 4cb9ec1d6d Use the request::referrer to determine if we are editting the photo or album 
from the context menu or from its photo or album page.
Fixes ticket #745.  Thanks to jankoprowski for the referrer approach.
 2009-10-22 13:11:02 -07:00
Tim Almdal 51a69d7218 Merge branch 'master' into talmdal_dev 2009-10-22 07:40:50 -07:00
Tim Almdal 95f3eb3aad When an album or photo is updated always return the photo/album location as 
part of the response.  This insures that if the internet address changes, then
the page will reload properly.
 2009-10-22 07:37:14 -07:00
Tim Almdal 6502b61348 Merge branch 'master' into talmdal_dev 2009-10-22 07:36:37 -07:00
Bharat Mediratta 416470fcb2 Internationalize confirmation message. 2009-10-22 07:35:26 -07:00
Tim Almdal 5e4576632d Correct white space 2009-10-21 16:02:34 -07:00
Tim Almdal 7638834e97 Address the issue of the administrator changing the identity provider whilst users are logged onto the system. Addressed the issue by adding try/catch logic to the Session::load_user() method. If load_user fails for any reason, then assume that the identity provider has changed, destroy the current session and redirect to the root album. 2009-10-21 15:17:23 -07:00
Tim Almdal b994ea9d62 use the appropriate API's 2009-10-21 11:53:41 -07:00
Tim Almdal b528fbde57 Change this files to use the API instead of referencing the group tables directly 2009-10-21 11:50:42 -07:00
Tim Almdal f04177f138 re-add the lookup_group_by_name API Method. 2009-10-21 11:49:42 -07:00
Tim Almdal 182c8414a1 Add the Gallery File Filters and a test to check that the user/group table is only accessed from the user module. 2009-10-21 11:48:40 -07:00
Tim Almdal 59a001b491 Merge branch 'master' into talmdal_dev 2009-10-21 11:47:40 -07:00
Tim Almdal b91da74726 Correct phpDoc 2009-10-21 11:47:21 -07:00
Tim Almdal ea2ab0c654 Create a No_Direct_Access test which initially checks to insure there is no direct access to the users and groups table defined by the user module. 2009-10-21 09:32:27 -07:00
Tim Almdal a2048ab303 Merge branch 'master' into talmdal_dev 
Conflicts:
	lib/gallery.common.css
 2009-10-21 07:07:53 -07:00
Chad Kieffer e025abea41 Added confirmation message for block admin actions. 2009-10-20 23:37:03 -06:00
Chad Kieffer 055c410126 Fix block management UI. Block list height is now dynamically set based on the total number of available blocks which will grow without hardcoding CSS heights and setting the div to be scrollable. 2009-10-20 23:20:38 -06:00
Chad Kieffer fbb8e92497 Added generic .g-message class to mark form validation messages. Minor form layout updates. 2009-10-20 22:35:39 -06:00
Tim Almdal 0d53ed619a remove the lookup_group_by_name as it is not referenced 2009-10-20 17:24:17 -07:00
Tim Almdal b28c758d4a Add lookup_group Identity provider API and change the permissions controller to use it to get the group it is modifying 2009-10-20 17:21:33 -07:00
Tim Almdal 3ece1a01f2 Add a groups api method on the Identity provider and change access_Core::_get_all_groups() to use this to get the defined groups. 2009-10-20 17:01:19 -07:00
Tim Almdal 7f9441c33d Changes to Identity interface to allow for multiple Identity providers. What I've tested to this point, is you can install a new provider, switch to it, login as administrator, uninstall the default user module, reinstall the user module, switch back to the user module and login. 2009-10-20 16:32:22 -07:00
Tim Almdal 098b57bf18 Simplify the user interface by moving the password reset functionality into the user module 
Bagging the User_Definition and Group_Definition abstract classes and replacing them with interfaces with the same names.
Make sure all the unit tests work.
 2009-10-19 12:53:44 -07:00
Tim Almdal 1b530e4680 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/user/views/admin_users.html.php
 2009-10-19 06:27:18 -07:00
Chad Kieffer b2d0b3ebbb Fix sidebar block admin layout. Don't hardcode block list height, use the equal_heights() function to set it. 2009-10-18 23:38:27 -06:00
Chad Kieffer 6a7db5bea1 Resolve merge conflict. 2009-10-18 20:39:31 -06:00
Chad Kieffer 5f56cbf997 Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's. 2009-10-18 20:22:10 -06:00
Tim Almdal 301754db73 Create a administration page that allows the administrator to change the the Identity provider if more than two are Identity providers are installed 2009-10-18 18:16:19 -07:00
Chad Kieffer 91ab6f161f Apply g-block and g-block-content, remove hover effect, alternate row color. 2009-10-18 18:01:42 -06:00
Tim Almdal 090c4d016b Merge branch 'master' into talmdal_dev 
Conflicts:
	lib/gallery.common.css
	themes/admin_wind/views/admin.html.php
	themes/night_wind/views/sidebar.html.php
	themes/wind/views/sidebar.html.php
 2009-10-18 09:28:48 -07:00