stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-02 13:10:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 AlmdalandBharat Mediratta 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
Tim AlmdalandBharat Mediratta 13b12f410e Create a gDialogLargeLoading class for use with dialogs when running something that will take a little longer. If the standard gLoadingLarge is used with 
a dialog then the ui-dialog-content class will override the background and the loading icon will not be seen.

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
 2009-06-05 03:13:10 +08:00
Bharat Mediratta fe7779b595 Remove console.log() calls, they break some browsers 2009-06-04 12:12:35 -07:00
Bharat Mediratta 65df897fcd Properly internationalize the "Add some" photos link. 2009-06-04 11:57:36 -07:00
Bharat Mediratta c888ce2e7d Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-04 11:55:23 -07:00
Chad KiefferandBharat Mediratta 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
Chad Kieffer 0746e7e10d Show an "add photos" message on empty albums for those who can. 2009-06-03 19:04:44 -06:00
Chad Kieffer 3845dba196 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-03 19:01:57 -06: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
Chad Kieffer 6fa9a43d87 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-03 17:52:06 -06:00
Bharat Mediratta bec2fdf7c4 Minor tweaks to the way that we turn the add photos item into a menu 
to make it a little more robust.
 2009-06-03 16:39:08 -07:00
Chad Kieffer 1df6db45dc Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-02 22:55:23 -06:00
jhilden dde5fb96ee made "Add photos" its own site menu item 
* open for suggestions on the submenu item labels
* @bharat: not sure about the add photos menu item id in the dropdown case
 2009-06-02 19:31:11 -04:00
Bharat Mediratta 01c5774794 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-02 15:47:04 -07:00
Bharat Mediratta e834c4ca24 Have server_add turn the "Add Photo" menu option into a dropdown and 
make "Add from Server" a 2nd option there.

This requires adding the Menu::remove() API function.
 2009-06-02 15:46:05 -07:00
Tim Almdal dbeceb333b Improve test isolation so that Albums_Controller_Test doesn't fail when run with Photos_Controller_Test 2009-06-02 14:19:03 -07:00
Bharat Mediratta ffb3abdcac Restore "view" permissions on the root album in teardown. 2009-06-02 13:37:19 -07:00
Bharat Mediratta 76fcb8e654 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-02 13:12:36 -07:00
Tim Almdal 4f50357a38 fix the xss_security_test in regards to the renaming of thumb_tag, resize_tag and move_tag. 2009-06-02 12:56:36 -07:00
Tim Almdal d8eca7682d make cleanm static 2009-06-02 12:41:59 -07:00
Tim Almdal 9f51395151 fix preamble so file structure test passes 2009-06-02 12:31:27 -07:00
Tim Almdal 0f987880e6 Fix for ticket #320 2009-06-02 12:08:47 -07:00
Bharat Mediratta 61e7b9b8f0 Update for beta 1 2009-06-02 00:48:16 -07:00
Andy Staudacher 1cfed1fac1 Extend L10n client to provide UI for plural translation. 
Ticket 148.
 2009-06-02 00:43:04 -07:00
Bharat Mediratta f039598410 Move recaptcha widget into a view for clarity. Also, wrap it in a 
setTimeout() call so that on subsequent reloads (which happen when you
fail to validate the form) it has time to rebuild the DOM before
calling the JS which tries to inject the Recaptcha HTML.

Fixes ticket #327
 2009-06-01 23:58:49 -07:00
andyst 02a840c84c Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-01 23:45:37 -07:00
Bharat Mediratta 3b6567f38c Unescape %20 into " " also. 2009-06-01 23:20:36 -07:00
Andy d0845aadc6 Workaround for parse_ini_file issue: There's no way to escape a double-quote in a value that's read with 
parse_ini_file. Using single quotes instead, even if that's not the best style in English.
 2009-06-01 23:08:13 -07:00
Bharat Mediratta 91c7eb1200 Don't throw an error if there are no visible tags. 2009-06-01 23:00:10 -07:00
Bharat Mediratta 43abcd9386 Security pass over all controller code. Mostly adding CSRF checking 
and verifying user permissions, but there are several above-the-bar
changes:

1) Server add is now only available to admins.  This is a hard
   requirement because we have to limit server access (eg:
   server_add::children) to a user subset and the current permission
   model doesn't include that.  Easiest fix is to restrict to admins.
   Got rid of the server_add permission.

2) We now know check permissions at every level, which means in
   controllers AND in helpers.  This "belt and suspenders" approach will
   give us defense in depth in case we overlook it in one area.

3) We now do CSRF checking in every controller method that changes the
   code, in addition to the Forge auto-check.  Again, defense in depth
   and it makes scanning the code for security much simpler.

4) Moved Simple_Uploader_Controller::convert_filename_to_title to
   item:convert_filename_to_title

5) Fixed a bug in sending notification emails.

6) Fixed the Organize code to verify that you only have access to your
   own tasks.  In general, added permission checks to organize which had
   pretty much no validation code.

I did my best to verify every feature that I touched.
 2009-06-01 22:40:22 -07:00
Bharat Mediratta b9af090cbd Switch the default login page to non-ajax mode. It looks awful, but better than before. 2009-06-01 21:44:04 -07:00
Bharat Mediratta 1145b846ba Fix a place where I shouldn't have renamed "core" to "gallery", breaking maintenance mode. 2009-06-01 21:07:24 -07:00
Bharat Mediratta 8c580f75ed use PHP_SAPI instead of php_sapi_name() 2009-06-01 18:20:15 -07:00
Bharat Mediratta c31434ea3c Don't bomb if there are no exif_records for the given item. 2009-06-01 18:03:07 -07:00
Bharat Mediratta c94c11eb3e Normalize the random values used in the blocks_dashboard_xxx vars so 
that install.sql is more stable.
 2009-06-01 00:22:30 -07:00
Bharat Mediratta e4f4c8b2e8 Do a little cleanup and get rid of code left-over from when this 
controller rendered HTML.  Also, catch all exceptions at the root
level and restore the change in
84ce0cdefd which appears to have gotten
lost in the shuffle.
 2009-06-01 00:11:09 -07:00
Tim Almdal 3c24d94766 Merge branch 'master' of git@github.com:gallery/gallery3 2009-05-31 23:28:42 -07:00
Tim Almdal 463b3454ae Move the sql packaging code from installer into the gallery module. It must be run from the command line and will throw a 404 if it is run as a web request. 2009-05-31 23:28:27 -07:00
Chad Kieffer 2bd8051c28 Forgot these in last commit 2009-05-31 23:55:42 -06:00