stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-04 14:11:01 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,538 Commits 4 Branches 0 Tags
a3d904bcbab7cb153c2b617fc4389175ed00a4fc
Commit Graph
420 Commits
Author SHA1 Message Date
Bharat Mediratta e8fb773b68 Update all portable where clauses to the new Kohana 2.4 format. 2009-11-26 19:33:03 -08:00
Bharat Mediratta 1fd0e14359 Convert all DB where() calls to take 3 arguments. 
Convert all open_paren() calls to and_open() or or_open() as appropriate.
 2009-11-26 12:09:04 -08:00
Bharat Mediratta 0121bfd585 ORM::orderby -> ORM::order_by 2009-11-25 19:26:52 -08:00
Bharat Mediratta f50dbd992d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/controllers/rest.php
 2009-11-25 13:40:47 -08:00
Bharat Mediratta 2e420522ec Preliminary work to cut over to Kohana 2.4 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
 2009-11-25 13:22:24 -08:00
Tim Almdal dc67cf6481 Remove the REST_Controller and assorted baggage. Completes ticket #917 2009-11-25 13:02:14 -08:00
Tim Almdal 15cf6870d5 remove the photo::get_add_form method as its not used 2009-11-25 12:47:00 -08:00
Tim Almdal 2d5c232c42 Refactor the album, movie and photo handling to remove the REST_Controller. Partial fix for ticket #917 2009-11-25 12:46:04 -08:00
Bharat Mediratta 3ed7a5af46 Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4 2009-11-24 19:24:02 -08:00
Bharat Mediratta befb824420 Fixes #898 2009-11-20 21:16:59 -08:00
Tim Almdal f5b0ce1f47 Revert "Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme." 
This reverts commit 1692ee1308.
 2009-11-19 11:44:09 -08:00
Tim Almdal 57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme." 
This reverts commit 26114972c3.
 2009-11-19 11:44:01 -08:00
Tim Almdal 26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Tim Almdal 1692ee1308 Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme. 2009-11-18 14:37:49 -08:00
Tim Almdal 4d4e81ca26 Create a helper to load the theme information from theme.info 2009-11-18 08:38:11 -08:00
Bharat Mediratta b8e94302bd Tweak load_themes() to match exactly "/admin" or the "/admin/" prefix, 
but not just the "/admin" prefix because that breaks if you add an
image like "admin_photostream".
 2009-11-17 15:36:02 -08:00
Bharat Mediratta 1067e68292 Redesign the way that we consider page types to create buckets of page 
types, and a subtype for specifics.  Currently the top level bucket

   collection, item, other

Here are the core subtypes so far:

   collection: album, search, tag
   item: movie, photo
   other: login, reset, comment-fragment, comment

It's legal to create new page_subtypes whenever you want.  Use the
appropriate page_type to get the coarse grain behavior that you want.
 2009-11-17 14:04:45 -08:00
Tim Almdal bf4c518bb5 Store the directory, files and translation cache in the gallery3 cache instead of trying to store it in the task. It is possible with lots of modules and lots of incoming translations to go beyond the 64K limit in the task context. Possible fix for #886. 2009-11-16 14:25:25 -08:00
Bharat Mediratta 100a66d861 Fix a bunch of little issues in the version 16, 17, and 18 upgraders. 
- Add a missing loop in 15->16 causing ticket #881
- Comment the blocks correctly
- Remove unnecessary loop from 18->19
 2009-11-14 12:03:41 -08:00
Tim Almdal 0fe32a61f6 Standardize the name of the blocks. 2009-11-13 13:56:05 -08:00
Tim Almdal def88149cc Undo using the md5 hash of the module name and block_id, so duplicate blocks are no allowed again 2009-11-13 09:14:39 -08:00
Tim Almdal 79f700ef9f Change the keys of the block arrays in block manager to be a md5 hash of module_name:block_id. This allows easier lookup of blocks to remove when modules 
are being deactivated. Change the module activation/deactivation to call (activate|deactivate)_blocks instead of just the sidebar blocks.  This insures
that when a module is deactivated any admin dashboard blocks are removed as well the site sideboard blocks. Fix for ticket #876.
 2009-11-12 13:13:34 -08:00
Tim Almdal d8beb6f530 First cut at replacing swfupload with uploadify. Probably need to review the css and remove extra swfupload selectors. Also changed the dialog so tags can be entered for all the files being uploaded. Probably need to add better start processing so the batch is started before the first image is loaded. Maybe add a module variable so the number of simultaneous uploads can be initiated (currently hard ocded to 10. 2009-11-09 13:54:55 -08:00
Tim Almdal 26f8240e34 Revert "Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events." 
This reverts commit 809e738536.
 2009-11-09 11:52:43 -08:00
Tim Almdal 6d57d4308b Merge branch 'master' into talmdal_dev 2009-11-07 21:52:40 -08:00
Tim Almdal 47e0d91fcc Remove debugging statement 2009-11-07 21:51:57 -08:00
Tim Almdal c40735c922 Merge branch 'master' into talmdal_dev 2009-11-06 22:14:32 -08:00
Tim Almdal b5f2dbc2c4 Create a user_menu for the top of the page. Change the login, edit profile and logout portions of the banner to be rendered by the Theme_View::user_menu callback. This fires the user_menu event. Fixes Ticket #871. 2009-11-06 14:08:46 -08:00
Tim Almdal 44ae88e8e1 Merge branch 'master' into talmdal_dev 2009-11-06 07:02:55 -08:00
Tim Almdal 6984737a54 Clean up problem with cancelling the inplace edit left a whole bunch of css artifacts. 2009-11-05 21:35:40 -08:00
Tim Almdal 1faa249295 Merge branch 'master' into talmdal_dev 2009-11-03 17:30:18 -08:00
Bharat Mediratta 96cbfe23a6 Respect the "theme" variable if we're an admin. This requires us to 
change the order of operations in gallery_event::gallery_ready() so
that we load users before themes.  Fixes ticket #836.
 2009-11-03 14:03:36 -08:00
Tim Almdal 6dd6224165 Merge branch 'master' into talmdal_dev 2009-11-02 13:53:15 -08:00
Tim Almdal 9a329f23ed remove a debugging statement 2009-11-02 12:43:04 -08:00
Tim Almdal 809e738536 Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events. 2009-11-01 13:14:11 -08:00
Tim Almdal 91c5a9abb7 Merge branch 'master' of git@github.com:gallery/gallery3 2009-11-01 10:23:12 -08:00
Tim Almdal 376eb5673f Convert the event handlers for the "identity provider changed" and "user_deleted" events to use ORM or the Kohana query builder to build the database update calls instead of coding the sql directly. 2009-11-01 10:22:56 -08:00
Bharat Mediratta 774e0be66e Replace split() with explode() since split is deprecated in PHP 5.3 
Fixes ticket #865
 2009-11-01 10:05:05 -08:00
Tim Almdal e72022f062 Include the gallery_toolkit_path in the path when determining the location of ffmpeg. 2009-10-31 16:23:08 -07:00
Tim Almdal c3dcfd136b Move the identity provider menu item under the settings menu and make the User/Groups administration a first level menu item. As discussed via -devel mailing list. 2009-10-31 14:41:55 -07:00
Tim Almdal 903b5f6f67 Add identity_change handlers to resolve the ownership issues of comments, subscription, items and tasks. 2009-10-31 14:23:05 -07:00
Tim Almdal abe42002b2 Don't specify the default identity provider in the gallery installer. Let the user module use that as a trigger to set ownership of the root album to the administrator. 2009-10-31 14:13:35 -07:00
Tim Almdal 90465012d1 Patch to clean up loose ends when a user is deleted. 
* For items and tasks the owner id is set to admin
* For notification subscriptions, the subscription is deleted
* For comments, I've extracted the user name, email and url and set the guest_name, guest_email and guest_url columns while setting the author_id to identity::guest()->id
Fix for ticket #777.
 2009-10-30 14:23:57 -07:00
Tim Almdal 294215258a Include the graphics_toolkit_path from the advanced settings in the path when searching for the graphics toolkits directories. Fixes ticket #639 2009-10-30 10:31:47 -07:00
Tim Almdal 59b5a05496 Rename the login helper to auth. Create a login and logout helper function to allow for programmically login in and out. 2009-10-30 09:32:18 -07:00
Tim Almdal c6fbd34f28 Add the add_user_to_group and remove_user_from_group api method calls. If the identity provider isn't writable, the method implementations should throw an Invalid Operation exception. 2009-10-29 19:16:08 -07:00
Tim Almdal 392e24e56b Correct the issues that identity::registered_users was calling the backend provider everybody method 2009-10-29 12:12:22 -07:00
Tim Almdal 4bf2475684 Missed a couple of inconsistent capitalizations 2009-10-29 11:23:04 -07:00
Tim Almdal 749d17ac16 Use the identity interface admin_user to retreive the admin user. 2009-10-29 11:18:35 -07:00
Tim Almdal 0bb2b7659f Add the admin_user api function to the identity helper and the IdentityProvider interface. 2009-10-29 11:12:55 -07:00