Tim Almdal
f0f7bc2d12
Undo the merge from master because it is actually identity not user in this branch.
2009-10-25 08:10:27 -07:00
Tim Almdal
174e8ef3f7
Merge branch 'master' into talmdal_dev
2009-10-25 08:08:09 -07:00
Tim Almdal
576337c508
Replace reference to identity with the reference to user. Dangers of flipping back and forth between branches.
2009-10-25 08:07:05 -07:00
Tim Almdal
e88d2c8800
Merge branch 'master' into talmdal_dev
2009-10-25 07:41:28 -07:00
Tim Almdal
24bd8e4c28
Remove a redundant comment, change the name of the identity change event to 'identity_before_change' and change the name of 'login::get_login_form()' to 'login::get_form()'
2009-10-24 11:32:09 -07:00
Bharat Mediratta
abb080f232
phpDoc fixes.
2009-10-24 10:56:56 -07:00
Bharat Mediratta
73a01d475b
Minor style tweaks.
2009-10-24 10:55:22 -07:00
Bharat Mediratta
b33762a9f8
Update themes::load_theme() to work with mod_rewrite's short urls.
...
Conflicts:
modules/gallery/helpers/gallery_event.php
2009-10-24 10:38:48 -07:00
Bharat Mediratta
91e9df7834
Update themes::load_theme() to work with mod_rewrite's short urls.
2009-10-24 10:37:12 -07:00
Tim Almdal
5212deb5b1
Merge branch 'master' into talmdal_dev
2009-10-24 10:09:57 -07:00
Tim Almdal
607662d66b
When an item is renamed or move insure that the target file name doesn't exist. fixes ticket #694
2009-10-24 10:08:48 -07:00
Tim Almdal
7afb4c5c30
Re-enable the redirect to the root album if we can't load the active user from the session. This will most likely occur if the administrator has switch identity providers while a user was logged in.
2009-10-24 08:40:16 -07:00
Tim Almdal
f0610ccaa0
Merge branch 'master' into talmdal_dev
2009-10-24 08:23:51 -07:00
Tim Almdal
571d7fe43c
When doing a search we need to "OR" the view permissions not "AND" them. Fixes ticket #805 .
2009-10-24 08:18:17 -07:00
Tim Almdal
0a6b540092
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/server_add/helpers/server_add_theme.php
2009-10-24 07:28:22 -07:00
Chad Kieffer
e13f92abab
Merge branch 'master' of github.com:gallery/gallery3
2009-10-23 22:28:40 -06:00
Chad Kieffer
bb47b495a7
Moved remaining user and group admin css into the new user.css style sheet.
2009-10-23 22:28:26 -06:00
Chad Kieffer
3814186592
Created user.css. Moved user-related form css to the new sheet.
2009-10-23 22:25:36 -06:00
Chad Kieffer
e3f90a889d
Adjust order of items on server_add admin page. Restore autocomplete to the add form. Created a server_add.css file.
2009-10-23 22:24:06 -06:00
Tim Almdal
18b402a1e5
Merge branch 'master' into talmdal_dev
2009-10-23 21:16:30 -07:00
Tim Almdal
5fb0434a47
Clean up the rss feed for the slideshow. It now validates using " http://validator.w3.org/feed/ ". Fixes ticket #806 . Doesn't fix ticket#23.
2009-10-23 21:15:16 -07:00
Chad Kieffer
85affaf23f
Remove left and right padding inside list items to remove gaps between text inputs and submit buttons when a g-short-form is in error.
2009-10-23 21:56:33 -06:00
Chad Kieffer
f1f2c384cb
Rename dimension and scale classes in increments of quarters and thirds.
2009-10-23 21:54:00 -06:00
Tim Almdal
e5cf93c22a
This is the one i should have checked in last time
2009-10-23 20:14:29 -07:00
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
8d430259fe
Merge branch 'master' into talmdal_dev
2009-10-23 13:26:18 -07:00
Tim Almdal
cd5485ee84
Put logic into gallery.panel.js so that when the panel is submitted, the submit button is disabled and the user is no longer able to submit multiple clicks.
2009-10-23 13:25:54 -07:00
Tim Almdal
45690fa897
Put logic into gallery.panel.js so that when the panel is submitted, the submit button is disabled and the user is no longer able to submit multiple clicks.
2009-10-23 13:24:51 -07:00
Tim Almdal
14427a0158
Merge branch 'master' into talmdal_dev
2009-10-23 13:12:17 -07:00
Tim Almdal
6af697686a
Put logic into gallery.dialog.js so that when the form is submitted, the submit button is disabled and the user is no longer able to submit multiple clicks. This should fix tickets: #623 , #790 , #799
2009-10-23 13:08:10 -07:00
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
e386aba77a
Merge branch 'master' into talmdal_dev
2009-10-23 08:26:34 -07:00
Tim Almdal
3643706a2e
Apply local fix for Kohana ticket 2276.
2009-10-23 08:25:58 -07:00
Tim Almdal
69d2b3ce08
Revert "Temporary fix for a bug in Kohana::include_paths where the file_list_paths cache is not reset when the include_path is rebuilt. Still need to open a ticket on Kohana and revert it an reapply when i figure out how not to delete the trailing whitespace"
...
This reverts commit 2554316df2
2009-10-23 08:01:46 -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 Kieffer and Tim Almdal
3573544104
Poor man's merge. Note to self, git pull before working. Next pound the steps to merge into your head.
2009-10-23 05:41:50 -07:00
Chad Kieffer and Tim Almdal
2c588338bf
Update white space in form layout. This removes scrolling in dialogs with forms.
2009-10-23 05:41:49 -07:00
Chad Kieffer and Tim 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 Kieffer and Tim Almdal
367e6a8983
Standardize message markup, make the update block status message translatable.
2009-10-23 05:41:41 -07:00
Chad Kieffer and Tim Almdal
2d5b65a419
Use jQuery fadeIn() for message display effect, it fades bg icon and color at the same time.
2009-10-23 05:39:24 -07:00
Tim Almdal
Bharat Mediratta
Chad Kieffer