stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-30 19:50:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Kieffer b7803e99c1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 14:28:23 -06:00
Chad Kieffer ddddfc5e8e Make the info block display 'File name', instead of 'Folder name' when showing a photo. Fixes #631 2009-08-27 14:27:49 -06:00
Bharat Mediratta 5f86332db9 Convert tabs to spaces. 2009-08-27 11:41:19 -07:00
Tim Almdal 940edac81c delete the simple slideshow 2009-08-27 11:35:14 -07:00
Tim Almdal dc67de520d Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-25 15:00:44 -07:00
Andy Staudacher 0be38d143c Workaround to make G3 work with Turkish locale. 
Thanks to katpatuka for providing the fix.
 2009-08-25 13:32:57 -07:00
Bharat Mediratta deafc01c21 Remove accidentally submitted .DS_Store file. 2009-08-23 15:05:18 -07:00
Chad Kieffer 2264a80368 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-23 15:00:00 -06:00
Chad Kieffer 457708311a Cut down on jittering of the context menu on open on resize view. 2009-08-23 14:58:26 -06:00
Tim Almdal 88995e5a2e Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-20 16:26:54 -07:00
Tim Almdal afd85945d7 Add window resizing support. Just can't seem to get loading icon to show up 2009-08-20 13:51:53 -07:00
Tim Almdal 256822a1e8 Refactor the _auto_fit method in gallery.show_full_size to a common method in gallery.common.js 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-21 03:56:38 +08:00
Tim Almdal 74d79dc819 Refactor the _auto_fit method in gallery.show_full_size to a common method in gallery.common.js 2009-08-20 12:53:20 -07:00
Tim Almdal 152caf5195 Resolve issues with show the wrong album when slideshow is invoked from a photo page. In addition, implement the slideshow based on tags. 2009-08-20 08:47:42 -07:00
Tim Almdal 5943761df2 Initial commit of a basic slideshow 2009-08-20 07:30:49 -07:00
Tim Almdal 230b9a26ac Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-20 05:23:52 -07:00
Tim Almdal 2da7f93784 Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-20 12:26:47 +08:00
Tim Almdal c85df82fde Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher
 2009-08-19 21:24:05 -07:00
Chad Kieffer 7d36f43d0b Update docblocks and todos 2009-08-19 18:51:14 -06:00
Tim Almdal b989383fe6 Modified the conversion of the margin-top and margin-bottom css values. The 
problem arises because $(selector).css("margin-top) does not return a string
and therefore the replace function is undefined.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-20 07:11:13 +08:00
Tim Almdal bfcbb60039 Modified the conversion of the margin-top and margin-bottom css values. The 
problem arises because $(selector).css("margin-top) does not return a string
and therefore the replace function is undefined.
 2009-08-19 16:06:36 -07:00
Tim Almdal bb24ce26b4 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-19 14:03:00 -07:00
Tim Almdal 407ce45bc5 Correct indentation 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-19 21:16:03 +08:00
Tim Almdal e3f5a8be90 Change the setting of page type from "item" to "photo". Thre is no page type 
of item.  All other references use photo for non album and non dynamic pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-19 21:16:02 +08:00
Tim Almdal b184f995f8 Correct indentation 2009-08-19 06:12:29 -07:00
Tim Almdal bc42df35ee Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-19 05:14:05 -07:00
Chad Kieffer 3b8323d5b4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-18 23:08:32 -06:00
Tim Almdal 2ac916783a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-18 18:48:17 -07:00
Bharat Mediratta 67d770fb2a Don't call dirname() on the toolkit dir, it's already a directory! (Thanks Kaare) 2009-08-18 13:48:00 -07:00
Tim Almdal 6e054273f3 Change the setting of page type from "item" to "photo". Thre is no page type 
of item.  All other references use photo for non album and non dynamic pages.
 2009-08-18 08:40:52 -07:00
Tim Almdal 82edd2a37b This patch adds some security to the organize dialog. 
1) If images are dragged from the content pane and dropped on a branch in the
   tree that the user only has view priviledges, then the drop is cancelled
   and the images are reverted.
2) The user cannot click on a branch, to which they only have view priviledges,
   the content pane does not change to the new album
 2009-08-17 19:52:40 -07:00
Tim Almdal 848c5439b3 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-17 16:12:37 -07:00
Tim Almdal 24d7f5df8c Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module) 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-18 05:21:17 +08:00
Tim Almdal afa8cade7f Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue. 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-18 05:18:41 +08:00
Tim Almdal 8156eb9651 Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue. 2009-08-17 14:16:11 -07:00
Tim Almdal 6f6d5b306b remove the batch start/stop and replace the ORM update of the weight, with a direct sql update. This bypasses the gallery3 event mechanism. Fire a album_rearrange event when the rearrangement is complete 2009-08-17 12:56:05 -07:00
Tim Almdal 69d1b16818 Change back to using the ORM to update the child weight, but use the batch::start() method so notifications are queued 2009-08-17 12:32:33 -07:00
Tim Almdal 5e9c602b09 Fix the performance problem related to setting the child weight, by bypassing ORM and generating the sql directly. 2009-08-17 11:46:10 -07:00
Tim Almdal dd9f4b6d7f The rearrange functionality works. but it is slower than shit. I've left the debug statements in until we can solve this issue. 2009-08-17 08:49:37 -07:00
Tim Almdal 7fc833a392 Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module) 2009-08-17 08:47:39 -07:00
Tim Almdal 5f546050d1 The progress bar appears during a move. Still having an issue with unable to do a single select after a drop operation. I think its related to needing to destroy the existing selectable before creating the new one. The error I get is "this._selection[i].data("selectabe-item") is undefined." 2009-08-16 16:20:43 -07:00
Tim Almdal 76f320ab3d In this patch, drag now works to the album tree, but the progress bar is not 
showing. As well fixed a problem where selectable single clink no longer
worked when the album was reloaded.
 2009-08-16 12:36:14 -07:00
Tim Almdal eeae2dc56c Added javascript portion of the drop functionality. At this point you can drag selected images and drop them on the micro thumb grid in a different position or onto a branch in the gallery tree. No ajax call is made, it just writes the generated url and post data to the console, so it only works in ff right now. 2009-08-13 21:31:20 -07:00
Tim Almdal d758266fab Add a visual indicator of the insertion point 2009-08-13 18:58:40 -07:00
Tim Almdal 5a84df9ac5 Vertical scrolling of the thumb grid seems to work better now. Wasn't able to get the draggable autoscrolling working, so this is a poor replacemment. 2009-08-13 10:56:50 -07:00
Tim Almdal 3823f65dfb Implement the first part of drag functionality. Having trouble getting visual feedback of the drop position between thumbnails, so this commit provides a checkpoint for trying various options 2009-08-12 21:55:25 -07:00
Tim Almdal 6281995385 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-12 16:01:24 -07:00
Tim Almdal 693e95e7b0 Use the jquery-ui library that contains a prerelease version of the slectable component 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-13 05:20:38 +08:00
Tim Almdal 39b37cc585 Use the jquery-ui library that contains a prerelease version of the slectable component 2009-08-12 14:13:39 -07:00
Chad Kieffer bb6bf17076 Move context menu to gallery.common, forgot to include in prior commit 2009-08-11 00:41:07 -06:00