stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-01 20:50:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,493 Commits 4 Branches 0 Tags
36d1a8c4f2c85ed2ece0212ce1e0b682056d0d2a
Commit Graph
1827 Commits
Author SHA1 Message Date
Bharat Mediratta 36d1a8c4f2 Rename sort columns: 
* Order Added => Manual
  * Capture Date => Date captured
  * Creation Date => Date uploaded
  * Updated Date => Date modified

Set the default sort order to "created" which mimics what we had
before, expt that it is not manual.
 2009-08-28 12:08:21 -07:00
Bharat Mediratta 5133f93290 Don't record mail failures when we throw the exception, record them 
when we catch the exception instead.
 2009-08-28 11:51:41 -07:00
Bharat Mediratta 16fc4465d0 Merge branch 'master' of git@github.com:talmdal/gallery3 2009-08-28 11:42:54 -07:00
Tim Almdal 430b57578b Wrap all the notification helpers call with a try catch that swallows the exceptions, so the exceptions don't interrupt the upstream processes 2009-08-28 10:27:02 -07:00
Tim Almdal 9c79afcff5 Add logging to sendmail library when exception encountered 2009-08-28 10:24:16 -07:00
jhilden c0c65c6fcc Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 11:27:38 -04:00
Tim Almdal f27919aa1e Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 21:56:27 -07:00
jhilden 3d2e36f5b6 fixed CSS bug in the simple uploader #629 
and improved permissions UI to include breadcrumbs (consistent with the uploader dialog)
 2009-08-27 20:34:42 -04:00
Bharat Mediratta 826e104fa9 Get rid of the extra "Folder name" row. It's noisy. Fixes ticket #593. 2009-08-27 17:15:20 -07:00
Bharat Mediratta a28dd09c4e Properly deal with invalid images. This fixes ticket #611 which shows 
a BMP masquerading as a .jpg causing us to be unable to rebuild
resizes and thumbnails.  Now if that happens, we discard the file, log
it and move on.
 2009-08-27 17:04:48 -07:00
Tim Almdal 377bdf2803 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 16:29:22 -07:00
Tim AlmdalandBharat Mediratta 93138f6ae7 Don't display the slideshow icon if there are no descendants. ticket #660 2009-08-27 16:28:17 -07:00
Bharat Mediratta 4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use 
the system's default table specification.  Fixes ticket #597.
 2009-08-27 15:47:54 -07:00
Tim Almdal 56937cac5b Don't display the slideshow icon if there are no descendants. ticket #660 2009-08-27 15:04:14 -07:00
Bharat Mediratta 980ee6b4b2 Revert "delete the simple slideshow" 
This reverts commit 940edac81c.

Revert "Add window resizing support. Just can't seem to get loading icon to show up"

This reverts commit afd85945d7.

Revert "Resolve issues with show the wrong album when slideshow is invoked from a photo page.  In addition, implement the slideshow based on tags."

This reverts commit 152caf5195.

Revert "Initial commit of a basic slideshow"

This reverts commit 5943761df2.
 2009-08-27 14:56:08 -07:00
Chad KiefferandBharat Mediratta 2c6328a47b Make the info block display 'File name', instead of 'Folder name' when showing a photo. Fixes #631 2009-08-27 14:56:07 -07:00
Bharat Mediratta db1f6e3e35 Don't ask for csrf when we're resetting passwords. They're not gonna have one. Duh! 
Fixes #642.
 2009-08-27 14:56:07 -07:00
Bharat Mediratta 88149a5afa Convert tabs to spaces. 2009-08-27 14:56:07 -07:00
Bharat Mediratta 7771d0cf83 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 13:30:22 -07:00
Bharat Mediratta e586389f65 Don't ask for csrf when we're resetting passwords. They're not gonna have one. Duh! 
Fixes #642.
 2009-08-27 13:29:45 -07:00
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
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 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 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
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 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 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