summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-14Merge pull request #141 from shadlaws/jquery_19_dialog_sizingBharat Mediratta
Dialog centering, sizing, etc. seem to be fixed!
2013-02-14Merge pull request #142 from shadlaws/jquery_19_themerollerBharat Mediratta
Updated Themeroller for wind and admin_wind.
2013-02-14Merge pull request #140 from shadlaws/jquery_19_libs_followonBharat Mediratta
Changing 2 library names back to (less-standardized) original names.
2013-02-13Fix Cancel link positioning, fix watermark error reply (seems to have ↵shadlaws
already been broken in v3.0.4...)
2013-02-13Updated Themeroller for wind and admin_wind.shadlaws
2013-02-13Dialog centering, sizing, etc. seem to be fixed! Well, *if* they come from ↵shadlaws
a link/menu. If they come from a context menu, they're still really broken.
2013-02-12Changing 2 library names back to (less-standardized) original names.shadlaws
json2.js -> json2-min.js ; jquery.localScroll.js -> jquery.localscroll.js While this is irrelevant for Wind, changing the filenames back to what we used to have ensures that we don't break contributed themes. --HG-- rename : lib/jquery.localScroll.js => lib/jquery.localscroll.js
2013-02-12Merge pull request #137 from shadlaws/jquery_19_success_xhrBharat Mediratta
Updated success callbacks for gallery.panel.js and gallery.dialog.js
2013-02-12Merge pull request #136 from shadlaws/jquery_19_libsBharat Mediratta
Finished jQuery library updates, current for 2013/02/12.
2013-02-12Formatting: cleaned up extra lines, whitespaces, converted tabs to spaces, etc.shadlaws
2013-02-12Updated success callbacks for gallery.panel.js and gallery.dialog.js - no ↵shadlaws
longer need to save xhr ahead of success. Tested and seems to work well, even with watermarks on Chrome (previously an issue).
2013-02-12Updated json.js libraryshadlaws
- json.js 2012/10/08 - used non-minified to be consistent with other libraries - updated filename in page.html.php call
2013-02-12Changed case of call to jquery.localScroll.js to match new standard.shadlaws
2013-02-12Finished jQuery library updates, current for 2013/02/12.shadlaws
- jquery.js 1.9.1 (2013/02/04) - jquery.cookie.js 1.3.1 (2013/01/30) - jquery.scrollTo.js 1.4.5 (2012/12/14) - jquery.localScroll.js 1.2.8b (2012/09/21) Note: jquery.jeditable.js and jquery.MultiFile.js still removed, as they are no longer used.
2013-02-05force the dialog to the top of the pageBharat Mediratta
2013-02-03Force dialogs to the top of the page.Bharat Mediratta
2013-02-03No need to do the eval anymore.Bharat Mediratta
2013-02-03Merge branch 'master' into jquery_190Bharat Mediratta
2013-02-03Super first pass:Bharat Mediratta
- jQuery 1.90 - jQuery UI 1.10 - Superfish 1.5.1 (minus all plugins) - jQuery Form 3.26.0-2013.01.28 Deleted all other jQuery plugins for now. - Reworked autocomplete to use the latest jQuery code. - Deleted references to $.browser.msie, no longer supported - Basic CSS support for autocomplete - lots more work needed there
2013-02-02Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-02-02Create gallery::allow_css_and_js_combining() which lets you disable ↵Bharat Mediratta
combining CSS/JS by touching var/DONT_COMBINE. Fixes #1989.
2013-02-02Automated update of .build_number to 324 for branch masterAutomatic Build Number Updater
Last update: a99b6f79aa8f66bc4d2ea34f814a2f53dde1d288 (1 commits ago)
2013-02-02Merge pull request #120 from shadlaws/fix_1986_followonBharat Mediratta
Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
2013-02-02Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.shadlaws
- Update xss_test golden file (change line numbers).
2013-02-01Automated update of .build_number to 323 for branch masterAutomatic Build Number Updater
Last update: 070095cf6cc628374ff56489c27220ca61b5735a (1 commits ago)
2013-02-01Merge pull request #117 from mikeage/fix_1987Bharat Mediratta
#1987 g2_import module should redirect with a 301, not 302
2013-02-01 #1987 g2_import module should redirect with a 301, not 302Mike Miller
As the g2_import process is generally assumed to be permanent, the redirect should be a 301, and not a 302.
2013-01-31Automated update of .build_number to 322 for branch masterAutomatic Build Number Updater
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (1 commits ago)
2013-02-01Fix ctrl-click behavior. Fixes #1986.Bharat Mediratta
2013-01-31Automated update of .build_number to 321 for branch masterAutomatic Build Number Updater
Last update: 340a14d3065aa9f330b462d14426960450a0d1d8 (1 commits ago)
2013-01-31Follow-on to 93963422505ecc790af62ae0503f301145debac3 for #1985 whichBharat Mediratta
was breaking all unit tests. Use module::install("gallery") instead of calling gallery_installer::install directly.
2013-01-31Automated update of .build_number to 320 for branch masterAutomatic Build Number Updater
Last update: 795f2569941f582127885f0bdcabe089d644a5d6 (3 commits ago)
2013-01-31Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta
2013-01-31Drop the requirement to have the install() function set the moduleBharat Mediratta
version. It's redundant. Fixes #1985.
2013-01-31Automated update of .build_number to 319 for branch masterAutomatic Build Number Updater
Last update: 795f2569941f582127885f0bdcabe089d644a5d6 (1 commits ago)
2013-01-31Merge pull request #115 from shadlaws/fix_1982Bharat Mediratta
#1982 - Add placeholder for albums with no album cover.
2013-01-31Automated update of .build_number to 318 for branch masterAutomatic Build Number Updater
Last update: 107735ffc42bd761e28cbfc79f59aa23c1bcbc2a (1 commits ago)
2013-01-31Escape the host/username/password arguments to mysqldump. Fixes #1984.Bharat Mediratta
2013-01-31Automated update of .build_number to 317 for branch masterAutomatic Build Number Updater
Last update: a15d062b23f36920f5db0793b1086a149f7030ac (1 commits ago)
2013-01-31Merge pull request #116 from shadlaws/fix_1983Bharat Mediratta
#1983: Remove item keys changed for/by graphics::generate from significant changes list.
2013-01-31Automated update of .build_number to 316 for branch masterAutomatic Build Number Updater
Last update: e17c39386b9d322f9bafd8b548ec6b94a7c5f7b5 (1 commits ago)
2013-01-31Merge pull request #114 from shadlaws/fix_1945_followonBharat Mediratta
Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.
2013-01-31#1983: Remove item keys changed for/by graphics::generate from significant ↵shadlaws
changes list. There's no need to run through all of the item save/validation logic for these entries, which are changed frequently during the course of thumb/resize generation.
2013-01-31#1982 - Add placeholder for albums with no album cover.shadlaws
- Added missing_album_cover.jpg placeholder image. - Modified the graphics helper to use it. Calling graphics::generate will copy it. - Modified item::remove_album_cover and gallery_event::item_created to run graphics::generate. - Added unit test to Graphics_Helper_Test.
2013-01-31Follow-on to 5fca371a616dba16f955087c4477ee229ee222d0 for #1945.shadlaws
Previously skipped admin_watermarks mods to use new functionality of #1945 since there was concurrent work on it with #1970. Now that both are done, we can wrap this up.
2013-01-30Automated update of .build_number to 315 for branch masterAutomatic Build Number Updater
Last update: fc82f56f4b3c91ac1ceee426f477b256918636f8 (2 commits ago)
2013-01-30Follow-in to cff1e76e8da2055f9faf7449222b43a686014b1c for #1978Bharat Mediratta
Restrict which album cover ids we swap over to the hierarchy of the current album, otherwise we can wind up in sticky situations with hierarchical album cover chains. Eg, you have a hierarchy like this: root -> A1 -> A2 --> A3 -> P1 A4 -> P2 P1 is the album cover for its entire hierarchy. But then you swap A2's album cover for A3 making this: root -> A1 -> A2 + A3 -> P1 \-> A4 -> P2 Since A1, A2 and A3 all had P1 as their album cover item id. Now we're swapping it over to P2 but we want to leave P1 as A3's album cover item id. So only look at A4's hierarchy and ignore its peers.
2013-01-30Support additional where tuples in ORM_MPTT::parents. Fixes #1980.Bharat Mediratta
2013-01-30Automated update of .build_number to 314 for branch masterAutomatic Build Number Updater
Last update: 12ea6ad642c0e84fe67f1324f8fa00c9534e7aa5 (3 commits ago)
2013-01-30Merge branch 'master' of github.com:gallery/gallery3Bharat Mediratta