stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 11:29:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,634 Commits 4 Branches 0 Tags
2bbce8dddb0ab0a00aee727e2f639b793988a1d1
Commit Graph

3591 Commits

Author SHA1 Message Date
Tim Almdal
2bbce8dddb Fix for ticket #1117 align videos to the center. 2010-06-17 09:10:01 -07:00
Tim Almdal
38d09c5d1a Scale a movie to the resize size so that it doesn't overflow into the sidebar. 2010-06-17 08:03:08 -07:00
Tim Almdal
3d4f04e827 Change the add album dialog to not replace the internet address or name fields if they already contain values. 2010-06-17 06:14:24 -07:00
Bharat Mediratta
a27189ce9f Remove comment_rest::post() -- that's in comments_rest now. 2010-06-16 20:02:52 -07:00
Bharat Mediratta
ef06a13482 Merge branch 'master' of github.com:gallery/gallery3 2010-06-16 18:19:39 -07:00
Bharat Mediratta
1aeaa7daab Add REST support for comments. You can view, add, edit and delete 
comments.
 2010-06-16 18:05:15 -07:00
Tim Almdal
172c3fd209 Fix a typo... The controller parameter to the flex organize module should be controllerUri instead. 2010-06-16 17:31:31 -07:00
Bharat Mediratta
bd496cc95c Add start/num query parameters to tags::get() 2010-06-16 16:09:29 -07:00
Bharat Mediratta
2025c2c37d If the G2 orderBy or orderDirection fields are blank, use the G2 defaults. 
Second half of fix for #1054.
 2010-06-16 15:53:07 -07:00
Bharat Mediratta
8d1c6887a5 Fix a bug introduced in 1077477a90 where 
we don't generate album highlights correctly.  Possible fix for #1054.
 2010-06-16 15:12:00 -07:00
Bharat Mediratta
179161d05e Fix two bugs: 
#1161: guest comments get dropped because of a missing email address.
#1075: G2 comments with " get turned into "
 2010-06-16 15:07:13 -07:00
Bharat Mediratta
35bbffcc29 Merge branch 'master' of github.com:gallery/gallery3 2010-06-16 14:25:13 -07:00
Tim Almdal
8ee60e6b5d slap my wrist... i forgot a debugging statement 2010-06-16 11:17:18 -07:00
Tim Almdal
ea8653f947 Fix for ticket #1131. If the rss feed is for an item, then retrieve the item. Using the left and right pointers find all the comments for the child items. Thanks to jankoprowski for the initial investigation. 2010-06-16 08:39:09 -07:00
Jan Koprowski
1fb3339326 Fix issue1068. Fill from_id field in photo with indetificator 2010-06-16 22:51:39 +08:00
Bharat Mediratta
e3535349ab Revert "Add a "convert_ids" parameter to Item_Model::as_restful_array(), which" 
This reverts commit 98fce83de5.

Conflicts:

	modules/gallery/tests/Item_Model_Test.php
 2010-06-15 20:25:35 -07:00
Bharat Mediratta
57b53e6193 Guard against relationships() not returning an array. 2010-06-15 20:21:10 -07:00
Bharat Mediratta
a432a43b3b Revert "Change the item rest update processing to call the 
item::move(source, target) helper when the parent member has changed.
Using the move method insures that names and slugs that could conflict
in the target album are resolved properly.  Changed the item::move
method so it returns a message to be displayed if the caller chooses.
And changed the move controller to display the message returned by the
move if the item name was renamed as part of the move."

Rolling this back for a couple of reasons:

1) Bug in move.php ("message.info" is not a function name)

2) Having the message come back from the API call as a side-effect is
sloppy.  We should find a cleaner way to do this checking.

3) having item::move() call save() on any changed values in the ORM
is counter-intuitive.  Move should move, save should save.

I think the right approach here is to roll the move() code properly into
save().

This reverts commit 2492280cc0.
 2010-06-15 17:18:22 -07:00
Bharat Mediratta
48dc07dbc8 Revert "Fix for ticket #1118. Create a item::save_with_retries helper 
method, which encapsulates saving an item and handling name and slug
conflicts. Call this instead of doing a save directly."

Rolled this back because it fails KISS.  We already have an API for
saving models with Item_Model::save() that's consistent with all of
our other model code.  Adding a new way to save items is confusing and
inconsistent.

This reverts commit 9504f71efc.
 2010-06-15 17:17:25 -07:00
Bharat Mediratta
8fb56abf03 Bump the organize module to version 2, and check to make sure that the 
REST module is active.
 2010-06-15 16:30:02 -07:00
Bharat Mediratta
94ada2361d Fix a bug in the upgrader where we weren't bumping the version number 
during the upgrade path, so the 2nd stanza (version 2 to version 3) was never getting executed.
 2010-06-15 16:14:30 -07:00
Bharat Mediratta
1df752a2f2 Make the "name" column a little wider. 2010-06-15 16:11:21 -07:00
Bharat Mediratta
78186c262c Update the description. 2010-06-15 16:09:45 -07:00
Bharat Mediratta
ae6af2f9b6 Install the rest module by default. 2010-06-15 16:01:41 -07:00
Bharat Mediratta
4d40cf62e9 Sort files by path in _dump_var() for consistent output. 
Skip . and .. (PHP 5.3 iterators seem to include those now).
 2010-06-15 15:50:10 -07:00
Bharat Mediratta
d96ce71f1a Remove a stray period. 2010-06-15 15:29:45 -07:00
Tim Almdal
9504f71efc Fix for ticket #1118. Create a item::save_with_retries helper method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly. 2010-06-15 14:18:23 -07:00
Tim Almdal
2492280cc0 Change the item rest update processing to call the item::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move. 2010-06-15 12:52:28 -07:00
Tim Almdal
207f6beb61 Only change the weights of the album children if the item sort_column is set to weight. 2010-06-15 11:40:01 -07:00
Tim Almdal
00c4cb3f63 Revert "Change the item rest update processing to call the itemm::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight." 
This reverts commit 603d464014.
 2010-06-15 11:38:46 -07:00
Tim Almdal
603d464014 Change the item rest update processing to call the itemm::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight. 2010-06-15 11:20:04 -07:00
Tim Almdal
81f176cf8e url::site(...) adds a leading slash to the uri it generates. Take this into account when creating the base url for accessing rest requests. 
Update the sort dropdown box to manual when album items are rearranged.
 2010-06-15 09:39:45 -07:00
Bharat Mediratta
7e5661cf49 Add a simple/cheap test to make sure that the database config is ok. Fixes ticket #1029. 2010-06-15 09:14:10 -07:00
Bharat Mediratta
b2afba1db1 The fact that we have a path to a G2 embed file doesn't mean that it's still 
valid so check to see that it's ok before proceeding.  This should resolve #458.
 2010-06-15 09:14:10 -07:00
Tim Almdal
f5eb5d5d70 add an 'icon' to identify albums in the organize dialog. 2010-06-15 09:14:09 -07:00
ckieffer
9911372d58 Removed self-closing slash from opening <li> tag. 2010-06-15 09:14:09 -07:00
Tim Almdal
f10d641044 Change the parameters for the organize dialog box. The baseUrl parameter was removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box. 2010-06-14 13:07:58 -07:00
Tim Almdal
1c5264d7f5 Merge branch 'master' of git@github.com:gallery/gallery3 2010-06-14 07:44:17 -07:00
Bharat Mediratta
793780daa7 Replace __CSRF__ with the actual csrf token. 2010-06-13 20:51:11 -07:00
Bharat Mediratta
6f443a819b Change single to double quotes. 2010-06-13 20:49:50 -07:00
Tim Almdal
821d3f7854 Remove a debugging statement. 2010-06-13 19:50:52 -07:00
Tim Almdal
5decb3b252 Move the source to the gallery3-flex repository. 2010-06-13 19:31:48 -07:00
Tim Almdal
47aa651430 Fix problems ith IE and flex initialization when one of the flashvars contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome 2010-06-13 17:58:50 -07:00
Tim Almdal
938eea7fc4 Merge branch 'master' into talmdal_dev 2010-06-13 09:59:27 -07:00
Bharat Mediratta
db0966a9bc Fix up some indentation and comment style. 2010-06-12 15:39:38 -07:00
Bharat Mediratta
87f8b6ff0a Bounce the user to the login page if they try to get to part of the 
admin site as a guest.  Also, theme the login/html page.
 2010-06-12 15:28:03 -07:00
Bharat Mediratta
dceecabbf1 Make login/logout continuation url code consistent. Where necessary, 
we specify the continue_url in the session, but we store it in the
login form so that we can propagate it across the session creation
that happens at login time.
 2010-06-12 15:16:47 -07:00
Bharat Mediratta
c026da85cd Use "continue_url" instead of "continue" for consistency with the 
reauth code.
 2010-06-12 15:10:34 -07:00
Bharat Mediratta
b61b50604b Push the continue url into the form for consistency with other 
login/continue code.
 2010-06-12 15:09:16 -07:00
Bharat Mediratta
63d95087bf Stop trying to parse the continue url in the logout controller because 
it requires us to reproduce a bunch of complex routing logic.
Instead, just have the logout link generating code generate a link
that's visible to guests.
 2010-06-12 13:35:12 -07:00