summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-10-24Minor style tweaks.Bharat Mediratta
2009-10-24Update themes::load_theme() to work with mod_rewrite's short urls.Bharat Mediratta
Conflicts: modules/gallery/helpers/gallery_event.php
2009-10-24Update themes::load_theme() to work with mod_rewrite's short urls.Bharat Mediratta
2009-10-24Merge branch 'master' into talmdal_devTim Almdal
2009-10-24When an item is renamed or move insure that the target file name doesn't ↵Tim Almdal
exist. fixes ticket #694
2009-10-24Re-enable the redirect to the root album if we can't load the active user ↵Tim Almdal
from the session. This will most likely occur if the administrator has switch identity providers while a user was logged in.
2009-10-24Merge branch 'master' into talmdal_devTim Almdal
2009-10-24When doing a search we need to "OR" the view permissions not "AND" them. ↵Tim Almdal
Fixes ticket #805.
2009-10-24Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/server_add/helpers/server_add_theme.php
2009-10-23Merge branch 'master' of github.com:gallery/gallery3Chad Kieffer
2009-10-23Moved remaining user and group admin css into the new user.css style sheet.Chad Kieffer
2009-10-23Created user.css. Moved user-related form css to the new sheet.Chad Kieffer
2009-10-23Adjust order of items on server_add admin page. Restore autocomplete to the ↵Chad Kieffer
add form. Created a server_add.css file.
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
2009-10-23Clean up the rss feed for the slideshow. It now validates using ↵Tim Almdal
"http://validator.w3.org/feed/". Fixes ticket #806. Doesn't fix ticket#23.
2009-10-23Remove left and right padding inside list items to remove gaps between text ↵Chad Kieffer
inputs and submit buttons when a g-short-form is in error.
2009-10-23Rename dimension and scale classes in increments of quarters and thirds.Chad Kieffer
2009-10-23This is the one i should have checked in last timeTim Almdal
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/helpers/gallery_event.php
2009-10-23Allow themes to override event handlers. In gallery::ready() grab the serverTim Almdal
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-23Merge branch 'master' into talmdal_devTim Almdal
2009-10-23Put logic into gallery.panel.js so that when the panel is submitted, the ↵Tim Almdal
submit button is disabled and the user is no longer able to submit multiple clicks.
2009-10-23Put logic into gallery.panel.js so that when the panel is submitted, the ↵Tim Almdal
submit button is disabled and the user is no longer able to submit multiple clicks.
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
2009-10-23Put logic into gallery.dialog.js so that when the form is submitted, the ↵Tim Almdal
submit button is disabled and the user is no longer able to submit multiple clicks. This should fix tickets: #623, #790, #799
2009-10-23Standardize the use of the lookup methodsTim Almdal
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
Conflicts: modules/gallery/tests/Albums_Controller_Test.php modules/user/helpers/user.php
2009-10-23Initialize the slug field when doing the update testsTim Almdal
2009-10-23Only look for tests that are in the active modules. Update the controller ↵Tim Almdal
golden file to reflect the current location of files.
2009-10-23move controllers and views to the user module to make the Identity Provider ↵Tim Almdal
refactor smaller
2009-10-23synchronize with the master branchTim Almdal
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
2009-10-23Apply local fix for Kohana ticket 2276.Tim Almdal
2009-10-23Revert "Temporary fix for a bug in Kohana::include_paths where the ↵Tim Almdal
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 2554316df24bef2c8bb1d0d044c322066a1a3cd3.
2009-10-23Merge branch 'master' into talmdal_devTim Almdal
2009-10-23Change the gallery_unit test to only intall into the test environment, ↵Tim Almdal
modules that are active in the non-test environment.
2009-10-23Move the filters that the File_Structure_Test use into a seperate file so ↵Tim Almdal
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-23Minor changes to more closely align this branch with masterTim Almdal
2009-10-23Change the Admin_Identity_Controller to not destroy the session until after ↵Tim Almdal
the new provider is installed.
2009-10-23Poor man's merge. Note to self, git pull before working. Next pound the ↵Chad Kieffer
steps to merge into your head.
2009-10-23Update white space in form layout. This removes scrolling in dialogs with forms.Chad Kieffer
2009-10-23Make g-inline more specific, replace universal selector with an li since ↵Chad Kieffer
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-23Standardize message markup, make the update block status message translatable.Chad Kieffer
2009-10-23Use jQuery fadeIn() for message display effect, it fades bg icon and color ↵Chad Kieffer
at the same time.
2009-10-22MergeChad Kieffer
2009-10-22Temporary fix for a bug in Kohana::include_paths where the file_list_paths ↵Tim Almdal
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
2009-10-22Poor man's merge. Note to self, git pull before working. Next pound the ↵Chad Kieffer
steps to merge into your head.
2009-10-22Change Identity adminstration to use the uninstall/install methods when ↵Tim Almdal
changing providers.
2009-10-22When uninstalling a module call graphics:remove_rules instead of graphics ↵Tim Almdal
remove_rule.
2009-10-22Update white space in form layout. This removes scrolling in dialogs with forms.Chad Kieffer