stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-30 00:09:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,601 Commits 4 Branches 0 Tags
cb55eea0f3609d802da5fdb0ea1c8b3acb0b8ea9
Commit Graph

229 Commits

Author SHA1 Message Date
Bharat Mediratta
8ed47ceaad Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-06 19:17:02 -08:00
Bharat Mediratta
0bb742ef33 Use NULL instead of actual values in the vars table, so that var tweaks result in smaller diffs. 2009-12-05 21:21:08 -08:00
Bharat Mediratta
62693db037 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-05 17:56:31 -08:00
Tim Almdal
267b3a1623 Make the rendering of the Theme Options page consistent between the first request and any errors 2009-12-04 13:48:52 -08:00
Bharat Mediratta
d2cb217e20 Convert more database calls over to the new format 
- admin/maintenance page loads, the rebuild thumbs/resizes task works
- Fixed up some conversion bugs in the Cache driver
 2009-12-02 00:34:34 -08:00
Bharat Mediratta
c803cb2909 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-01 19:44:29 -08:00
Bharat Mediratta
6fa880777c Beter fix for #925. 2009-12-01 13:37:07 -08:00
Bharat Mediratta
f9ebe009c3 Use the real mime type for movies when we're requesting the full movie 
instead of a thumbnail.  Fixes ticket #925, thanks to lsowen.
 2009-12-01 13:34:40 -08:00
Bharat Mediratta
883fda313d Fix a typo that was breaking the home page (doh!) 
$this->_show() -> $this->show()
 2009-12-01 00:08:12 -08:00
Bharat Mediratta
852653ef24 Clean up item routing a bit. 
1) The new default route is "albums", and Albums_Controller::index() does the right thing
2) Items_Controller redirects to the appropriate specific controller
3) All item controllers now have show() instead of _show(), so that
   the routing code in url::parse_url() can get to it.  But that code is protected against
   receiving bogus requests.
 2009-11-30 13:57:50 -08:00
Bharat Mediratta
01bad461df Publish theme_edit_form and theme_edit_form_completed events so that themes can piggyback on the regular Admin > Appearance > Theme Options page. 2009-11-29 12:39:21 -08:00
Bharat Mediratta
53df0df0a4 Update a few more occurrences of ORM/Database -> Database_Builder 2009-11-29 02:48:42 -08:00
Bharat Mediratta
dee3ee81e2 Database::orwhere() is now Database_Builder::or_where() 2009-11-26 20:25:32 -08:00
Bharat Mediratta
54be15191b Overload Database_Builder to add merge_where() which takes predefined 
where clauses and adds them to the existing query.  Update all
existing queries that take an additional where clause to use it.
 2009-11-26 18:47:40 -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
60c20b0045 The html helpers no longer forces .js and .css suffixes to urls it generates (yay!) 2009-11-25 16:26:10 -08:00
Bharat Mediratta
4a417708f0 Kohana::show_404() -> throw new Kohana_404_Exception() 2009-11-25 13:51:33 -08:00
Bharat Mediratta
33b1d4b7ef Convert one more instance of ORM::$loaded to ORM::loaded() 2009-11-25 13:41:53 -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
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
82ee5f9d33 Make get_add_form private and use it non-statically. 2009-11-24 16:37:59 -08:00
Bharat Mediratta
4c5e2000f6 Don't call theme::get_info() on themes that don't have a theme.info. Fixes #896. 2009-11-20 21:23:11 -08:00
Bharat Mediratta
5e9bbbe490 Convert the Simple Uploader form over to Forge, and use the event 
model to let the Tags module modify it.  This brings it inline with
our other module-extensible form based interactions.
 2009-11-20 19:41:45 -08:00
Tim Almdal
eb34b301a7 Add the ability to add tags for files that are uploaded using the simple loader. 2009-11-19 18:08:32 -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
e1cc8a37b2 Revert "Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference." 
This reverts commit 75cc4962a2.
 2009-11-19 11:43:34 -08:00
Tim Almdal
75cc4962a2 Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference. 2009-11-19 10:03:39 -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
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
Bharat Mediratta
9e5714aee8 Tweak upgrader html and css so that we set opacity properly for rows 
that are done, and disable the upgrade link when there're no actions
to take.
 2009-11-15 16:14:30 -08:00
Bharat Mediratta
081ce9f6ca Normalize pagination so that pager.html.php can handle pagination for 
both albums and movies.  Kohana's paginator is not quite sufficient
for this, so create our own pagination logic in Theme_View with only
the stuff we need.

Clearly document the variables available in pager.html so that themers
know how to use it.

Fixes ticket #626.
 2009-11-14 14:25:39 -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
a5a8cfd1bc Re-generate the install.sql so that the keys of the block lists are an md5 hash of the module_name:block_id. Also change the packager so we delete the _cache variable for the module gallery not core. 2009-11-12 13:14:02 -08:00
Tim Almdal
421a975c0e Improve error handling. 2009-11-11 18:47:10 -08:00
Tim Almdal
9546e19e34 Pass two of uploadify... remove the default.css file, removed the folder option and create a status area where succesful uploads are listed. 2009-11-10 12:49:13 -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
Bharat Mediratta
d349400531 Fix an accidental old use of $photo in the extension renaming code. 2009-11-08 14:02:09 -08:00
Tim Almdal
88852c45ea Modified the so that a where clause can be passed into item::get_position. Was also able to remove the sub-select from the calculation of the current position as we already have the child item containing the sort column value. 
Also added a where clause that ignores albums to the get_position, children and children_count method calls in photos.php and movies.php
 2009-11-04 09:50:49 -08:00
Tim Almdal
80b892915f Change the order of processing to allow various modules to respond to the identity change event after the new provider instance has been installed. Once the new provider is installed and activated, we can uninstall the old provider which causes users to be deleted. This should be safer, because at this point our new identity provider has been installed, most of the ownership issues have been resolved by the identity change handlers. If there are any ownership issues left, the user deleted event has the new identity provider to uses to rectify them. 2009-10-31 14:22:12 -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
7ea13b3869 Normalize capitalization ticket #596 2009-10-28 12:15:52 -07:00
Tim Almdal
051a7ae27a Refix #812, by removing the decoding in file_proxy instead of not encoding in Item_Model when creating the relative_path_cache. 2009-10-27 20:20:32 -07:00