Beckett Madden-Woods
1a1a05ed94
Merge commit 'upstream/master'
2011-01-09 04:03:31 +00:00
Beckett Madden-Woods
b78a1319ae
Add item delete support to the organize module. Fixes #1588 .
2011-01-09 03:59:25 +00:00
Bharat Mediratta
4c80ed53d2
Put up a more visually pleasing placeholder for items that are
...
missing a thumbnail. Fixes #1591 .
2011-01-08 19:27:08 -08:00
Bharat Mediratta
d0df4896b0
Specify a width for the sort order dropdowns so that they don't
...
get squeezed on smaller screens.
2011-01-08 18:49:07 -08:00
Bharat Mediratta
8f5a3fd0c2
Update the dialog title to reflect the album we're currently
...
organizing.
2011-01-08 18:45:10 -08:00
Bharat Mediratta
249ca99c69
Updated with new bundle that has Ext.Msg in it.
2011-01-08 18:21:07 -08:00
Bharat Mediratta
713bd4eb6a
Improve gallery::find_file() to do a better job of detecting the modules/themes directories.
...
Fixes #1590 .
2011-01-08 18:10:43 -08:00
Bharat Mediratta
e8bbf53708
Merge branch 'Ticket#1577' of git://github.com/Joe7/gallery3
2011-01-08 17:09:32 -08:00
Bharat Mediratta
92f66058d3
Revert "Warn admins after login if their PHP install has the"
...
This reverts commit 612ddd7050
.
2011-01-08 16:58:52 -08:00
Bharat Mediratta
e1e1e860cd
Use the code version when installing a module that has no installer,
...
instead of hardcoding version 1. Fixes #1589 .
2011-01-08 16:51:25 -08:00
Bharat Mediratta
4fc5d50eb8
Bump the organize module to version 3 and get rid of the code that
...
makes sure that it depends on the REST module.
2011-01-08 12:59:12 -08:00
Joe7
5e8d92552b
Temporarily removed ref tag to get the page validated. (Was also pointing at a rather semi-finished looking page)
2011-01-08 18:44:43 +01:00
Bharat Mediratta
7b382b363d
Use the appropriate protocol for the reCAPTCHA script (so use https when the page is https).
...
Fixes #1445 .
2011-01-08 00:19:57 -08:00
Bharat Mediratta
966dee8628
Move tag count management into the model. Fixes #1586 .
2011-01-07 23:38:08 -08:00
Bharat Mediratta
7bbbe307ac
Merge branch 'Ticket#1154' of git://github.com/Joe7/gallery3
2011-01-07 21:44:03 -08:00
Joe7
07acd2b750
Set video player to keep the aspect ratio of the video when playing in fullscreen
...
Fixes ticket #1154 - credit goes to floridave
2011-01-08 06:09:44 +01:00
Bharat Mediratta
d17ba036ee
Don't enable the REST module by default ( fixes #1585 ).
...
Bump the info module per changes for #662 .
2011-01-07 20:44:45 -08:00
Bharat Mediratta
e1e2d9448f
Merge branch 'master' into organize_dev
2011-01-07 20:29:06 -08:00
Bharat Mediratta
edcb3b6656
Make the CSS for the organize menu consistently g-organize-link. Fixes #1070 .
2011-01-07 20:23:49 -08:00
Bharat Mediratta
85ae320288
Keep Item_Model::scale_dimensions from upscaling. Fixes #1579 .
2011-01-07 20:18:24 -08:00
Bharat Mediratta
4756db435c
Minor style cleanup
2011-01-07 20:09:27 -08:00
Bharat Mediratta
e4c6662dae
Merge branch 'master' of git://github.com/ckieffer/gallery3
2011-01-07 20:03:26 -08:00
Joe7
e86e8b8bd1
Added missing spaces (manual merging from 0d36b97aca3b5ed53ea3ea398ce28b0f6198e577)
2011-01-07 17:53:37 +01:00
Joe7
5bfb7fb96a
Added batch importer for groups
...
Added missing ordering for comments and tags retrieving queries
(One might gets the same output without ordering especially if column is the primary key, but the only way to go for sure it by setting it)
2011-01-07 17:52:12 +01:00
Joe7
c338d3138e
Importing Gallery2 users in batches
...
Fixes Ticket #1554
2011-01-07 17:51:21 +01:00
Joe7
f2477703fa
Fix against ticket #1581 - based on 0d36b97aca
2011-01-07 17:33:37 +01:00
Bharat Mediratta
89597e7e70
Add a spinner to the dialog when loading the iframe so that it's not
...
just a blank dialog. Create separate CSS for dialog vs. frame.
Don't show the Loading message for the first load.
2011-01-06 23:43:26 -08:00
Bharat Mediratta
24b8e9b060
Make the sort column combobox wider.
2011-01-06 23:15:07 -08:00
Bharat Mediratta
8ece1e3a19
Create a custom bundle of ExtJS for organize. It's 18% smaller, but
...
still pretty large.
2011-01-06 23:10:42 -08:00
Bharat Mediratta
0c9dbc9663
Adjust CSS for IE compatibility while keeping the grid tight on non-IE.
2011-01-06 21:40:16 -08:00
Chad Kieffer
06d94065ce
Updates per Bharat's pull request review. Renamed info_block_metadata event to info_block_get_metadata.
2011-01-06 21:03:19 -07:00
Chad Kieffer
a897a9d53f
Also missed commiting this in a1e3b1ed17
.
2011-01-06 21:00:28 -07:00
Chad Kieffer
740a6531fc
Missed this commiting this in a1e3b1ed17
.
2011-01-06 20:57:56 -07:00
Bharat Mediratta
600e04b58c
Lock the drag zone if the album is not editable so that users don't
...
start illegal drags.
2011-01-06 12:02:17 -08:00
Bharat Mediratta
fc6907dcfe
Switch back to setting nodes as leaves, but fix the drop zone code to
...
allow dropping on leaves.
2011-01-06 11:46:15 -08:00
Bharat Mediratta
9682b7ea6e
Remove unnecessary leaf param from TreeNode results.
2011-01-06 09:59:08 -08:00
Bharat Mediratta
0abd77c9e5
Fix typo.
2011-01-06 09:58:21 -08:00
Bharat Mediratta
7600e22433
Whitespace fix.
2011-01-06 09:58:14 -08:00
Bharat Mediratta
514d5affa6
When generating the tree, don't mark nodes with no children as a leaf
...
because that confuses the TreeDropZone JS into thinking that it can't
ever have children.
2011-01-06 09:49:37 -08:00
Bharat Mediratta
84f287865e
Don't allow moving an item into its own hierarchy. Just silently skip
...
those sources for now.
2011-01-06 08:17:01 -08:00
Bharat Mediratta
56c4997663
Merge branch 'organize_dev' of github.com:gallery/gallery3 into organize_dev
2011-01-06 08:12:54 -08:00
Bharat Mediratta
84f73fbe9e
Merge branch 'master' into organize_dev
2011-01-06 00:14:59 -08:00
Bharat Mediratta
edf2a46b02
horizontally center thumbnails
2011-01-06 00:05:35 -08:00
Bharat Mediratta
9e6e2138df
Only mask the data view on changes, it's a little less jarring.
2011-01-05 23:55:21 -08:00
Bharat Mediratta
33b8ec7a62
Add a label for the sort order
2011-01-05 23:47:14 -08:00
Bharat Mediratta
b424cac5c5
Double clicking on an album switches to that album, selects it in the
...
tree and expands it if it's not already expanded.
2011-01-05 22:48:27 -08:00
Bharat Mediratta
2167168f51
Get rid of the expando caret in front of empty folders
2011-01-05 22:32:33 -08:00
Bharat Mediratta
aebcd44513
Swap organize_frame and organize_dialog since they were semantically
...
reversed. organize_dialog contains the stuff that pops up in the dialog,
organize_frame contains the stuff that's in the embedded iframe.
2011-01-05 22:19:33 -08:00
Bharat Mediratta
e6b3886f8f
Functional improvements:
...
- Add support for dragging a selection box.
Visual improvements;
- The "ghost" selection now has minimized thumbnails so that
you're dragging a smaller div around the screen.
2011-01-05 22:15:13 -08:00
Bharat Mediratta
9863743001
Only refresh the tree when we move albums around.
2011-01-05 21:22:41 -08:00