Tim Almdal
f0ea6d532c
Create a new method in MY_url.php "get_item_from_uri" which loads the item
...
based on the uri. Then use this helper method in logout.php to insure that
the guest user has access to the "continue" uri. If they don't redirect to
the root album and let it deal with access issues.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca >
2009-06-09 21:45:43 +08:00
Chad Kieffer
a42c101c0b
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-09 00:26:01 -06:00
Chad Kieffer
d2b8ca241d
Show status message when album cover is set ( #257 )
2009-06-09 00:25:49 -06:00
unostar
e6768a4e97
Add string to localizer
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-09 14:11:32 +08:00
Bharat Mediratta
1ecdb5ef0c
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-08 21:32:03 -07:00
Bharat Mediratta
f0ca27ab92
Fix the admin/themes url.
2009-06-08 21:31:50 -07:00
Bharat Mediratta
c7aafef852
Improve error handling support for corrupt images and report them
...
appropriately in g2_import.
2009-06-07 17:48:42 -07:00
Andy Staudacher
b9ee6f7d18
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-06 15:24:49 -07:00
Andy Staudacher
0e415dae9b
Preliminary BiDi support (needs *a lot* of tweaking)
2009-06-06 15:24:14 -07:00
Bharat Mediratta
bccaad92bb
Update xss golden file
2009-06-06 14:50:51 -07:00
Bharat Mediratta
d5d5284f05
Don't ask for CSRF token when trying to view the password reset form.
2009-06-06 12:52:44 -07:00
Bharat Mediratta
277d72d9fa
Fix formatting.
2009-06-06 12:50:38 -07:00
Bharat Mediratta
6feb640b73
fix typo: "the the" -> "the" (thanks VENCO!)
2009-06-06 12:24:08 -07:00
Bharat Mediratta
3f96830ef1
Properly localize domain url in recaptcha explanation.
2009-06-06 12:22:20 -07:00
Bharat Mediratta
4302406c96
Fix formatting in l10n client source box so that it wraps. Otherwise
...
long strings show up only on one line.
2009-06-06 12:19:26 -07:00
Bharat Mediratta
5835715e49
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-06 11:39:11 -07:00
Chad Kieffer
7cdcb5179f
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-06 00:35:39 -06:00
Chad Kieffer
c5425f42a4
Remove album view icon link, added album link to info module. This and breadcrumb should suffice.
2009-06-06 00:35:30 -06:00
Bharat Mediratta
ab1fc6ad53
Make theme page headers match the menu dropdowns.
...
Internationalize the admin dashboard common title.
2009-06-05 19:47:11 -07:00
Andy Staudacher
329bd8caa1
Remove source code copy artefact
2009-06-05 18:31:15 -07:00
Bharat Mediratta
3275401f69
change the version to beta 1
2009-06-05 17:44:36 -07:00
Bharat Mediratta
275c25eb56
Add the exception message to the trace string when there's a graphics
...
failure.
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-06 08:39:07 +08:00
Andy Staudacher
4fcad78f54
Update golden file of Xss test
2009-06-05 16:10:08 -07:00
unostar
73a0df1b16
corrected misprint
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-06 01:26:42 +08:00
unostar
710d13aece
Correct locale and local translation
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-06 01:26:41 +08:00
Bharat Mediratta
62a63676d4
Add Belarusian to the language list.
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-06 01:26:24 +08:00
Bharat Mediratta
7612c8d404
Localize the 'Advanced' menu item
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-06 01:26:22 +08:00
Chad Kieffer
4d3cb760de
Move watch notification menu from the view menu to under the Options menu.
2009-06-05 01:14:09 -06:00
Bharat Mediratta
c7f49fd1ec
Skip over busted images when rebuilding. Change graphics::generate()
...
to return true/false on whether or not it could rebuild the image
properly, then track the broke images in the task and ignore them.
Fixes ticket #344 .
2009-06-04 23:20:54 -07:00
Bharat Mediratta
4f0a3fefa0
Fix a bug in Item_Model::get_position() where we incorrectly using the
...
grandparent id. Oops. This caused navigation from photo back up to
album to be broken.
Also update Photos_Controller to use the active sort order.. it was
still hardcoded to use the id. It's more efficient now, yay.
Fixes ticket #340 .
2009-06-04 22:11:08 -07:00
Bharat Mediratta
54927248b0
Updated for csrf in admin.html.php
2009-06-04 22:10:45 -07:00
Bharat Mediratta
66c6c3df0e
Convert single quotes to double quotes.
2009-06-04 21:43:21 -07:00
Bharat Mediratta
ac70a1b77a
Fix internationalization to use one long string and placeholders.
...
Removed the <br/> though since we're trying to avoid structural HTML
in internationalized strings.
2009-06-04 18:49:45 -07:00
Bharat Mediratta
2d7d55014a
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-04 18:41:41 -07:00
Bharat Mediratta
12ef4272ae
Work around a problem with the CGI sapi on urls that don't contain
...
index.php (ie, /gallery3 instead of /gallery3/index.php) that causes
is to mis-route.
2009-06-04 18:40:38 -07:00
jhilden
a156f1e9be
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-04 21:34:20 -04:00
jhilden
81d20c79b6
fixed another bug with the filesize unit and added a better error message
...
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/views/simple_uploader.html.php
2009-06-04 21:32:45 -04:00
Bharat Mediratta
e5a0104769
Make sure the item is loaded in parse_url() before we use it.
2009-06-04 18:19:49 -07:00
jhilden
8933a19f1f
fixed stuff
2009-06-04 21:05:33 -04:00
Bharat Mediratta
5158a6f433
Add MY_num containing num::convert_to_bytes() which supports PHP's
...
size shorthand, and convert the simple_uploader code to use it.
2009-06-04 17:53:40 -07:00
Bharat Mediratta
59f3a84864
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-04 17:37:52 -07:00
Bharat Mediratta
8d9010cfe3
Let the Akismet module create the statistics menu, since it's the only
...
one that uses it. Perhaps this is not the best solution, but it's the
pragmatic one.
2009-06-04 17:36:37 -07:00
jhilden
9306c178a8
set filesize limit of swfupload to the same value as upload_max_filesize
...
* now users get an error when they try to upload too big files
* this should fix bug #337
* maybe it also needs to check for max_post_size
2009-06-04 18:29:31 -04:00
Bharat Mediratta
743b321154
Change "CLEAN" to an empty string to see if it's better visually.
...
Looks like it is.
2009-06-04 12:23:12 -07:00
Bharat Mediratta
1acc64add7
Update xss clean list
2009-06-04 12:22:41 -07:00
Bharat Mediratta
7e5a363ffc
Only request the server_add js if the user is an admin
2009-06-04 12:21:51 -07:00
Tim Almdal
e1ce3196f4
Rewrite the server_add to have the server format the selection when a branch is opened. Sub trees re only retrieved when the branch is opened. Changed the
...
start task processing to fill in any subtrees that are selected, but were never expanded on the client. Added the loading icon.
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-05 03:13:14 +08:00
Chad Kieffer
bc38505251
Update notify/watch eyeglasses icon with bullhorn icon. Rename css/image names from watch to notify.
2009-06-04 11:55:18 -07:00
Bharat Mediratta
dd854379c2
Sanitize all data we return via json_encode() to guard against XSS and
...
other data leaks.
2009-06-03 17:08:23 -07:00
Bharat Mediratta
05d18da390
Guard against pages with no items.
2009-06-03 17:01:33 -07:00