Commit Graph
1058 Commits
Author SHA1 Message Date
Bharat Mediratta bfcd99f3f2 Updated for K24 2009-12-21 11:30:34 -08:00
Bharat Mediratta 0cd03c8883 Add Database::set_default_instance() for tests 2009-12-21 11:30:26 -08:00
Bharat Mediratta a22aa4ab05 Forgot to rename the file when I renamed the class. 2009-12-21 11:29:28 -08:00
Bharat Mediratta 6f063aceac Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-18 14:27:58 -08:00
Bharat Mediratta 86e0bc863a Use url::base() instead of item::root()->url because we can't be sure
that will work (if your database is sitll at Beta 1, you don't have
the slug column, for example).
2009-12-18 14:26:15 -08:00
Bharat Mediratta ca1f7d0da7 Convert a database query. 2009-12-18 01:12:16 -08:00
Bharat Mediratta 0736cf203b In Kohana 2.4, ORM no longer does the find_all() call for us when we
retrieve related ORMs.  If we tack a find_all() on the end, it breaks
the User_Definition interface so create User_Model::groups() and
Groups_Model::users() as glue.
2009-12-17 21:32:53 -08:00
Bharat Mediratta 9d19e272d6 Convert some database queries. 2009-12-17 21:16:51 -08:00
Bharat Mediratta 8883d1605a Convert some more database queries. 2009-12-17 21:16:37 -08:00
Bharat Mediratta 9b75b85e71 Update all database queries such that we can run "php index.php
package" and generate the same SQL as before.
2009-12-17 21:05:58 -08:00
Bharat Mediratta 2aba8c4bff Simplify add_table_prefixes. In Kohana 2.4, it returns the bare table
name, not the prefixed one so this makes our logic easier.
2009-12-17 21:05:47 -08:00
Bharat Mediratta c99a75b5d1 Improve the exception error message. 2009-12-17 09:16:44 -08:00
Bharat Mediratta f431d7e12e Convert a database call. 2009-12-16 18:04:44 -08:00
Bharat Mediratta 86467363c2 Convert a database call. 2009-12-16 18:03:23 -08:00
Bharat Mediratta 9b3b9c6da6 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-16 17:58:49 -08:00
Bharat Mediratta 02b3c4e704 Adjust for the fact that movies have JPG thumbnails. Fixes ticket 2009-12-16 15:18:08 -08:00
Bharat Mediratta b4a35a8e2c Show the right edit form for movies. 2009-12-16 09:37:28 -08:00
Bharat Mediratta 4566c299c1 Convert some database calls. 2009-12-16 09:24:38 -08:00
Bharat Mediratta 064a24b897 Convert a database call. 2009-12-13 17:15:59 -08:00
Bharat Mediratta 8c03c7a073 Convert some database calls. 2009-12-13 17:15:12 -08:00
Bharat Mediratta c65cd702fc Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/helpers/identity.php
2009-12-13 16:52:18 -08:00
Bharat Mediratta 3d1f166fe5 Log the entire stack trace when we catch an exception. 2009-12-10 21:20:18 -08:00
Bharat Mediratta d5c35210b9 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-06 21:38:47 -08:00
Bharat Mediratta dec084fe08 Update database queries. 2009-12-06 21:34:09 -08:00
Tim Almdal 16bed1ffd5 Remove the hidden form variable _method which was used in the no longer rest controllers. 2009-12-06 21:32:27 -08:00
Bharat Mediratta fb899c313c Further simplifications to viewable(). Stop trying to optimize for
the case where we just have one restriction, it's unnecessary.
2009-12-06 21:28:40 -08:00
Bharat Mediratta b9dadb77c3 Get rid of unused _method param in the item edit form.
Fix viewable() to properly OR view restrictions together.
2009-12-06 21:21:35 -08:00
Bharat Mediratta c22bf27cc2 Add the current file/line at the top of the trace. 2009-12-06 21:02:30 -08:00
Bharat Mediratta 2be72bb1c3 Overload Kohana_Exception::text() to dump out the complete stack trace
so that we have useful data in the logs.
2009-12-06 20:42:38 -08:00
Bharat Mediratta 5a7449f315 Update more database calls. 2009-12-06 19:51:25 -08:00
Bharat Mediratta 112aafe513 Oops, removed the overload for query() before, we need this back so
that we can prefix table names properly.
2009-12-06 19:51:00 -08:00
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 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 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 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 87bc32345f Use select() instead of select("*") 2009-12-02 10:42:49 -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