summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-08Drop PHP 5.5 - it's segfaulting on Travis and it's not released yet anyway.Bharat Mediratta
2013-06-08Automated update of .build_number to 419 for branch masterAutomatic Build Number Updater
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (3 commits ago) [ci skip]
2013-06-08Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-06-08Rename uploadify SWF wrappers to end in .swf.php for consistency.Bharat Mediratta
2013-06-06Automated update of .build_number to 418 for branch masterAutomatic Build Number Updater
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (1 commits ago) [ci skip]
2013-06-06Replace flashmediaelement.swf with a PHP wrapper that strips urlBharat Mediratta
fragments and query parameters.
2013-06-05Automated update of .build_number to 417 for branch masterAutomatic Build Number Updater
Last update: 49c4d6b56cccb871344cd9ea3a9cc8ec80879c6c (1 commits ago) [ci skip]
2013-06-06Use html::clean() instead of html::purify() on the breadcrumb text soBharat Mediratta
that we show the actual text. HTMLPurify allows some HTML to render, but we don't want that here. Fixes #2072.
2013-06-05Automated update of .build_number to 416 for branch masterAutomatic Build Number Updater
Last update: b347d7919d5332bc845e6c448fa0c769ffbc8cf6 (1 commits ago) [ci skip]
2013-06-05Follow-on to ce937201d0eff90178e2c89219e1000fc1175177, update the swf fileBharat Mediratta
to 2.12.0 in sync with vendor.
2013-06-05Automated update of .build_number to 415 for branch masterAutomatic Build Number Updater
Last update: b7177cfb2dcfb8b057a15757943c5e733d6c8917 (1 commits ago) [ci skip]
2013-06-04Updated MediaElement.js to 2.12.0 (2601db5ebeeaa96b3fa1f1015c494433cbcd9a85)Bharat Mediratta
2013-05-24Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2013-05-15Automated update of .build_number to 414 for branch masterAutomatic Build Number Updater
Last update: 666f3a30e2e7ad620d50740d76364eac1c23053b (1 commits ago) [ci skip]
2013-05-15Merge pull request #371 from shadlaws/followon2069_masterShad Laws
Follow-on to #2069 - Decrease stack size of MPTT rebuild task.
2013-05-15Follow-on to #2069 - Decrease stack size of MPTT rebuild task.shadlaws
This reduces the likelihood that we'll hit a limit with gargantuan galleries. --HG-- extra : source : c4a118d43145a2a4ec9b934d3aebe8f9458bcf07
2013-05-14Automated update of .build_number to 413 for branch masterAutomatic Build Number Updater
Last update: 4d8fbd1b9d61463ed255b3a73e6e6b3574d97923 (1 commits ago) [ci skip]
2013-05-14Merge pull request #367 from shadlaws/fix_2069_masterShad Laws
#2069 - Change "Fix your Gallery" task go faster and be more comprehensive.
2013-05-14#2069 - Change "Fix your Gallery" task go faster and be more comprehensive.shadlaws
- 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-09Automated update of .build_number to 412 for branch masterAutomatic Build Number Updater
Last update: 07af91e05d8d48209facec4cc3fe54c92e2f463e (1 commits ago) [ci skip]
2013-05-09Get rid of the security preamble - we intend for these files to be directly ↵Bharat Mediratta
accessible.
2013-05-09Automated update of .build_number to 411 for branch masterAutomatic Build Number Updater
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (7 commits ago) [ci skip]
2013-05-09Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-05-09Change upload code to use new uploadify urls.Bharat Mediratta
2013-05-09Automated update of .build_number to 410 for branch masterAutomatic Build Number Updater
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (5 commits ago) [ci skip]
2013-05-09Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-05-09Add the proper Gallery preamble.Bharat Mediratta
2013-05-09Automated update of .build_number to 409 for branch masterAutomatic Build Number Updater
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (3 commits ago) [ci skip]
2013-05-09Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-05-09Follow-on: put at least one byte in the fragment so that it doesn'tBharat Mediratta
get discarded by browsers.
2013-05-08Automated update of .build_number to 408 for branch masterAutomatic Build Number Updater
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (1 commits ago) [ci skip]
2013-05-09Strip URL fragments off of direct requests to uploadify SWF files.Bharat Mediratta
Fixes #2068.
2013-05-07Automated update of .build_number to 407 for branch masterAutomatic Build Number Updater
Last update: 269927b27c7ea25193c4da29db17539eb3d92d50 (2 commits ago) [ci skip]
2013-05-07Merge pull request #352 from rlerdorf/masterBharat Mediratta
Fix a couple of small mistakes Fixes #2066 and #2067
2013-05-07Merge pull request #357 from shadlaws/double_ajax_fixing_masterShad Laws
#2065 - Fix problems with double-ajaxifying of dialogs.
2013-05-07#2065 - Fix problems with double-ajaxifying of dialogs.shadlaws
Change all jQuery-ui widget _init() functions to _create() functions.
2013-05-05How did this ever work? :)Rasmus Lerdorf
2013-05-05valid::url() only takes 1 argRasmus Lerdorf
2013-05-05There is no $g2_album_id hereRasmus Lerdorf
I assume this should be $g2_album->getId() instead
2013-05-02Automated update of .build_number to 406 for branch masterAutomatic Build Number Updater
Last update: 0b307a40dec7e9f430c2dea6fcf8593598d90b15 (1 commits ago) [ci skip]
2013-04-21Ensure that movie titles are purified upon display.shadlaws
2013-04-13Automated update of .build_number to 405 for branch masterAutomatic Build Number Updater
Last update: 27b009e66513b9b50eb2bec1de24126a3f98e717 (1 commits ago) [ci skip]
2013-04-14Golden file update follow-on for c37288f0b24c19813405096c087ab0c7c171c358Bharat Mediratta
2013-04-13Automated update of .build_number to 404 for branch masterAutomatic Build Number Updater
Last update: 1eab94f6062b5f54ea5d9db01d968e7195f3de9d (1 commits ago) [ci skip]
2013-04-14Sanitize all key values.Bharat Mediratta
2013-03-19Merge branch 'master' of git://github.com/gallery/gallery3Nathan Kinkade
2013-03-15Automated update of .build_number to 403 for branch masterAutomatic Build Number Updater
Last update: 3cec3485a4468e9ee511a63524a9e1cd7fe1ab8a (1 commits ago) [ci skip]
2013-03-15Merge pull request #221 from shadlaws/superfish_1_5_13Bharat Mediratta
Update to Superfish v1.5.13, with JS minified (in sync with gallery3-vendor)
2013-03-16Update to Superfish v1.5.13, with JS minified (in sync with gallery3-vendor)shadlaws
2013-03-14Automated update of .build_number to 402 for branch masterAutomatic Build Number Updater
Last update: 2340426c090df43f26d052671fe52a8d9d220627 (1 commits ago) [ci skip]