Commit Graph

2292 Commits

Author SHA1 Message Date
bwdutton
cdc4e97c7e Make queries work with sql_mode = 'ONLY_FULL_GROUP_BY' enabled in mysql 2018-02-25 10:14:30 -08:00
Bradley W. Dutton
a44f17d726 add box around actual dropzone 2017-11-05 09:40:57 -08:00
Bradley W. Dutton
bad663e05e Add dropzone js uploader as a replacement for uploadify. The latter still remains almost entirely intact. 2017-11-04 16:39:51 -07:00
Bharat Mediratta
35bd97fe19 Follow-on to 9e0631ab0d to fix broken tests. 2014-05-28 15:33:57 -04:00
root
ab4363233a show next picture after delete instead of returning to album view 2014-03-19 17:29:52 -07:00
shadlaws
57d12c69a8 #2083 - Sanitize data from module.info files. 2013-09-06 08:36:09 +02:00
shadlaws
5e19662b75 #2082 - Sanitize admin theme options that get placed directly in HTML. 2013-09-06 08:28:10 +02:00
Moritz Stoltenburg
411bb39174 remove redundant message block CSS class 2013-07-16 15:45:40 +02:00
shadlaws
e8752f60b8 Remove extension from cache busters of non-combined JS/CSS links (follows 2078). 2013-07-09 11:19:20 +02:00
shadlaws
d0aef95a65 Move "item_moved" event later in the item update process. Fixes #2077.
Before, this was before the children's caches were cleared, so if the
"item_moved" set an album cover, it would fail with an invalid path.  For the
same reason, we move it after the data file update, too.  Lastly, get we get
rid of duplicated code in item::move() since the "item_moved" event already
does this.
2013-07-08 09:39:54 +02:00
Daniel Muller
2d20af76f9 #2078 Missing file type extension on combined css/js 2013-07-06 13:08:51 +08:00
shadlaws
fe40dadd5c Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{". Update golden file.
--HG--
extra : source : 816294dd5f6fe23160baf9f516e49c66ea8fcb6c
2013-06-26 23:49:48 +02:00
shadlaws
3c100d06ff #2074 - Mirror some additional file_proxy checks in data_rest. 2013-06-12 07:25:26 +02:00
Bharat Mediratta
c70646237e Rename uploadify SWF wrappers to end in .swf.php for consistency. 2013-06-08 16:34:16 -04:00
Bharat Mediratta
b1dad99741 Replace flashmediaelement.swf with a PHP wrapper that strips url
fragments and query parameters.
2013-06-06 18:45:46 -04:00
shadlaws
6f922ca427 Follow-on to #2069 - Decrease stack size of MPTT rebuild task.
This reduces the likelihood that we'll hit a limit with gargantuan galleries.

--HG--
extra : source : c4a118d43145a2a4ec9b934d3aebe8f9458bcf07
2013-05-15 11:16:46 +02:00
shadlaws
2ebe38b148 #2069 - Change "Fix your Gallery" task go faster and be more comprehensive.
- optimize MPTT pointer rebuilding for leaf nodes (i.e. non-albums).
- reverse order_by to try and preserve existing tree ordering.
- reset item level while we're here.
- use "$stack[] = 123" instead of array_push($stack, 123) since it's faster.

--HG--
extra : source : 297e4c0eccc5a7940224ff8e908b366e83017354
2013-05-14 13:35:09 +02:00
Bharat Mediratta
b6ad4157d1 Get rid of the security preamble - we intend for these files to be directly accessible. 2013-05-09 20:09:15 -04:00
Bharat Mediratta
e4a3abdd20 Change upload code to use new uploadify urls. 2013-05-09 20:04:01 -04:00
shadlaws
0f28d4cee4 Ensure that movie titles are purified upon display. 2013-04-21 00:33:44 -04:00
Bharat Mediratta
9b1c6ab14f Golden file update follow-on for c37288f0b2 2013-04-14 00:28:29 -04:00
Bharat Mediratta
c37288f0b2 Sanitize all key values. 2013-04-14 00:21:47 -04:00
shadlaws
26e4f044bb #2058 - Separate uploader logic into Kohana-, Item-Model-, and Uploadify-specific functions.
- Added _process_upload() to handle upload file validation with Kohana.
- Added _add_item() to handle item creation and validation with the item model (and logs).
- Removed these pieces from add_photo(), which is now rather Uploadify-specific.
- Used $_FILES to get filename instead of assuming it's substr(basename($tmp_name), 10).
- No net functional changes - works just like before.
2013-03-14 18:15:24 +01:00
Bharat Mediratta
a5700a2f3c Merge pull request #202 from shadlaws/fix_2051
#2051 - Revise how Gallery_View returns combined JS and CSS.
2013-03-13 21:10:25 -07:00
Bharat Mediratta
b69297db75 Merge pull request #216 from shadlaws/fix_2061
#2061 - Remove Uploadify from add_photo_form/add_photo_form_completed events.
2013-03-13 20:58:45 -07:00
shadlaws
a140303468 #2061 - Remove Uploadify from add_photo_form/add_photo_form_completed events.
- Added code around event calls in uploader to add Uploadify-specific JS to update the inputs.
- Removed Uploadify JS from tag_event.  Now it's uploader-agnostic.
- Refactored tag_event autocomplete code (no functional changes).
2013-03-13 16:18:12 +01:00
shadlaws
8d0e1b4c4d #2059 - Add album name sanitizing similar to photo/movie filename sanitizing.
- added legal_file::sanitize_dirname(), analogous to sanitize_filename.
- revised item model to use new function when adding or updating an album.
- added some legal_file unit tests.
- revised some item model unit tests.
2013-03-13 10:07:58 +01:00
Bharat Mediratta
e2ee3499ca Merge pull request #209 from shadlaws/fix_2057
#2057 - Revise item name and slug validation - backslashes, refactor, error messages.
2013-03-12 17:00:55 -07:00
Bharat Mediratta
7cfbe3dc1f Merge pull request #210 from shadlaws/fix_2055_2056
#2055, 2056 - jQuery updates for .attr("value", [value]) and .keyup(handler).
2013-03-12 16:56:33 -07:00
shadlaws
a1b5cf2e8d #2051 - Revise how Gallery_View returns combined JS and CSS.
Changed Gallery_View's JS and CSS combining to:
- have get_combined() combine all groups if called without arguments.
- ensure the "core" group is combined first.
- always put links where get_combined() is called, even if combining is disabled (otherwise the order isn't preserved).
- add key as cache buster when combining is disabled.
- make "LOOKING FOR YOUR CSS/JAVASCRIPT..." comments in get_combined(), not in the theme itself.
Also, revised xss_data.txt golden file (line number changes only).
2013-03-12 15:00:59 +01:00
shadlaws
ed20798b99 #2057 - Revise item name and slug validation - backslashes, refactor, error messages.
- disallowed backslashes in item validation.
- refactored the validation logic in the item model a bit.
- added no_backslash error messages in edit album/photo/movie forms.
- fixed error messages in add album forum (some missing, some text different from edit)
- added unit tests
- updated to v58 to correct any existing backslashes in item names
2013-03-12 12:14:34 +01:00
shadlaws
86a21cc881 #2055, 2056 - jQuery updates for .attr("value", [value]) and .keyup(handler).
- changed .attr("value", [value]) to .val([value]) for new jQuery.
- changed .keyup(handler) to .on("input keyup", handler) to fire on mouse-only cut'n'paste.
2013-03-12 10:33:33 +01:00
shadlaws
b3984f975a #2054 - Revise albums_form_add.js: update for new jQuery, refactor.
- changed "change" event to "input" to catch cut'n'paste
- kept "keyup" event for old IE compatibility
- removed code duplication by using $(this) and combining events using .on()
- replaced attr("value",...) with val()
- added quotes around input names
2013-03-12 10:10:47 +01:00
Bharat Mediratta
53c1ae7dca Merge pull request #204 from jozefs/issue1838
#1838 - thumb_proportion should have a minimum size.
2013-03-11 16:38:53 -07:00
Bharat Mediratta
cc80fa035a Merge pull request #207 from shadlaws/fix_siblings_callback
Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
2013-03-11 16:35:20 -07:00
Bharat Mediratta
243e3b66ca Merge pull request #206 from shadlaws/fix_2050
#2050 - Update Admin_View to handle events like Theme_View.
2013-03-11 16:32:55 -07:00
shadlaws
b6dc597c66 Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
I wonder if this could be causing some random issues I see on the forums...
2013-03-11 23:10:27 +01:00
Jozef Selesi
3c47deb9ef Themes can choose child thumbnail when asking for proportion.
This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
2013-03-11 15:59:00 +01:00
Jozef Selesi
bae14a76e5 Themes can set minimum thumbnail size when calculating proportions.
This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
2013-03-11 15:54:20 +01:00
shadlaws
c137740e26 #2050 - Update Admin_View to handle events like Theme_View.
- changed Admin_View event handling to reflect that of Theme_View
(gallery_theme gets called first, admin theme gets called last,
debug mode isn't called for body_attributes and gets g-clear-fix)
2013-03-11 11:40:15 +01:00
shadlaws
b43349f4de #2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
- removed autocomplete.css/js calls in server_add, tag, and g2_import.
- revised xss_data.txt golden file (line number changes only).
2013-03-10 22:08:16 +01:00
Bharat Mediratta
0899528ff5 Merge pull request #196 from shadlaws/fix_2046
#2046 - Change Gallery over to using MediaElementJS as its movie player
2013-03-09 14:33:47 -08:00
Bharat Mediratta
a01ec9ff5f Merge pull request #197 from shadlaws/followon_2003
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
2013-03-09 14:00:39 -08:00
shadlaws
de3f9edb88 Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/".
- movie::find_ffmpeg - made it use is_executable instead of just file_exists.
- system::find_binary - removed possible doubled "/" in paths.
2013-03-09 15:59:23 +01:00
shadlaws
18f38f0dff #2046 - Change Gallery over to using MediaElementJS as its movie player. 2013-03-09 12:51:45 +01:00
shadlaws
5d1033454c Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon). 2013-03-08 12:53:23 +01:00
Bharat Mediratta
dc7bf9486f Follow-on for #2043. Fix some tests that made bad assumptions about
the state of the world.  These were uncovered when we ran the tests on
Travis which runs the tests in a different order than what I (and
apparently others) use on their dev boxes.
2013-03-06 14:33:24 -05:00
Bharat Mediratta
d2577c066b Follow-on to 384bc7afc8 for #2033
Update golden file for XSS test.
2013-03-05 21:27:44 -05:00
Bharat Mediratta
74532b9c94 Remove stray line of debug output. 2013-03-05 13:20:12 -05:00
shadlaws
4b28478776 #2040 - Deactivate modules that no longer exist.
- added module::deactivate_missing_modules()
- revised module::deactivate() to change log message if the module is missing
- added call to new function in module::get_obsolete_modules_message()
- added call to new function when loading admin/maintenance menu
2013-03-05 16:54:41 +01:00