summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-26Automated update of .build_number to 366 for branch masterAutomatic Build Number Updater
Last update: 1d2610d613576f9bce7b21bc12852da4bd77ae46 (1 commits ago)
2013-02-26Merge pull request #168 from shadlaws/update_jsonjs_20130226Bharat Mediratta
Update to latest JSON-js, in sync with gallery3-vendor
2013-02-26Update to latest JSON-js, in sync with gallery3-vendorshadlaws
- did this a short while ago, but out of sync with gallery3-vendor and with a different minimizer.
2013-02-25Automated update of .build_number to 365 for branch masterAutomatic Build Number Updater
Last update: e23ec0eda9df71aeca9884e3070ec9f2711f41e8 (1 commits ago)
2013-02-25Merge pull request #162 from shadlaws/followon_autocomplete_and_panelBharat Mediratta
Follow-on from autocomplete and gallery.panel.js revisions.
2013-02-25Automated update of .build_number to 364 for branch masterAutomatic Build Number Updater
Last update: 59fbf7f14e132d4ac508ce358c85d2bf25ae76f9 (1 commits ago)
2013-02-25Merge pull request #163 from shadlaws/fix_2018Bharat Mediratta
#2018 - Make ui.init.js thumbnail hover effect more robust.
2013-02-25#2018 - Make ui.init.js thumbnail hover effect more robust.shadlaws
- changed thumbnail hover effect to store its original height on mouseenter, then return to it on mouseleave. - removed previous routine which depended on the height of its siblings and was incompatible with some IE versions.
2013-02-25Follow-on from autocomplete and gallery.panel.js revisions.shadlaws
(9345dde83e1f092a9309c45282dc21e3fd408875, d632ef3e50252d388c272cacd29e8cc6e4949cec, fd012276cbf03cc1dc7b8da10aac5cc6f26326c6) - revised xss_data.txt golden file (no new cases). - escaped translated string in admin_users.html.php (would have otherwise been a new case in xss_data.txt).
2013-02-23Automated update of .build_number to 363 for branch masterAutomatic Build Number Updater
Last update: 22ce7e0795c67e09b43c4450b90a164d22a19939 (1 commits ago)
2013-02-23Merge pull request #158 from shadlaws/fix_2012Bharat Mediratta
#2012 - Clean up gallery.in_place_edit.js.
2013-02-23Automated update of .build_number to 362 for branch masterAutomatic Build Number Updater
Last update: 261dccc5bcb39e8892701ac3078f28e0ec029b6e (1 commits ago)
2013-02-23Merge pull request #161 from shadlaws/jquery_ui_1_10_1Bharat Mediratta
Update jQuery-UI from v1.10.0 to v1.10.1
2013-02-23Automated update of .build_number to 361 for branch masterAutomatic Build Number Updater
Last update: d811d63c51dc79aaa06942778ce8afb1c89dbc28 (1 commits ago)
2013-02-23Merge pull request #160 from shadlaws/fix_2014Bharat Mediratta
#2014 - Clean up gallery.ajax.js.
2013-02-23Automated update of .build_number to 360 for branch masterAutomatic Build Number Updater
Last update: 53e6df0b95e3abf58bf88f84b9d9bc68e25ca9a5 (1 commits ago)
2013-02-23Merge pull request #159 from shadlaws/fix_2013Bharat Mediratta
#2013 - Clean up gallery.panel.js.
2013-02-23Update jQuery-UI from v1.10.0 to v1.10.1shadlaws
2013-02-23#2014 - Clean up gallery.ajax.js.shadlaws
- prepend "data-" in front of non-standard attr to be more standards compliant. - fix formatting.
2013-02-23#2013 - Clean up gallery.panel.js (formatting only)shadlaws
- fixed whitespaces
2013-02-23#2013 - Clean up gallery.panel.js.shadlaws
- prepend "data-" in front of non-standard attr to be more standards compliant.
2013-02-23#2012 - Clean up gallery.in_place_edit.js (formatting only)shadlaws
- removed extra leading whitespaces
2013-02-23#2012 - Clean up gallery.in_place_edit.js.shadlaws
- removed extend similar to previous jQuery updates (doesn't work the same with jQuery 1.4+)
2013-02-22Automated update of .build_number to 359 for branch masterAutomatic Build Number Updater
Last update: 2a6896e2a51833f45cd48bca0b5048cc9633c9bd (3 commits ago)
2013-02-23Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-23Merge branch 'jquery_190'Bharat Mediratta
2013-02-22Automated update of .build_number to 358 for branch masterAutomatic Build Number Updater
Last update: 2a6896e2a51833f45cd48bca0b5048cc9633c9bd (1 commits ago)
2013-02-20Merge pull request #155 from shadlaws/fix_2008Bharat Mediratta
#2008 - Add warnings if some active modules are obsolete.
2013-02-20#2008 - Add warnings if some active modules are obsolete.shadlaws
- added module::get_obsolete_modules_message function - put message on admin/dashboard - put message on admin/modules - put message on upgrader - updated unit test golden file xss_data
2013-02-18Automated update of .build_number to 357 for branch masterAutomatic Build Number Updater
Last update: 12d68b89feea10855ce4c779f2afb543e40f1c21 (1 commits ago)
2013-02-18Merge pull request #154 from shadlaws/masterBharat Mediratta
Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.
2013-02-18Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.shadlaws
- fix unit tests for watermarks, which check for deleted files.
2013-02-18Automated update of .build_number to 356 for branch masterAutomatic Build Number Updater
Last update: f12aaf3c345fcce39fdbe721c896c03e3b429e58 (1 commits ago)
2013-02-18Fix up some tests:Bharat Mediratta
- unlink copied files because they confused File_Structure_Test - update golden files
2013-02-18Automated update of .build_number to 355 for branch masterAutomatic Build Number Updater
Last update: e950d2f4ef52b68e1ccf1cec2e896a916af5e571 (1 commits ago)
2013-02-18Merge pull request #150 from shadlaws/fix_zend_guard_loader_issuesBharat Mediratta
#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
2013-02-18#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.shadlaws
- added MY_Kohana to provide wrapper for auto_load(), which loads dummy class when none found. - revised Bootstrap to load MY_Kohana. This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
2013-02-18Merge branch 'jquery_190' of github.com:gallery/gallery3 into jquery_190Bharat Mediratta
2013-02-18Automated update of .build_number to 354 for branch masterAutomatic Build Number Updater
Last update: afa61f9d0d551bc2a0c4fa903eb3f55742720c8d (1 commits ago)
2013-02-18Merge pull request #149 from shadlaws/fix_2007Bharat Mediratta
#2007 - Change search box text when only looking in the current album.
2013-02-18Merge branch 'master' into jquery_190Bharat Mediratta
2013-02-18Merge pull request #153 from shadlaws/jquery_autocomplete_compatBharat Mediratta
Moved autocomplete CSS to gallery.css to ensure it works for all themes (incl. admin_wind)
2013-02-18Merge pull request #152 from shadlaws/jquery_password_strengthBharat Mediratta
Password strength indicator fixed for new jQuery. Also cleaned up formatting.
2013-02-18Merge pull request #151 from shadlaws/jquery_context_menusBharat Mediratta
Context menus are fixed!
2013-02-18#2007 - Change search box text when only looking in the current album.shadlaws
- search.html.php - updated to use new labels. - search_link.html.php - updated to use new labels. Moved code that determines current album to top, then used it for both the new label and the hidden album input. Resulting form code looks more symmetric to search.html.php.
2013-02-18Moved autocomplete CSS to gallery.css to ensure it works for all themes ↵shadlaws
(including admin_wind).
2013-02-18Password strength indicator fixed for new jQuery. Also cleaned up formatting.shadlaws
2013-02-18Context menus are fixed! This should be fully compatible with older themesshadlaws
since only gallery.common.js is modified. Now that I understand the problem and the fix, I'm not sure I can explain why it *used* to work with older jQuery...
2013-02-17Automated update of .build_number to 353 for branch masterAutomatic Build Number Updater
Last update: 87d20c63af02ae573853da2cb82d7323a56677b5 (1 commits ago)
2013-02-17Merge pull request #148 from shadlaws/fix_2006Bharat Mediratta
#2006 - Add system::mark_file_for_delete API to delete files at shutdown.