Commit Graph

997 Commits

Author SHA1 Message Date
Bharat Mediratta
a3d904bcba ORM::find_all() now uses null as the default value for offset. 2009-11-26 19:36:57 -08:00
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
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
2ee38b3d8e ORM::$rules now has a special meaning. Use $form_rules for our
internal rules code.
2009-11-26 11:36:09 -08:00
Bharat Mediratta
4b2e1344b4 Move the CSRF initialization into the constructor, I don't see why we
need it also in render().
2009-11-25 20:05:38 -08:00
Bharat Mediratta
0121bfd585 ORM::orderby -> ORM::order_by 2009-11-25 19:26:52 -08:00
Bharat Mediratta
ccb0ea3d30 Make globals work if you access the the variables directly with
$v->foo instead of doing it in a rendered template.
2009-11-25 19:24:50 -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
7eacc465d5 Fix set_global() to be more elegant and preserve local trumping 2009-11-25 14:50:29 -08:00
Bharat Mediratta
daedadda75 Switch from stdClass to arrays for global data. 2009-11-25 14:27:06 -08:00
Bharat Mediratta
7c9bd9e8e8 Call execute() after upate() and insert(). 2009-11-25 13:59:01 -08:00
Bharat Mediratta
e105d1fdb4 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-11-25 13:51:47 -08:00
Bharat Mediratta
4a417708f0 Kohana::show_404() -> throw new Kohana_404_Exception() 2009-11-25 13:51:33 -08:00
Tim Almdal
ce183e5a69 Forgot to remove the rest references from config/route.php 2009-11-25 13:45:58 -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
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
Tim Almdal
0bf81f0381 Remove a debugging statement 2009-11-25 09:16:49 -08:00
Tim Almdal
454a96f48f Refactor the tags to remove the REST_Controller. Partial fix for ticket #917 2009-11-25 09:08:33 -08:00
Tim Almdal
4c3b9e363a Refactor the comment module as part of ticket: #917 "Remove Rest Controller"
* Remove the methods create, update, delete, get_edit_form as there are not used
* Change the return when a comment is created to return the html for the new comment.
  This saves a second get request to down load the comment.
2009-11-25 08:12:50 -08:00
Bharat Mediratta
e201536d82 K24 has separate log sinks, this configures the file based log sink 2009-11-24 19:25:14 -08:00
Bharat Mediratta
01e10d1708 K2.4 has its own parentheses support 2009-11-24 19:24:38 -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
52b12725ea Updated. 2009-11-24 16:35:50 -08:00
Tim Almdal
6bdb8c3d55 Correct inconsistent captialization. Fixes #906 2009-11-21 09:36:19 -08:00
Tim Almdal
ee9c921397 Don't use realpath when calculating the relative paths of embedded references in css files. This fixes ticket #910 2009-11-21 09:36:12 -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
befb824420 Fixes #898 2009-11-20 21:16:59 -08:00
Bharat Mediratta
9d40f6fc00 Paginator: don't try to set the position for "other" page types. 2009-11-20 20:29:49 -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
Bharat Mediratta
144c2fb61e Minor reformatting. 2009-11-20 13:04:54 -08:00
Bharat Mediratta
ca9e4d5080 Use "#g-add-photos-canvas object" instead of "#g-uploadifyUploader" so
that we're not mixing naming styles.
2009-11-20 12:44:41 -08:00
Bharat Mediratta
fab0930d1f Move tag ui to the bottom of the form since it's a lower priority
Internationalize and simplify our error strings.
2009-11-20 12:42:40 -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
Bharat Mediratta
23befebd72 Add a note to skip version 20. 2009-11-19 11:49:35 -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
372f589f66 Merge branch 'master' into talmdal_dev 2009-11-18 12:44:16 -08:00
Bharat Mediratta
350f6b5876 Merge branch 'master' of git@github.com:gallery/gallery3 2009-11-18 11:26:34 -08:00
Bharat Mediratta
670312ff10 For album pagination, don't let the last_visible_position exceed the
total.  Fixes ticket #903.
2009-11-18 11:26:19 -08:00
Tim Almdal
fc41d09134 Revert "Simplify the maintenance of the xss golden file by having each module contibute its own golden file to a consolidated one. This will make it easier for -contrib modules or themes to be included in the xss security test w/o having to keep modifying a central golden file."
This reverts commit 4fe5801c88.
2009-11-18 10:54:01 -08:00