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
Tim Almdal
4fe5801c88
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.
2009-11-18 10:34:39 -08:00
Tim Almdal
3f600d46e4
Update the xss golden file so tests pass.
2009-11-18 08:53:35 -08:00
Tim Almdal
4d4e81ca26
Create a helper to load the theme information from theme.info
2009-11-18 08:38:11 -08:00
Chad Kieffer
3aa7a3fcda
Address RTL issues reported in ticket #869 . Placement of checkboxes and radio buttons and sidebar block management lists.
2009-11-17 22:32:25 -07:00
Bharat Mediratta
7c2c77f3c1
Merge branch 'master' of git@github.com:gallery/gallery3
2009-11-17 15:53:30 -08:00
Bharat Mediratta
b8e94302bd
Tweak load_themes() to match exactly "/admin" or the "/admin/" prefix,
...
but not just the "/admin" prefix because that breaks if you add an
image like "admin_photostream".
2009-11-17 15:36:02 -08:00
Chad Kieffer
401c9c21e1
White-space fix and quoting update.
2009-11-17 15:16:40 -07:00
Bharat Mediratta
1067e68292
Redesign the way that we consider page types to create buckets of page
...
types, and a subtype for specifics. Currently the top level bucket
collection, item, other
Here are the core subtypes so far:
collection: album, search, tag
item: movie, photo
other: login, reset, comment-fragment, comment
It's legal to create new page_subtypes whenever you want. Use the
appropriate page_type to get the coarse grain behavior that you want.
2009-11-17 14:04:45 -08:00
Tim Almdal
bf4c518bb5
Store the directory, files and translation cache in the gallery3 cache instead of trying to store it in the task. It is possible with lots of modules and lots of incoming translations to go beyond the 64K limit in the task context. Possible fix for #886 .
2009-11-16 14:25:25 -08:00
Tim Almdal
2e4d29e7dd
If an empty array is passed into set method, then make sure the tag value being stored in the database is null, not "Array"
2009-11-16 14:23:29 -08:00
Tim Almdal
14f1fc30b5
Use some hacky css to get the buttons alighned properly. Fixes ticket #880 .
2009-11-16 07:49:17 -08:00
Bharat Mediratta
9379308f91
Xss data update
2009-11-15 19:36:02 -08:00
Bharat Mediratta
e0f4e6500d
Use text::alternate() instead of hand-rolled even/odd code.
2009-11-15 19:34:44 -08:00
Bharat Mediratta
64ef86a8ee
Updated xss data.
2009-11-15 19:27:35 -08:00
Bharat Mediratta
731ff800cd
Use 'git ls-files' instead of glob() so that we only check files known
...
to Git. This means that local files which we choose to exclude from
git don't have to follow the same permission model.
2009-11-15 19:20:43 -08:00
Bharat Mediratta
5a27ce7e8f
Save/restore $_SERVER before/after tests to avoid contamination.
...
Fix albums/photos tests to make sure we're really getting the
HTTP_REFERER back.
2009-11-15 19:10:56 -08:00
