Commit Graph
5668 Commits
Author SHA1 Message Date
jhilden 1855642bd1 improved UI for the languages admin
this should take care of bug #329
2009-08-28 16:19:41 -04:00
Chad Kieffer 5a2853bca1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-28 13:48:54 -06:00
Chad Kieffer f1e008a14f Don't clone hover item, apply styles to the original container. Contextual menu rotates are now immediately visible. Fixes ticket 667. 2009-08-28 13:47:35 -06:00
Chad Kieffer 94b5749d46 Convert tabs to spaces. 2009-08-28 13:42:45 -06:00
Bharat Mediratta 6dcfdb6432 Fix a bug in notification where were using get() instead of current()
to get the first item in an ORM result set.
2009-08-28 12:42:37 -07:00
Bharat Mediratta dcead39dfb Merge branch 'talmdal_branch' of git@github.com:gallery/gallery3 2009-08-28 12:37:01 -07:00
Bharat Mediratta e24d23bf14 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-28 12:33:47 -07:00
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
Bharat Mediratta b9aca313fa Fix a couple of off-by-one errors. 2009-08-28 11:41:06 -07:00
Bharat Mediratta 48e84243d2 Update help text to eliminate 'edit' since we don't do that yet, and change "items" to "photos". 2009-08-28 11:21:19 -07:00
Bharat Mediratta 76e541745f Refactor rearrange_task_handler to have a more linear flow. 2009-08-28 11:13:04 -07:00
Bharat Mediratta 8ca573741e Indentation fixes. 2009-08-28 10:48:53 -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
Bharat Mediratta 47fd2dc65e Clean up in preparation for some refactoring. 2009-08-28 09:53:54 -07:00
Bharat Mediratta 98361e7613 Add a @todo to defer loading the script/css to the organize dialog. 2009-08-28 09:25:29 -07:00
Bharat Mediratta 83e850bc33 Minor style fixes. 2009-08-28 09:19:20 -07:00
Bharat Mediratta e8a3fe97a4 Fix whitespace. 2009-08-28 09:09:33 -07:00
Bharat Mediratta 7c5275a63c Fix indentation. 2009-08-28 09:08:39 -07:00
Bharat Mediratta b72b09163b Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-28 08:48:56 -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 5235c7a0b7 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 16:28:27 -07:00
Tim AlmdalandBharat Mediratta 254feecd0a Fix ticket #644
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
2009-08-27 16:28: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 8d2cd12c58 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-27 16:15:01 -07:00
Tim AlmdalandBharat Mediratta e0e430bd84 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 16:12:44 -07:00
Tim AlmdalandBharat Mediratta 5db90d432d Fix ticket #644
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
2009-08-27 16:12:44 -07:00
Bharat Mediratta 74363ced87 Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD
Conflicts:
	modules/slideshow/helpers/slideshow_event.php
2009-08-27 16:11:47 -07:00
Bharat Mediratta 98e9a96ba4 Don't display the slideshow icon if there are no descendants. ticket #660
Conflicts:

	modules/slideshow/helpers/slideshow_event.php
2009-08-27 16:10:38 -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 bfc64685e4 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 15:37:18 -07:00
Tim Almdal 84b018b08d Fix ticket #644
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
2009-08-27 15:22:27 -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 77ac00c3b8 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-27 14:57:35 -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
Bharat Mediratta ea717bbe2a Add a comment about putting the mod_rewrite block into the apache
config files, since .htaccess will get clobbered.
2009-08-27 14:56:07 -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
Tim Almdal 752594f87a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 14:47:42 -07:00
Bharat Mediratta 75c098204f Add a comment about putting the mod_rewrite block into the apache
config files, since .htaccess will get clobbered.
2009-08-27 14:13:47 -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