stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-21 20:09:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,536 Commits 4 Branches 0 Tags
39559fdfd09491dce669d0351768fe2b13ccdd03
Commit Graph

1854 Commits

Author SHA1 Message Date
jhilden
22c7f44d0b Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-29 14:29:54 -04:00
jhilden
746609b967 * created new generic "Add" dropdown in the site menu. this should take care of ticket #537 
* removed start/stop translation menu items from the admin, since they are on the languags admin page now
 2009-08-29 14:27:08 -04:00
Tim Almdal
27b81257fa Standardize the access to the create_random_item method 2009-08-29 11:24:12 -07:00
Tim Almdal
08d7fda7f8 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-29 11:22:19 -07:00
jhilden
8d256898c7 improved translation interface so that it now can be closed without going to the admin 2009-08-29 14:21:53 -04:00
Tim Almdal
6de10a54dd Fix typo in the parameter list 2009-08-29 11:21:30 -07:00
Bharat Mediratta
1527f149a9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-29 10:49:25 -07:00
Bharat Mediratta
b833cb6073 Get rid of the task infrastructure. The multiple requests greatly 
slow down simple operations.  We may run into problems with more
complex operations, but let's only add tasks into the mix when it's
clear that we need them.
 2009-08-29 10:48:23 -07:00
Bharat Mediratta
f257cd3d69 Major refactor of organize: 
* Clean up naming conventions for variables in the controller
  so that we specifically refer to albums with $album_id, etc.

* Move complexity for drawing tree out of the controller and into
  the view.

* Simplify task definitions to get rid of extraneous text

* Change __PLACEHOLDERS__ to clearly define which is the album
  and which is the item that we're moving before/after

* Remove as many CSS ids as we can from the tree view to keep
  things simple
 2009-08-29 10:00:47 -07:00
Bharat Mediratta
acce8cbafd Log the actual exception details, before swallowing the exception. 2009-08-29 08:47:44 -07:00
jhilden
c234f9fd39 improved translations admin interface 2009-08-28 20:53:06 -04:00
Bharat Mediratta
cb2171d082 Display the sort order in the Organize dialog, and allow users to 
change the sort order on the fly.
 2009-08-28 14:27:37 -07:00
Tim Almdal
31d63a0d0a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-28 13:47:36 -07:00
Tim Almdal
1d5262f9c3 Fix ticket #591: reCaptcha always on the page. 
1) move creating the "Add a comment" button into the comments.html.php
2) use $.get() to retrieve the comment add form
 2009-08-28 13:44:01 -07:00
jhilden
1855642bd1 improved UI for the languages admin 
this should take care of bug #329
 2009-08-28 16:19:41 -04: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
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 Almdal
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 Kieffer
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