stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-16 18:32:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,738 Commits 4 Branches 0 Tags
cb4e18f9dddd82a283f0208c694a9b4eb1a2eaca
Commit Graph
3666 Commits
Author SHA1 Message Date
Tim Almdal cb4e18f9dd Fix for ticket #1182. Remove the trailing slash and just let it be matched by the trailing (.*) group 2010-07-06 14:59:27 -07:00
Tim Almdal dbf3199e46 Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers 
that create the data to go into a dialog to return the html as part of a json object.
 2010-07-06 14:12:01 -07:00
Tim Almdal 9d66783f47 Update the xss golden file 2010-07-06 09:48:37 -07:00
Tim Almdal eee8c27f26 Correct the controller auth golden file from when the simple_uploader was renamed to flash_uploader 2010-07-06 08:43:02 -07:00
Bharat Mediratta 1d40c62f53 Updated version for RC2 2010-07-05 19:46:19 -07:00
Bharat Mediratta df3af7d521 Merge branch 'master' of github.com:gallery/gallery3 2010-07-05 19:17:30 -07:00
Tim Almdal 67223fc43d Revert "Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match" 
This reverts commit e4d397d301.
 2010-07-05 08:59:08 -07:00
Tim Almdal 226d1f7146 Revert "If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog." 
This reverts commit 8493a3d36f.
 2010-07-05 08:58:36 -07:00
Bharat Mediratta 0977c31009 Merge branch 'master' of github.com:gallery/gallery3 2010-07-05 08:47:40 -07:00
Bharat Mediratta 45b210c287 Add maessage when we automatically log you out of the admin area. 2010-07-05 08:44:46 -07:00
Tim Almdal 8493a3d36f If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog. 2010-07-05 08:23:17 -07:00
Tim Almdal e4d397d301 Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match 2010-07-05 08:21:14 -07:00
Bharat Mediratta 60126adc7e In the site menu, say "Delete album", "Delete photo" or "Delete movie" 
as appropriate for the item type.  Fixes ticket #1175.
 2010-07-04 20:40:50 -07:00
Bharat Mediratta 0d424a635d When we delete an item, make sure that we scrub it from any other 
items that may have it in the album_cover_item_id column.  Fixes ticket #1172.
 2010-07-03 14:25:33 -07:00
Bharat Mediratta 3feb561054 Internationalize the "Gallery 2 path saved." message and remove the trailing period. Fixes ticket #1171. 2010-07-03 11:40:56 -07:00
Bharat Mediratta f75ce45b6b When detecting encodings, give priority to ISO-8859-1 which seems to 
solve the umlaut problem in IPTC data.  Fixes ticket #1144.
 2010-06-27 12:14:56 -07:00
Bharat Mediratta 5335e4c0b4 Fix the autocomplete callback in item_edit_form(). We were 
incorrectly matching the form input in the jQuery selector.  Did this
ever work?  Fixes ticket #1168
 2010-06-27 11:25:31 -07:00
Bharat Mediratta e5ae2c91bc Style cleanup. 2010-06-26 12:14:02 -07:00
Bharat Mediratta 5767971f43 Sentence casing. 2010-06-26 12:00:55 -07:00
Bharat Mediratta 6b619e1098 Differentiate in our logs between missing site and admin theme overrides. 2010-06-26 12:00:14 -07:00
Bharat Mediratta 87d09bcd2e Merge branch 'master' of github.com:gallery/gallery3 2010-06-26 11:57:18 -07:00
Tim Almdal 8ecf28d3ef Better fix for the problem that a preview of an admin theme was not showing up. 2010-06-25 10:23:11 -07:00
Tim Almdal e380f19ee2 Fix an issue where a preview of the admin view would not work. 2010-06-25 10:17:06 -07:00
Bharat Mediratta 8bc7eec60f Add a <h1> title saying that this is a preview. 2010-06-25 09:56:44 -07:00
Tim Almdal d66c496fb1 Change the theme option page to display using tabs if the site theme has an admin page. 2010-06-25 06:45:09 -07:00
mamouneyyaandTim Almdal ca09e98890 centerize the group labels in Edit Permission window.. i think it's much cleaner this way 2010-06-23 23:33:13 +08:00
Tim Almdal a804c11513 1) revert e468ed7bd3 
2) Add the padding to both the button and flash object so they always line up
3) Add some top padding to the uploadifyQueue panel  to seprate it from the button.
 2010-06-21 10:11:38 -07:00
Bharat Mediratta d82863421d Rename "simple_uploader" to "flash_uploader" to make room for an HTML 
uploader.
 2010-06-20 21:10:22 -07:00
Bharat Mediratta 48af5e6b50 Rename "children" to "items" in our feed view because it makes more 
semantic sense.
 2010-06-20 17:25:23 -07:00
Bharat Mediratta 74e821b03e Rename the feed variable from "children" to "comments" since that 
makes more semantic sense.
 2010-06-20 17:21:25 -07:00
Bharat Mediratta 261da7b1c3 Set the focus on the username field (and the name field when we reset 
the password) properly on IE7 using a setTimeout() hack.  Fixes ticket
#807.
 2010-06-20 17:18:11 -07:00
Bharat Mediratta 7bdb9a49e5 Focus on the username field by default. 2010-06-20 16:58:38 -07:00
Bharat Mediratta 2992daa00e Add "Tag: %s" in the title on tag pages. Fixes ticket #1097. 2010-06-20 16:55:42 -07:00
Bharat Mediratta 892727830d Add a loading indicator to the delete form by tagging some JS on at 
the end which triggers .gallery_show_loading().  Not a complete fix
for #817 but it's a start and it takes care of one place where we have
a long running process.
 2010-06-20 16:52:10 -07:00
Bharat Mediratta 7938a57dbe Oops. Remove debug line. 2010-06-20 10:57:48 -07:00
Bharat Mediratta 7500273228 Simplify the descendent logic. viewable() already joins with the 
items table so there's no need for a subquery.  The subquery could
generate way too many ids since it didn't pay attention to
permissions.  This isn't a security problem since we were restricting
the item ids according to permissions in the outer query, but it's
wasteful.
 2010-06-20 10:55:10 -07:00
Bharat Mediratta 4a7b41c5a4 Merge branch 'master' of git://github.com/mamouneyya/gallery3 
Conflicts:
	lib/gallery.common.css
 2010-06-20 10:25:03 -07:00
Bharat Mediratta 6ebbb4fbf5 Updated golden files. 2010-06-20 09:51:39 -07:00
Bharat Mediratta 2e01685553 Add "comments" relationship support. 2010-06-20 09:40:35 -07:00
Bharat Mediratta ec052d7130 Assert how many files we analyze so that we can tell if we're suddenly 
analzying too many or too few.
 2010-06-20 09:36:56 -07:00
Bharat Mediratta 9f9d3866e8 Exclude the .git directory. 2010-06-20 09:28:36 -07:00
Bharat Mediratta ab9049d531 Remove trailing ?> 2010-06-20 09:05:25 -07:00
Bharat Mediratta 1a210dd270 Add "json" as a valid view suffix. 2010-06-20 09:03:23 -07:00
Bharat Mediratta 719328a5a7 If we use <?= .. ?> on the last line, it looks like we've got a 
trailing ?> and that causes File_Structure_Test to be sad.  So instead
use echo and tack on our own newline.  But this also requires a
semicolon.  Weird, I know but still easier than fixing up the test.
 2010-06-20 09:02:59 -07:00
Bharat Mediratta db53ca550e Merge branch 'master' of github.com:gallery/gallery3 2010-06-20 08:50:51 -07:00
Bharat Mediratta f6025026eb Rename error_rest.php to error_rest.json.php so that we specify the 
result type in the filename as is our convention for views.
 2010-06-20 08:50:19 -07:00
Tim Almdal a57ac38839 Change the organize dialog to make use of the new error handling 2010-06-19 17:32:15 -07:00
Bharat Mediratta d86d1a32e8 Updated for comment REST relationships. 2010-06-19 15:12:58 -07:00
Bharat Mediratta f451804c6d $request->params might not exist. 2010-06-19 15:00:44 -07:00
Bharat Mediratta 1ba9d079bf post_test() should be using admin, not guest. 2010-06-19 15:00:33 -07:00