stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-02 01:39:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph

4686 Commits

Author SHA1 Message Date
Bharat Mediratta
1f3567ec04 Update the gallery module to version 21 in the installer. 2009-12-05 21:08:10 -08:00
Bharat Mediratta
320a569c10 Fix whitespace. 2009-12-05 20:56:16 -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
dfc082ad5f Merge branch 'master' into talmdal_dev 2009-12-05 12:09:31 -08:00
Tim Almdal
fcbf824c05 Merge branch 'master' of git@github.com:gallery/gallery3 2009-12-05 12:09:25 -08:00
Tim Almdal
4a6b62c285 Revert "Correct inconsistent capitalization on "Server Add"" 
This reverts commit f4810345b4.
Bharat is a correct as in that "Server Add" is a proper name and should
be exempt from the capitalization rules.
 2009-12-05 12:07:24 -08:00
Bharat Mediratta
145ec2f38f Merge branch 'master' of git@github.com:gallery/gallery3 2009-12-05 12:01:02 -08:00
Bharat Mediratta
03ea1ee701 Change the default image to be the full size so that the slideshow shows the big one. 2009-12-05 12:00:50 -08:00
Tim Almdal
f4810345b4 Correct inconsistent capitalization on "Server Add" 2009-12-05 09:13:04 -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
Tim Almdal
8ca69cffbb Merge branch 'master' into talmdal_dev 2009-12-04 11:42:37 -08:00
Bharat Mediratta
5c107be903 Reload relevant models after acquiring a lock so that we don't make 
database calls based on obsolete data, which can lead to data corruption.

Fixes ticket #926.
 2009-12-04 11:13:20 -08:00
Bharat Mediratta
c9e6869c68 Rename the "upload_limit" variable to "simultaneous_upload_limit" for 
clarity, since it only limits concurrency not the number of actual uploads.

Move the default-setting code into the upgrader so that we avoid
creating the variable as a side-effect of the view (personal
preference to avoid side-effect code since it's led to problems in the
past).
 2009-12-02 19:08:13 -08:00
Bharat Mediratta
c7b934bc6d Update a couple more queries. 2009-12-02 12:20:21 -08:00
Tim Almdal
1ab8ac305b Allow users to override the number of simulatenous uploads. This setting won't appear until after they have attempted to upload at least once and have issues. 2009-12-02 12:09:34 -08:00
Bharat Mediratta
d0874a65ac Use: 
->select(new Database_Expression("DISTINCT `email`"))

instead of:
  ->select("DISTINCT email")

This is not the perfect API.  http://dev.kohanaphp.com/issues/2396 is
the upstream tracking ticket for a better API.
 2009-12-02 10:43:06 -08:00
Bharat Mediratta
87bc32345f Use select() instead of select("*") 2009-12-02 10:42:49 -08:00
Bharat Mediratta
94411b3658 Fix a bunch of places where we were using "= null" instead of "IS NULL". 2009-12-02 10:02:08 -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
299da7b54f Don't allow the extra "/?" sequence (ie: "/index.php/?kohana_uri=...") in the generated .htaccess files. 2009-11-30 10:59:00 -08:00
Bharat Mediratta
1b41ad8c42 Don't use PathInfo based urls to reroute access protection. Fixes 
ticket #922.
 2009-11-29 22:47:33 -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
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
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