Commit Graph

Select branches

Hide Pull Requests

akismet-url-fix

albums-sort-first-fix

database-mysqli-result-fix

master

Mono Color

• ac804d8700 Drop PHP 5.5 - it's segfaulting on Travis and it's not released yet anyway. Bharat Mediratta 2013-06-08 16:46:32 -04:00
• 683ab45d54 Automated update of .build_number to 419 for branch master Last update: d81ed1145d (3 commits ago) [ci skip] Automatic Build Number Updater 2013-06-08 13:34:58 -07:00
• 0aebd9e9f6 Merge branch 'master' of github.com:gallery/gallery3 Bharat Mediratta 2013-06-08 16:34:44 -04:00
• c70646237e Rename uploadify SWF wrappers to end in .swf.php for consistency. Bharat Mediratta 2013-06-08 16:34:16 -04:00
• d17ae418d4 Automated update of .build_number to 418 for branch master Last update: d81ed1145d (1 commits ago) [ci skip] Automatic Build Number Updater 2013-06-06 15:46:33 -07:00
• b1dad99741 Replace flashmediaelement.swf with a PHP wrapper that strips url fragments and query parameters. Bharat Mediratta 2013-06-06 18:45:46 -04:00
• d81ed1145d Automated update of .build_number to 417 for branch master Last update: 49c4d6b56c (1 commits ago) [ci skip] Automatic Build Number Updater 2013-06-05 21:05:45 -07:00
• e019046e40 Use html::clean() instead of html::purify() on the breadcrumb text so that we show the actual text. HTMLPurify allows some HTML to render, but we don't want that here. Fixes #2072. Bharat Mediratta 2013-06-06 00:04:29 -04:00
• 49c4d6b56c Automated update of .build_number to 416 for branch master Last update: b347d7919d (1 commits ago) [ci skip] Automatic Build Number Updater 2013-06-05 15:03:21 -07:00
• c31ab36116 Follow-on to ce937201d0, update the swf file to 2.12.0 in sync with vendor. Bharat Mediratta 2013-06-05 18:02:32 -04:00
• b347d7919d Automated update of .build_number to 415 for branch master Last update: b7177cfb2d (1 commits ago) [ci skip] Automatic Build Number Updater 2013-06-05 12:20:51 -07:00
• ce937201d0 Updated MediaElement.js to 2.12.0 (2601db5ebeeaa96b3fa1f1015c494433cbcd9a85) Bharat Mediratta 2013-06-04 19:19:12 -04:00
• b7177cfb2d Automated update of .build_number to 414 for branch master Last update: 666f3a30e2 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-05-15 11:11:47 -07:00
• 1ba8f0aa0f Merge pull request #371 from shadlaws/followon2069_master Shad Laws 2013-05-15 02:29:52 -07:00
• 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. shadlaws 2013-05-15 11:16:46 +02:00
• 666f3a30e2 Automated update of .build_number to 413 for branch master Last update: 4d8fbd1b9d (1 commits ago) [ci skip] Automatic Build Number Updater 2013-05-14 04:48:37 -07:00
• 2713389c01 Merge pull request #367 from shadlaws/fix_2069_master Shad Laws 2013-05-14 04:48:27 -07:00
• 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. shadlaws 2013-05-14 13:35:09 +02:00
• 4d8fbd1b9d Automated update of .build_number to 412 for branch master Last update: 07af91e05d (1 commits ago) [ci skip] Automatic Build Number Updater 2013-05-09 17:10:21 -07:00
• b6ad4157d1 Get rid of the security preamble - we intend for these files to be directly accessible. Bharat Mediratta 2013-05-09 20:09:15 -04:00
• 07af91e05d Automated update of .build_number to 411 for branch master Last update: 9f8435c7f5 (7 commits ago) [ci skip] Automatic Build Number Updater 2013-05-09 17:04:54 -07:00
• f35578982c Merge branch 'master' of github.com:gallery/gallery3 Bharat Mediratta 2013-05-09 20:04:21 -04:00
• e4a3abdd20 Change upload code to use new uploadify urls. Bharat Mediratta 2013-05-09 20:04:01 -04:00
• 62726d66e9 Automated update of .build_number to 410 for branch master Last update: 9f8435c7f5 (5 commits ago) [ci skip] Automatic Build Number Updater 2013-05-09 13:04:39 -07:00
• 85ae39fee8 Merge branch 'master' of github.com:gallery/gallery3 Bharat Mediratta 2013-05-09 16:02:25 -04:00
• c962721016 Add the proper Gallery preamble. Bharat Mediratta 2013-05-09 16:01:57 -04:00
• d5fbd67295 Automated update of .build_number to 409 for branch master Last update: 9f8435c7f5 (3 commits ago) [ci skip] Automatic Build Number Updater 2013-05-09 12:38:11 -07:00
• ed8ec288c6 Merge branch 'master' of github.com:gallery/gallery3 Bharat Mediratta 2013-05-09 15:36:09 -04:00
• 5a85bbaf18 Follow-on: put at least one byte in the fragment so that it doesn't get discarded by browsers. Bharat Mediratta 2013-05-09 15:35:17 -04:00
• 8b3ac7f224 Automated update of .build_number to 408 for branch master Last update: 9f8435c7f5 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-05-08 22:41:26 -07:00
• 80bb0f2222 Strip URL fragments off of direct requests to uploadify SWF files. Bharat Mediratta 2013-05-09 01:40:46 -04:00
• 9f8435c7f5 Automated update of .build_number to 407 for branch master Last update: 269927b27c (2 commits ago) [ci skip] Automatic Build Number Updater 2013-05-07 10:46:17 -07:00
• f59f1c03b8 Merge pull request #352 from rlerdorf/master Bharat Mediratta 2013-05-07 10:44:34 -07:00
• 48f9595f78 Merge pull request #357 from shadlaws/double_ajax_fixing_master Shad Laws 2013-05-07 09:52:25 -07:00
• 90528d9c83 #2065 - Fix problems with double-ajaxifying of dialogs. Change all jQuery-ui widget _init() functions to _create() functions. shadlaws 2013-05-07 18:46:43 +02:00
• 0c2d2b25fa How did this ever work? :) Rasmus Lerdorf 2013-05-05 08:49:44 -07:00
• f2def7778d valid::url() only takes 1 arg Rasmus Lerdorf 2013-05-05 08:46:46 -07:00
• ce97f5ff26 There is no $g2_album_id here Rasmus Lerdorf 2013-05-05 08:42:48 -07:00
• 269927b27c Automated update of .build_number to 406 for branch master Last update: 0b307a40de (1 commits ago) [ci skip] Automatic Build Number Updater 2013-05-02 21:37:34 -07:00
• 0f28d4cee4 Ensure that movie titles are purified upon display. shadlaws 2013-04-20 10:09:03 +02:00
• 0b307a40de Automated update of .build_number to 405 for branch master Last update: 27b009e665 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-04-13 21:28:55 -07:00
• 9b1c6ab14f Golden file update follow-on for c37288f0b2 Bharat Mediratta 2013-04-14 00:28:29 -04:00
• 27b009e665 Automated update of .build_number to 404 for branch master Last update: 1eab94f606 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-04-13 21:22:47 -07:00
• c37288f0b2 Sanitize all key values. Bharat Mediratta 2013-04-14 00:21:47 -04:00
• 1eab94f606 Automated update of .build_number to 403 for branch master Last update: 3cec3485a4 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-15 17:22:31 -07:00
• 57bcbd1efd Merge pull request #221 from shadlaws/superfish_1_5_13 Bharat Mediratta 2013-03-15 17:22:11 -07:00
• 2dda5ef14d Update to Superfish v1.5.13, with JS minified (in sync with gallery3-vendor) shadlaws 2013-03-16 00:38:24 +01:00
• 3cec3485a4 Automated update of .build_number to 402 for branch master Last update: 2340426c09 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-14 11:44:41 -07:00
• 5a22f0c099 Merge pull request #213 from shadlaws/fix_2058 Bharat Mediratta 2013-03-14 11:44:09 -07:00
• 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. shadlaws 2013-03-14 18:15:24 +01:00
• 2340426c09 Automated update of .build_number to 401 for branch master Last update: ef554a34e8 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-14 10:02:03 -07:00
• 725dd3f806 Merge pull request #218 from shadlaws/fix_2062 Bharat Mediratta 2013-03-14 10:01:22 -07:00
• e719a6316a #2062 - Fix extra/missing spaces in search query. - Every to-be-concatenated string now begins with 1 space and ends with 0 spaces. shadlaws 2013-03-14 15:44:00 +01:00
• ef554a34e8 Automated update of .build_number to 400 for branch master Last update: 23564554f2 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-13 21:10:42 -07:00
• a5700a2f3c Merge pull request #202 from shadlaws/fix_2051 Bharat Mediratta 2013-03-13 21:10:25 -07:00
• 23564554f2 Automated update of .build_number to 399 for branch master Last update: 11d8864064 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-13 20:59:18 -07:00
• b69297db75 Merge pull request #216 from shadlaws/fix_2061 Bharat Mediratta 2013-03-13 20:58:45 -07:00
• 11d8864064 Automated update of .build_number to 398 for branch master Last update: 8b457bf39b (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-13 20:57:29 -07:00
• 3c8e521d40 Merge pull request #214 from shadlaws/fix_2059 Bharat Mediratta 2013-03-13 20:57:03 -07:00
• 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). shadlaws 2013-03-13 16:18:12 +01:00
• 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. shadlaws 2013-03-13 10:07:58 +01:00
• 8b457bf39b Automated update of .build_number to 397 for branch master Last update: 94ac552152 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-12 17:01:33 -07:00
• e2ee3499ca Merge pull request #209 from shadlaws/fix_2057 Bharat Mediratta 2013-03-12 17:00:55 -07:00
• 94ac552152 Automated update of .build_number to 396 for branch master Last update: cb8a63bb48 (2 commits ago) [ci skip] Automatic Build Number Updater 2013-03-12 16:56:38 -07:00
• 7cfbe3dc1f Merge pull request #210 from shadlaws/fix_2055_2056 Bharat Mediratta 2013-03-12 16:56:33 -07:00
• 81ab98e46d Merge pull request #211 from shadlaws/fix_2054 Bharat Mediratta 2013-03-12 16:55:56 -07:00
• 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). shadlaws 2013-03-12 15:00:59 +01:00
• 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 shadlaws 2013-03-12 12:14:34 +01:00
• 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. shadlaws 2013-03-12 10:33:33 +01:00
• 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 shadlaws 2013-03-12 10:10:47 +01:00
• cb8a63bb48 Automated update of .build_number to 395 for branch master Last update: b10d175d9c (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 16:46:19 -07:00
• f49ce6542a Merge pull request #201 from shadlaws/fix_2049 Bharat Mediratta 2013-03-11 16:45:50 -07:00
• b10d175d9c Automated update of .build_number to 394 for branch master Last update: 7fbe5f0ab1 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 16:39:03 -07:00
• 063ebed5c1 Merge branch 'master' of github.com:gallery/gallery3 Automatic Build Number Updater 2013-03-11 16:39:03 -07:00
• 53c1ae7dca Merge pull request #204 from jozefs/issue1838 Bharat Mediratta 2013-03-11 16:38:53 -07:00
• 7fbe5f0ab1 Automated update of .build_number to 393 for branch master Last update: c36a4e6bbd (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 16:35:22 -07:00
• cc80fa035a Merge pull request #207 from shadlaws/fix_siblings_callback Bharat Mediratta 2013-03-11 16:35:20 -07:00
• c36a4e6bbd Automated update of .build_number to 392 for branch master Last update: ff5f386320 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 16:33:30 -07:00
• 243e3b66ca Merge pull request #206 from shadlaws/fix_2050 Bharat Mediratta 2013-03-11 16:32:55 -07:00
• 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... shadlaws 2013-03-11 23:10:27 +01:00
• 63e5dd76d9 #2049 - Fix issues with ports other than http/80 or https/443. - get SERVER_PORT and add to SERVER_NAME if it's not http/80 or https/443 shadlaws 2013-03-11 18:44:45 +01:00
• ff5f386320 Automated update of .build_number to 391 for branch master Last update: 24e720b48e (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 09:46:31 -07:00
• 313f2abc0c Merge pull request #205 from shadlaws/fix_2053 Bharat Mediratta 2013-03-11 09:46:00 -07:00
• 24e720b48e Automated update of .build_number to 390 for branch master Last update: 5c137b655b (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 09:45:51 -07:00
• 1ed4ef1fb1 Merge pull request #203 from shadlaws/fix_2052 Bharat Mediratta 2013-03-11 09:45:39 -07:00
• 5c137b655b Automated update of .build_number to 389 for branch master Last update: 2478bb06fd (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 09:30:48 -07:00
• 12508a71e0 Merge pull request #200 from shadlaws/fix_2048 Bharat Mediratta 2013-03-11 09:30:26 -07:00
• 2478bb06fd Automated update of .build_number to 388 for branch master Last update: 4d631a4cad (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-11 09:30:03 -07:00
• 1a9f87d3ee Merge pull request #199 from shadlaws/unit_test_fix_20130310 Bharat Mediratta 2013-03-11 09:29:51 -07:00
• 2e94edab53 #2053 - Change all .bind() to .on() for jQuery future-proofing. - on/off are preferred to bind/unbind, live/die, and delegate/undelegate in jQuery 1.7+ - they're likely on the road toward deprecation, so let's replace them now. shadlaws 2013-03-11 17:16:20 +01:00
• 3c47deb9ef Themes can choose child thumbnail when asking for proportion. Jozef Selesi 2013-03-11 15:59:00 +01:00
• bae14a76e5 Themes can set minimum thumbnail size when calculating proportions. Jozef Selesi 2013-03-11 14:42:43 +01:00
• 67504a00eb #2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor. - fixed for new jQuery. - removed unnecessary CSS. - fixed bug where small images would get oversized when the window was resized. - refactored a few other things. shadlaws 2013-03-11 15:49:27 +01:00
• 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) shadlaws 2013-03-11 11:40:15 +01:00
• 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). shadlaws 2013-03-10 22:08:16 +01:00
• b036b8acc0 Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable. shadlaws 2013-03-10 11:27:10 +01:00
• 4d631a4cad Automated update of .build_number to 387 for branch master Last update: e2cc29a61a (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-09 15:33:57 -07:00
• 0899528ff5 Merge pull request #196 from shadlaws/fix_2046 Bharat Mediratta 2013-03-09 14:33:47 -08:00
• e2cc29a61a Automated update of .build_number to 386 for branch master Last update: 2b8fdd3b90 (1 commits ago) [ci skip] Automatic Build Number Updater 2013-03-09 15:22:01 -07:00
• 2c2f61467a Merge pull request #195 from jozefs/master Bharat Mediratta 2013-03-09 14:21:58 -08:00