stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-03 02:09:22 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph

4686 Commits

Author SHA1 Message Date
Tim Almdal
2eeacd2656 use an implicit cast to convert the translated error message to a string as it is encoded by the json routines and will be treated as an object otherwise 2009-09-17 13:55:11 -07:00
Tim Almdal
6458b47e3e Remove the update code introduced with 9d7d79. In addition, captialize MyISAM correctly. 2009-09-17 12:38:59 -07:00
Tim Almdal
48326ad017 Cleanup issues with the original fix for #779 2009-09-17 12:11:00 -07:00
Tim Almdal
6469763225 Reload the album when server_add dialog is closed 2009-09-17 11:10:15 -07:00
Tim Almdal
c7f8d8be6f Don't try to creat an album that corresponds to the staging directory. Just add the contents of the staging directlyinto the album that server_add was invoked from. Fixes ticket #785 2009-09-17 10:57:22 -07:00
Tim Almdal
599d6377e8 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-17 10:56:07 -07:00
Tim Almdal
be1d49d017 Change the timeout on resubmitting the next task iteration to 25ms instead of. This allows the jQuery.ajax method to complete its processing. Otherwise, the browser can spend time thrashing around trying to send the next request. 2009-09-17 10:55:50 -07:00
Andy Staudacher
7c8e904388 Merge commit 'upstream/master' 2009-09-17 10:02:59 -07:00
Andy Staudacher
88c374dee8 Arg, fixing the "Sharing your Translations" text, thanks engineer@gmc 2009-09-17 10:01:15 -07:00
Tim Almdal
a5af531fbe Don't show links as part of the auto complete list 2009-09-17 07:04:11 -07:00
Andy Staudacher
30b5c389e6 Fix: Make "Sharing your translations" a localizable string 2009-09-17 01:21:06 -07:00
Andy Staudacher
86996dcac7 Mark permission's display name for translation 2009-09-17 01:17:30 -07:00
Tim Almdal
74d9d0901f Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-16 22:24:15 -07:00
Tim Almdal
9d76797b17 Changed the search module installer to explicitly specify MyISAM as the database type. Changed the packager to not remove the engine specification if the table is search_records. Fixes Ticket #774 2009-09-16 22:23:32 -07:00
Bharat Mediratta
e94eaa6b88 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-16 20:37:06 -07:00
Bharat Mediratta
4e1e24ba1a Add a movie_menu() theme callback, and have the default theme call it 
in the sidebar on movie page types.
 2009-09-16 20:34:42 -07:00
Tim Almdal
5490057480 When editing tags in place, and there is a validation error, highlight the tag with a red border and show a statust message. This fixes ticket: #779 2009-09-16 12:27:13 -07:00
Andy Staudacher
f1887422f8 Stricter input handling (cast to int) 2009-09-15 23:07:41 -07:00
Andy Staudacher
39632c4689 Also check for rss feeds in controller auth check 2009-09-15 23:01:26 -07:00
Andy Staudacher
7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Andy Staudacher
7ba93e2645 Merge commit 'upstream/master' 2009-09-15 22:05:02 -07:00
Andy Staudacher
dc3d45e760 Add exception for REST controllers (no fixes necessary). 2009-09-15 22:01:59 -07:00
Andy Staudacher
e168e0dfae CSRF / auth fixes, golden data file checkpoint 2009-09-15 21:50:48 -07:00
Andy Staudacher
61bbe1d78c First functional version of Controller_Auth_Test 2009-09-15 21:03:23 -07:00
Andy Staudacher
17254799d1 Initial skeleton of Controller_Auth code audit test (non functional). 2009-09-15 20:27:04 -07:00
Bharat Mediratta
c3f8b62376 Adjust the text of the symlink error message. 2009-09-15 19:57:12 -07:00
Jan Koprowski
7cc37451f4 Forbid from add symbolink link in admin server add. Read ticket #744 for more details. 2009-09-15 19:55:16 -07:00
Andy Staudacher
59eadacc67 Improve language preference (Acccept-Language header matching): Boost same-language match over exact locale match for lower qvalue. 2009-09-15 11:19:32 -07:00
Tim Almdal
5f343ab8a0 Change the variable to to resolve ticket #769 2009-09-14 08:11:12 -07:00
Bharat Mediratta
8fa370c49f Set the version to "3.0 git (pre-RC1)" 2009-09-13 22:59:58 -07:00
Bharat Mediratta
c527e70f26 Merge branch 'master' of git@github.com:gallery/gallery3 into beta3_staging 2009-09-13 18:55:48 -07:00
Tim Almdal
6c0732e16f Set the AlbumTreeContainer instead of the height. This fixes ticket #755 2009-09-13 16:24:03 -07:00
Bharat Mediratta
aed7ce9161 Specify a page anchor for the comments block. 2009-09-13 14:25:17 -07:00
Bharat Mediratta
21d6e17efa Don't add another comment form every time you click the [Add a 
comment] button.
 2009-09-13 14:19:04 -07:00
Kevin Nehls
1499778b4a Remove raw HTML that's wrapped around the name of the file 
to create if not logged in as admin
 2009-09-13 14:09:50 -07:00
Bharat Mediratta
71a2e3624e Merge branch 'master' of git@github.com:gallery/gallery3 into beta3_staging 2009-09-13 01:04:41 -07:00
Bharat Mediratta
caa2002d77 If there's a show= param and we can't find the given id in the current 
album, just ignore the parameter.
 2009-09-13 01:04:16 -07:00
Bharat Mediratta
51f6329a89 Update version to "3.0 beta 3" 2009-09-12 17:11:10 -07:00
Bharat Mediratta
823fa2fc83 Updated for url format changes applied in 2aad580f53. 2009-09-12 10:33:46 -07:00
Bharat Mediratta
6e2597f9f9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-12 10:12:38 -07:00
Bharat Mediratta
961bc3b185 Use user::display_name() in another case where it was missing. 2009-09-12 10:06:24 -07:00
Bharat Mediratta
0bb489b694 Properly internationalize the text for the By: line. This gets rid of 
the escaping problem.
 2009-09-12 10:02:27 -07:00
Tim Almdal
1d40c77c4c Update the organize module to use the release version of jquery Selectable. Unfortunately this does not have the functionality to select additional thumbnails using the ctrl or alt-keys, it is preferable to forking the Selectable component. This functionality should arrive with ui.jquery 1.8.x 2009-09-12 08:53:24 -07:00
Bharat Mediratta
7ec490b600 rawurlencode() path components in relative_path_cache and 
relative_url_cache so that they're safe for browser use.
 2009-09-11 11:04:35 -07:00
Bharat Mediratta
af4411a447 Put the buttons for album/photo dialogs in their own group in the form 
so that they appear at the end, after any other groups that other
modules add.  Thanks Glooper!
 2009-09-10 21:55:36 -07:00
Bharat Mediratta
882a6d9a5d Convert a couple of instances of Item_Model::url(array(), true) to Item_Model::abs_url() 2009-09-10 21:33:04 -07:00
Bharat Mediratta
7fddd2aced Use abs_url() inside url::redirect() calls so that we don't just wind 
up tacking onto the base url.
 2009-09-10 21:31:50 -07:00
Tim Almdal
fbb58671d1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-10 21:26:21 -07:00
Tim Almdal
25ea6085b7 Reset the margins when the mouse is over a thumbnail when dragging. When the border is displayed then adjust the margin to account for the border. Just hidding the border causes things to move. 2009-09-10 21:26:07 -07:00
Bharat Mediratta
190d7aaa55 Remove debug code. 2009-09-10 21:12:15 -07:00