 Tim Almdal
|
c24d01bb9c
|
Standardize the use of the lookup methods
|
2009-10-23 10:52:42 -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
|
e3d6920cd9
|
synchronize with the master branch
|
2009-10-23 08:36:49 -07:00 |
|
|
Tim Almdal
|
8a73b81dd9
|
Merge branch 'master' into talmdal_dev
|
2009-10-23 07:57:12 -07:00 |
|
|
Tim Almdal
|
94cd07805d
|
Change the gallery_unit test to only intall into the test environment, modules that are active in the non-test environment.
|
2009-10-23 07:49:14 -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
|
21383dddc3
|
Make sure we set the active identity provider when the user module is installed. This is mostly for the unit_tests as when the gallery3 installer is used, the user module is activated by default.
|
2009-10-21 11:52:55 -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
|
c5f89967f0
|
When activating the user module set all items to be owned by the administrator user.
|
2009-10-21 08:20:41 -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
|
093b209807
|
Removed console.log() debug output.
|
2009-10-20 23:22:16 -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 |
|
|
Chad Kieffer
|
5d66416b26
|
Minor tag admin style updates.
|
2009-10-20 21:34:47 -06:00 |
|
|
Tim Almdal
|
97928804ad
|
Merge branch 'master' into talmdal_dev
|
2009-10-20 20:29:56 -07:00 |
|
|
Tim Almdal
|
b49b213072
|
Only show the user/group administration screen if the active idenity provider is the user module.
|
2009-10-20 20:29:28 -07:00 |
|
|
Chad Kieffer
|
1dd4e4a427
|
Update tag error messages to use g-action-status and g-message-block. Style g-error for short forms.
|
2009-10-20 20:56:14 -06:00 |
|
|
Chad Kieffer
|
ba2d4b923b
|
Rollback tag admin to fix. Now functioning.
|
2009-10-20 20:20:48 -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 |
|