Merge remote branch 'spunky/rfe11517'

2010-05-18 11:24:23 -05:00 · 2010-05-18 11:24:23 -05:00 · 96a52c5748
commit 96a52c5748
parent 9cf2a308c5 8030bed30b
7 changed files with 225 additions and 23 deletions
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@ -21,6 +21,8 @@
 - fixed #11563: Syndicated Content - descriptionFirstParagraph cuts off
 - fixed #11538: User invite mail: whitespace in message lost
 - fixed #11549: Shortcut Asset cannot override Page Layout
+ - added #11502: Gallery: Allow specification of location when uploading ZIP archives
+ - added #11517: Gallery: Sorting of files uploaded in zip archives

 7.9.4
 - We're shipping underscore.js now for its suite of extremely handy utility
--- a/docs/upgrades/packages-7.9.5/root_import_gallery-templates_default-gallery-add-archive.wgpkg
+++ b/docs/upgrades/packages-7.9.5/root_import_gallery-templates_default-gallery-add-archive.wgpkg