stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-28 02:34:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta 3f63e1c521 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/helpers/theme.php
	modules/gallery/libraries/Admin_View.php
	modules/gallery/libraries/Theme_View.php
 2009-11-29 02:45:39 -08:00
Bharat Mediratta 3d4672ba88 Give the theme a chance to handle theme function callbacks as well. 2009-11-28 23:48:38 -08:00
Bharat Mediratta f3981bbaa9 Rework the theme loading code to allow themes to be treated as Gallery 
modules, and have an admin subdirectory that is treated like a Kohana
module (as distinct from a Gallery module).

The main advantage of creating the separate admin subdirectory is that
we will not load an admin theme and a site theme at the same time.
We'll only load a few specialized bits of the site theme while the
admin theme is active.

Concrete examples. A site theme named "xxx":
- will receive events at themes/xxx/helpers/xxx_event.php
- will have working controllers at themes/xxx/controllers/xxx.php

If theme xxx has an admin subdir, then in admin mode it:
- will receive events at themes/xxx/admin/helpers/xxx_event.php
- will have working controllers at themes/xxx/admin/controllers/xxx.php
 2009-11-28 23:25:07 -08:00
Bharat Mediratta b677778253 Expose theme::$is_admin 2009-11-28 15:42:11 -08:00
Bharat Mediratta 22149b52c3 Move the theme fallback checking into theme::load_themes() so that 
we're calling it once per request.
 2009-11-27 17:12:13 -08:00
Bharat Mediratta 96b00d6cfe Convert some more Database::instance() calls to db::build() form. 2009-11-26 21:14:54 -08:00
Bharat Mediratta b9a0e09637 Kohana::config_xxx() is now Kohana_Config::instance()->xxx 2009-11-26 21:14:43 -08:00
Bharat Mediratta ddf668d439 utf8::clean() is now Input::clean() 2009-11-26 21:14:17 -08:00
Bharat Mediratta e79e0d1980 Make ORM::__call() always return an ORM so that it's chainable. 2009-11-26 20:47:30 -08:00
Bharat Mediratta dee3ee81e2 Database::orwhere() is now Database_Builder::or_where() 2009-11-26 20:25:32 -08:00
Bharat Mediratta 3dd8bf245e Kohana::$user_agent moved to the request helper and is protected, so 
instead set the user agent into $_SERVER.
 2009-11-26 20:24:16 -08:00
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 e0e882baab Fix the arguments to Item_Model::descendants_count() 2009-11-26 19:25:09 -08:00
Bharat Mediratta 9fd6a0a63e Convert Database::instance() -> db::build() 2009-11-26 19:23:36 -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 f77b26e988 Add kohana23_compat module to bring along functionality that got 
deleted, but we still want.  Start off with the Pagination library.
 2009-11-26 14:38:01 -08:00
Bharat Mediratta d036e2fc49 Convert another Database::instance() query over to using db::build() 2009-11-26 13:18:10 -08:00
Bharat Mediratta dd2bca0224 Modify the expiration code to work with db::build() 2009-11-26 12:54:07 -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 22823df220 Update ORM::where() calls to take 3 args. 2009-11-26 11:43:20 -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 9d9e4bdb67 Update hidden field format to match Kohana 2.4's form::open() API. 2009-11-25 20:05:12 -08:00
Bharat Mediratta 0121bfd585 ORM::orderby -> ORM::order_by 2009-11-25 19:26:52 -08:00
Bharat Mediratta 0ef6994f23 ORM::orderby -> ORM::order_by 2009-11-25 19:25:34 -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 5f521014f6 form::close() went away in Kohana 2.4 2009-11-25 19:24:30 -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 8b7ef66065 Don't show the breadcrumb if we have no item 2009-11-25 14:50:04 -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
Tim Almdal 5743b159c2 Merge branch 'master' into talmdal_dev 2009-11-25 07:09:55 -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 7dbb84bb54 Bootstrap has moved in K24 2009-11-24 19:24:51 -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