Bharat Mediratta
df37b5ce70
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-28 17:09:45 -07:00
Bharat Mediratta
9bdc84733d
use jquery.scrollTo to scroll the active upload into view.
2009-06-28 17:07:41 -07:00
Tim Almdal
d90e30c378
Rename the combined javascript controller from javascript/combined to combined/javascript.
2009-06-28 17:07:12 -07:00
Bharat Mediratta
fcc57a4182
Modify the cache table to make id the primary key for consistency with
...
other gallery 3 tables. Update the driver to match, add more upgrader
code, update the installer block and change the gallery module version
to 6.
2009-06-28 16:48:29 -07:00
Bharat Mediratta
aa31e1f009
Tweak the cache implementation
...
1) Drop the *_modified key, we don't really need it. The modification date is not
relevant to our browser caching strategy.
2) Fix multiple issues with the Expires header and just hardcode it to the biggest
possibly value for code clarity.
3) print the $content out directly instead of using fwrite
4) Minor cleanups in the installer.
2009-06-28 16:24:51 -07:00
Tim Almdal
bf26ca727e
Change the combined javascript to use the new caching functionality and respect the HTTP_IF_MODIFIED_SINCE header request.
2009-06-28 15:30:13 -07:00
Tim Almdal
7a3310e91b
Change the cache column of the caches table to a large blob. This fixes ticket #485 and gives us the extra adavantage of not having to serialize the data (as the database driver handles that for us)
2009-06-28 13:14:47 -07:00
Tim Almdal
a0c07d4b54
Clean up code (i.e. preamble, tabs) from the caching implementation so the unit tests pass
2009-06-28 07:49:35 -07:00
Tim Almdal
2d38370ec4
The rest of the caching driver implementation that i somehow forgot.
2009-06-27 23:34:07 -07:00
Tim Almdal
3000c78998
Update the version number and upgrade method for gallery to reflect the addition of the cache table.
2009-06-27 23:30:02 -07:00
Tim Almdal
52ecdcdff2
Implemented a Database driver for the Kohana Cache library. Rather then writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm.
2009-06-27 23:24:23 -07:00
Tim Almdal
4707a97b82
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-27 16:57:38 -07:00
Bharat Mediratta
aad0dd357f
Create a new thumb_menu() and convert Digibug over to use it.
...
1) Eliminate digibug_album.html
2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
digibug_popup() then just make direct calls to digibug_popup() in the
menu urls.
2009-06-27 16:29:09 -07:00
Tim Almdal
11f08ee439
Implement the combined javascript controller.
2009-06-26 21:42:02 -07:00
Tim Almdal
4cec020163
Create a theme_view function script which allows modules in the head or admin_head functions to specify javascript files that are required for this page.
...
In this commit, these script files are expressed at the end of the head or admin_head calls and appended to the beginning of the block stack. In a future commit these will be combined and gzipped for download.
2009-06-26 14:37:15 -07:00
Tim Almdal
84e98e830c
Move the inclusion of photo and movie specific javascript into gallery_theme
2009-06-26 08:25:24 -07:00
Tim Almdal
f3e45d49a3
Change the movie controller to set the page type to "movie". Ticket #467
...
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca >
2009-06-26 23:19:42 +08:00
Tim Almdal
f4778699fc
Change the movie controller to set the page type to "movie". Ticket #467
2009-06-26 08:19:06 -07:00
Tim Almdal
42a5bd20a5
1) Move the generation of script tags to gallery_theme::head and gallery_theme::admin_head. This allows us to potentially manage the scripts like we do in g2 (single file and compressed)
...
2) Change Theme_View::_call to always call the gallery_theme::$function first.
2009-06-26 07:51:29 -07:00
Romain LE DISEZ
923732ca4d
Go back to the upstream version because we choosed to use real booleans.
2009-06-25 10:07:12 +02:00
Romain LE DISEZ
6345fcede7
Merge commit 'upstream/master'
2009-06-25 08:16:35 +02:00
Bharat Mediratta
7347d1e50d
Use ENT_QUOTEs when decoding the $current_uri otherwise apostrophes
...
are treated as ' which doesn't match in our relative_path_cache.
2009-06-24 21:34:07 -07:00
Bharat Mediratta
abbecb9e7e
Look in /opt/local/bin for binaries, too.
...
Fixes ticket #423 .
2009-06-24 21:19:05 -07:00
Romain LE DISEZ
be354ab98b
Remove an useless ORDER BY.
...
It improves compatibility with PgSQL.
(Replay of c80d2da0a9 )
2009-06-24 23:40:47 +02:00
Romain LE DISEZ
6111272568
Merge commit 'upstream/master'
...
Conflicts:
modules/comment/helpers/comment_installer.php
modules/gallery/models/item.php
2009-06-24 23:02:57 +02:00
Bharat Mediratta
e44053f692
Cache the page_type in pane() instead of looking it up twice.
2009-06-23 21:42:25 -07:00
Bharat Mediratta
f9dbd4eb2f
Fix broken rotate urls.
2009-06-23 21:31:58 -07:00
Bharat Mediratta
d01c3d2373
Remove stray ? that was breaking ccw rotation.
2009-06-23 21:27:17 -07:00
Bharat Mediratta
9a0448e5d6
Add gDialogLink to the delete button, since its got a jQuery
...
confirmation dialog now. This was a regression in
fa4bb5b7ac .
Fixes ticket #459 .
2009-06-23 17:25:59 -07:00
Bharat Mediratta
b9b68e0952
Add a new "show credits" check box in the theme options so that you
...
can disable any module credits if you want. Update the theme to obey
it.
2009-06-23 16:05:32 -07:00
Bharat Mediratta
ba7163bd30
Fix get_position() to properly deal with duplicate values in the sort column. Fixes #389
2009-06-23 14:50:41 -07:00
Bharat Mediratta
4e3b84eb39
Escape {$this->sort_column} in get_position()
2009-06-23 14:23:11 -07:00
Bharat Mediratta
d5ee5741f2
Don't allow renaming of the root album.
2009-06-23 14:08:07 -07:00
Bharat Mediratta
bfca0c7903
Refactor the install/upgrade code to be more flexible.
...
Add xxx_installer::upgrade($version) method so that upgrade stanzas
are separate from install stanzas. In the old code, to do an upgrade
meant that you had to re-evolve everything from the initial install
because we'd step through each version's changes. But what we really
want is for the initial install to start off in the perfect initial
state, and the upgrades to do the work behind the scenes. So now the
install() function gets things set up properly the first time, and the
upgrade() function does any work to catch you up to the latest code.
See gallery_installer.php for a good example.
2009-06-23 12:00:49 -07:00
Bharat Mediratta
342d5e1186
Order log entries by id as well so that multiple events in the same
...
second are still shown in descending order.
2009-06-23 11:53:38 -07:00
Romain LE DISEZ
de28b0350e
Use an integer because the code store 0 and 1. It
...
improves compatiblity with PgSQL.
The right way is to use a BOOLEAN and code with
booleans. The values would be :
- FALSE => deny
- TRUE => allow
- NULL => unknow
2009-06-23 10:14:38 +02:00
Romain LE DISEZ
c80d2da0a9
Remove an useless ORDER BY.
...
It improves compatibility with PgSQL.
2009-06-23 10:09:46 +02:00
Bharat Mediratta
ec61cd5031
Fix css indentation
2009-06-22 14:20:28 -07:00
Bharat Mediratta
d8fe96d70b
Update version comparison to match latest gallery module version
2009-06-22 13:48:19 -07:00
Bharat Mediratta
a5eb5e3e80
Updated
2009-06-22 13:25:46 -07:00
Tim Almdal
e3457f8dba
Remove debugging output that was overlooked
...
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca >
2009-06-22 21:27:47 +08:00
Tim Almdal
fa4bb5b7ac
Change the quick pan from static to dynamic. This allows modules to add buttons to the
...
quick pane. The quick pane is now divided into 4 sections: left, center, right and
additional. Additional items appear in the drop down box. Buttons are not sorted
within the groupings.
In addition, the quick pane will overflow onto the "additional" dropdown if there is not
enough room to display all the buttons.
The use case is the digibug printing module needed to add a button to the quick pane, and
I don't like putting code into core that says if module is active... That's another one
of those code smells :-)
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca >
2009-06-22 21:08:35 +08:00
Bharat Mediratta
06f066164f
Add Session::abort_save() to Kohana.
...
Filed upstream as: http://dev.kohanaphp.com/issues/1801
2009-06-21 15:09:32 -07:00
Bharat Mediratta
ef7f1d07b2
Center the "all done" dialog. Use Jquery and externalize the CSS (I was being
...
too conservative before). Fixes ticket #413 .
2009-06-20 12:09:49 -07:00
Bharat Mediratta
acd54fefda
Fix a bug in gallery_installer where on an initial install we were
...
only implementing schema version 1. This caused install.sql to be
populated from version 1 which meant that after install you'd have to
run the upgrader. No harm done, and the pattern is fixed for the
future.
Alphabetize the tables so it's easier to find stuff.
2009-06-20 01:24:21 -07:00
Bharat Mediratta
b3226d7cbb
Improve the task dialog
...
1) Put a "starting up..." message before there's any feedback from the server
2) show the title of the task in the dialog.
2009-06-19 13:25:42 -07:00
Andy Staudacher
b6290b45cf
Fix format of source message in l10n client (adding a newline between plural forms)
2009-06-18 12:44:05 -07:00
Andy Staudacher
926eab7168
Fix plural messages in l10n scanner - Bad typo lead to basically breaking all plural ("other") forms.
2009-06-18 12:35:07 -07:00
Andy Staudacher
06f37b5a53
Fix/remove unnecessary escaping of double quotes in l10n scanner.
2009-06-18 01:42:59 -07:00
Tim Almdal
a6a9b256ae
Correct the "inappropriate intimacy" smell that bharat's refined senses pick up
2009-06-17 13:34:18 -07:00