[gallery/gallery3] e719a6: #2062 - Fix extra/missing spaces in search query.
GitHub <noreply-9UaJU3cA/F/[email protected]> Sat, 08 Jun 2013 15:20:31 -0700
| Newsgroups | gmane.comp.web.gallery.cvs |
|---|---|
| Message-ID | <51b3ae2fad243_26e811b9ddc4869f@hookshot-fe2-pe1-prd.aws.github.net.mail> |
Branch: refs/heads/kohana_3
Home: https://github.com/gallery/gallery3
Commit: e719a6316a1bd73dcd6335457517bf46f593532c
https://github.com/gallery/gallery3/commit/e719a6316a1bd73dcd6335457517bf46f593532c
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M modules/search/helpers/search.php
Log Message:
-----------
#2062 - Fix extra/missing spaces in search query.
- Every to-be-concatenated string now begins with 1 space and ends with 0 spaces.
Commit: 725dd3f80691f318d2de95804c3446e900d037f9
https://github.com/gallery/gallery3/commit/725dd3f80691f318d2de95804c3446e900d037f9
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M modules/search/helpers/search.php
Log Message:
-----------
Merge pull request #218 from shadlaws/fix_2062
#2062 - Fix extra/missing spaces in search query.
Commit: 2340426c090df43f26d052671fe52a8d9d220627
https://github.com/gallery/gallery3/commit/2340426c090df43f26d052671fe52a8d9d220627
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 401 for branch master
Last update: ef554a34e88141a1fee0a695a00337747a303580 (1 commits ago)
[ci skip]
Commit: 26e4f044bb861f478719388fc9fb503fa16af2d5
https://github.com/gallery/gallery3/commit/26e4f044bb861f478719388fc9fb503fa16af2d5
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M modules/gallery/controllers/uploader.php
Log Message:
-----------
#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.
Commit: 5a22f0c09905305a655e921f0c9b931eb808c07e
https://github.com/gallery/gallery3/commit/5a22f0c09905305a655e921f0c9b931eb808c07e
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M modules/gallery/controllers/uploader.php
Log Message:
-----------
Merge pull request #213 from shadlaws/fix_2058
#2058 - Separate uploader logic into Kohana-, Item-Model-, and Uploadify-specific functions.
Commit: 3cec3485a4468e9ee511a63524a9e1cd7fe1ab8a
https://github.com/gallery/gallery3/commit/3cec3485a4468e9ee511a63524a9e1cd7fe1ab8a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 402 for branch master
Last update: 2340426c090df43f26d052671fe52a8d9d220627 (1 commits ago)
[ci skip]
Commit: 2dda5ef14da747b206b829c1a0096aacfd393033
https://github.com/gallery/gallery3/commit/2dda5ef14da747b206b829c1a0096aacfd393033
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M lib/superfish/js/superfish.js
Log Message:
-----------
Update to Superfish v1.5.13, with JS minified (in sync with gallery3-vendor)
Commit: 57bcbd1efdbf53b8b1967279ed07cb1f8b11e1f8
https://github.com/gallery/gallery3/commit/57bcbd1efdbf53b8b1967279ed07cb1f8b11e1f8
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M lib/superfish/js/superfish.js
Log Message:
-----------
Merge pull request #221 from shadlaws/superfish_1_5_13
Update to Superfish v1.5.13, with JS minified (in sync with gallery3-vendor)
Commit: 1eab94f6062b5f54ea5d9db01d968e7195f3de9d
https://github.com/gallery/gallery3/commit/1eab94f6062b5f54ea5d9db01d968e7195f3de9d
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 403 for branch master
Last update: 3cec3485a4468e9ee511a63524a9e1cd7fe1ab8a (1 commits ago)
[ci skip]
Commit: c37288f0b24c19813405096c087ab0c7c171c358
https://github.com/gallery/gallery3/commit/c37288f0b24c19813405096c087ab0c7c171c358
Author: Bharat Mediratta <[email protected]>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M modules/gallery/views/error_admin.html.php
Log Message:
-----------
Sanitize all key values.
Commit: 27b009e66513b9b50eb2bec1de24126a3f98e717
https://github.com/gallery/gallery3/commit/27b009e66513b9b50eb2bec1de24126a3f98e717
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 404 for branch master
Last update: 1eab94f6062b5f54ea5d9db01d968e7195f3de9d (1 commits ago)
[ci skip]
Commit: 9b1c6ab14f8a7c6024795d213f55ea31ac77c480
https://github.com/gallery/gallery3/commit/9b1c6ab14f8a7c6024795d213f55ea31ac77c480
Author: Bharat Mediratta <[email protected]>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M modules/gallery/tests/xss_data.txt
Log Message:
-----------
Golden file update follow-on for c37288f0b24c19813405096c087ab0c7c171c358
Commit: 0b307a40dec7e9f430c2dea6fcf8593598d90b15
https://github.com/gallery/gallery3/commit/0b307a40dec7e9f430c2dea6fcf8593598d90b15
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-04-13 (Sat, 13 Apr 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 405 for branch master
Last update: 27b009e66513b9b50eb2bec1de24126a3f98e717 (1 commits ago)
[ci skip]
Commit: 0f28d4cee460dfada48bd6c81470db62e48b16d0
https://github.com/gallery/gallery3/commit/0f28d4cee460dfada48bd6c81470db62e48b16d0
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M modules/gallery/controllers/movies.php
Log Message:
-----------
Ensure that movie titles are purified upon display.
Commit: 269927b27c7ea25193c4da29db17539eb3d92d50
https://github.com/gallery/gallery3/commit/269927b27c7ea25193c4da29db17539eb3d92d50
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 406 for branch master
Last update: 0b307a40dec7e9f430c2dea6fcf8593598d90b15 (1 commits ago)
[ci skip]
Commit: ce97f5ff264aa34e74a98bae3ff23678a1ddde75
https://github.com/gallery/gallery3/commit/ce97f5ff264aa34e74a98bae3ff23678a1ddde75
Author: Rasmus Lerdorf <[email protected]>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M modules/g2_import/helpers/g2_import.php
Log Message:
-----------
There is no $g2_album_id here
I assume this should be $g2_album->getId() instead
Commit: f2def7778df20041d1d94a6eda40074f77c54872
https://github.com/gallery/gallery3/commit/f2def7778df20041d1d94a6eda40074f77c54872
Author: Rasmus Lerdorf <[email protected]>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M system/helpers/remote.php
Log Message:
-----------
valid::url() only takes 1 arg
Commit: 0c2d2b25fa7eb738d0a7491a793b2539a2dc4721
https://github.com/gallery/gallery3/commit/0c2d2b25fa7eb738d0a7491a793b2539a2dc4721
Author: Rasmus Lerdorf <[email protected]>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M system/libraries/drivers/Cache/Xcache.php
Log Message:
-----------
How did this ever work? :)
Commit: 90528d9c83b74518c0a2293802b93fa03da40345
https://github.com/gallery/gallery3/commit/90528d9c83b74518c0a2293802b93fa03da40345
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M lib/gallery.ajax.js
M lib/gallery.dialog.js
M lib/gallery.in_place_edit.js
M lib/gallery.panel.js
M modules/server_add/js/server_add.js
M modules/user/js/password_strength.js
Log Message:
-----------
#2065 - Fix problems with double-ajaxifying of dialogs.
Change all jQuery-ui widget _init() functions to _create() functions.
Commit: 48f9595f7806796f955fa1c2c6a3f6f17b1ed9ad
https://github.com/gallery/gallery3/commit/48f9595f7806796f955fa1c2c6a3f6f17b1ed9ad
Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M lib/gallery.ajax.js
M lib/gallery.dialog.js
M lib/gallery.in_place_edit.js
M lib/gallery.panel.js
M modules/server_add/js/server_add.js
M modules/user/js/password_strength.js
Log Message:
-----------
Merge pull request #357 from shadlaws/double_ajax_fixing_master
#2065 - Fix problems with double-ajaxifying of dialogs.
Commit: f59f1c03b8e69241095d8c708d6a42edf6ed2a55
https://github.com/gallery/gallery3/commit/f59f1c03b8e69241095d8c708d6a42edf6ed2a55
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M modules/g2_import/helpers/g2_import.php
M system/helpers/remote.php
M system/libraries/drivers/Cache/Xcache.php
Log Message:
-----------
Merge pull request #352 from rlerdorf/master
Fix a couple of small mistakes
Fixes #2066 and #2067
Commit: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1
https://github.com/gallery/gallery3/commit/9f8435c7f5665f153407c2b1476dadc0a3ba34a1
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 407 for branch master
Last update: 269927b27c7ea25193c4da29db17539eb3d92d50 (2 commits ago)
[ci skip]
Commit: 80bb0f2222dd99ed2ce59e804b833bab63cc376a
https://github.com/gallery/gallery3/commit/80bb0f2222dd99ed2ce59e804b833bab63cc376a
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M lib/uploadify/jquery.uploadify.min.js
A lib/uploadify/uploadify.allglyphs.php
R lib/uploadify/uploadify.allglyphs.swf
A lib/uploadify/uploadify.php
R lib/uploadify/uploadify.swf
Log Message:
-----------
Strip URL fragments off of direct requests to uploadify SWF files.
Fixes #2068.
Commit: 8b3ac7f224a008551ca1d6a39ca638595570c49e
https://github.com/gallery/gallery3/commit/8b3ac7f224a008551ca1d6a39ca638595570c49e
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-08 (Wed, 08 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 408 for branch master
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (1 commits ago)
[ci skip]
Commit: 5a85bbaf182c08a7b186b3c0fa931fb833454dee
https://github.com/gallery/gallery3/commit/5a85bbaf182c08a7b186b3c0fa931fb833454dee
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M lib/uploadify/uploadify.allglyphs.php
M lib/uploadify/uploadify.php
Log Message:
-----------
Follow-on: put at least one byte in the fragment so that it doesn't
get discarded by browsers.
Commit: ed8ec288c6a402b7748356182e9671b93739b073
https://github.com/gallery/gallery3/commit/ed8ec288c6a402b7748356182e9671b93739b073
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Merge branch 'master' of github.com:gallery/gallery3
Commit: d5fbd672954ec287bf5ecf080011d876d5238bfc
https://github.com/gallery/gallery3/commit/d5fbd672954ec287bf5ecf080011d876d5238bfc
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 409 for branch master
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (3 commits ago)
[ci skip]
Commit: c9627210165e7fc0ff9a2bf00c435d50a013e13f
https://github.com/gallery/gallery3/commit/c9627210165e7fc0ff9a2bf00c435d50a013e13f
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M lib/uploadify/uploadify.allglyphs.php
M lib/uploadify/uploadify.php
Log Message:
-----------
Add the proper Gallery preamble.
Commit: 85ae39fee87fb93d2028cdc0737dcd98006fe11e
https://github.com/gallery/gallery3/commit/85ae39fee87fb93d2028cdc0737dcd98006fe11e
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Merge branch 'master' of github.com:gallery/gallery3
Commit: 62726d66e9f462711b0187c94b343fe180778133
https://github.com/gallery/gallery3/commit/62726d66e9f462711b0187c94b343fe180778133
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 410 for branch master
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (5 commits ago)
[ci skip]
Commit: e4a3abdd207cce37c4f71ed87d0c420ec8539775
https://github.com/gallery/gallery3/commit/e4a3abdd207cce37c4f71ed87d0c420ec8539775
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M modules/gallery/tests/xss_data.txt
M modules/gallery/views/form_uploadify.html.php
Log Message:
-----------
Change upload code to use new uploadify urls.
Commit: f35578982c55a9b434a8a9c05e5e4590ec15139d
https://github.com/gallery/gallery3/commit/f35578982c55a9b434a8a9c05e5e4590ec15139d
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Merge branch 'master' of github.com:gallery/gallery3
Commit: 07af91e05d8d48209facec4cc3fe54c92e2f463e
https://github.com/gallery/gallery3/commit/07af91e05d8d48209facec4cc3fe54c92e2f463e
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 411 for branch master
Last update: 9f8435c7f5665f153407c2b1476dadc0a3ba34a1 (7 commits ago)
[ci skip]
Commit: b6ad4157d1aae5849ad5608b90c62f1acf22e1a9
https://github.com/gallery/gallery3/commit/b6ad4157d1aae5849ad5608b90c62f1acf22e1a9
Author: Bharat Mediratta <[email protected]>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M lib/uploadify/uploadify.allglyphs.php
M lib/uploadify/uploadify.php
M modules/gallery/tests/File_Structure_Test.php
Log Message:
-----------
Get rid of the security preamble - we intend for these files to be directly accessible.
Commit: 4d8fbd1b9d61463ed255b3a73e6e6b3574d97923
https://github.com/gallery/gallery3/commit/4d8fbd1b9d61463ed255b3a73e6e6b3574d97923
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-09 (Thu, 09 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 412 for branch master
Last update: 07af91e05d8d48209facec4cc3fe54c92e2f463e (1 commits ago)
[ci skip]
Commit: 2ebe38b148da8830f2b4064bb738633c511c97cc
https://github.com/gallery/gallery3/commit/2ebe38b148da8830f2b4064bb738633c511c97cc
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-14 (Tue, 14 May 2013)
Changed paths:
M modules/gallery/helpers/gallery_task.php
Log Message:
-----------
#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.
--HG--
extra : source : 297e4c0eccc5a7940224ff8e908b366e83017354
Commit: 2713389c010b586255f7ae3cde0988cabd70a4ef
https://github.com/gallery/gallery3/commit/2713389c010b586255f7ae3cde0988cabd70a4ef
Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-14 (Tue, 14 May 2013)
Changed paths:
M modules/gallery/helpers/gallery_task.php
Log Message:
-----------
Merge pull request #367 from shadlaws/fix_2069_master
#2069 - Change "Fix your Gallery" task go faster and be more comprehensive.
Commit: 666f3a30e2e7ad620d50740d76364eac1c23053b
https://github.com/gallery/gallery3/commit/666f3a30e2e7ad620d50740d76364eac1c23053b
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-14 (Tue, 14 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 413 for branch master
Last update: 4d8fbd1b9d61463ed255b3a73e6e6b3574d97923 (1 commits ago)
[ci skip]
Commit: 6f922ca427ff94937904979d02e6fba063effd77
https://github.com/gallery/gallery3/commit/6f922ca427ff94937904979d02e6fba063effd77
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M modules/gallery/helpers/gallery_task.php
Log Message:
-----------
Follow-on to #2069 - Decrease stack size of MPTT rebuild task.
This reduces the likelihood that we'll hit a limit with gargantuan galleries.
--HG--
extra : source : c4a118d43145a2a4ec9b934d3aebe8f9458bcf07
Commit: 1ba8f0aa0f643f59733cdb1bd2d5fed1ebe5135b
https://github.com/gallery/gallery3/commit/1ba8f0aa0f643f59733cdb1bd2d5fed1ebe5135b
Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M modules/gallery/helpers/gallery_task.php
Log Message:
-----------
Merge pull request #371 from shadlaws/followon2069_master
Follow-on to #2069 - Decrease stack size of MPTT rebuild task.
Commit: b7177cfb2dcfb8b057a15757943c5e733d6c8917
https://github.com/gallery/gallery3/commit/b7177cfb2dcfb8b057a15757943c5e733d6c8917
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 414 for branch master
Last update: 666f3a30e2e7ad620d50740d76364eac1c23053b (1 commits ago)
[ci skip]
Commit: ce937201d0eff90178e2c89219e1000fc1175177
https://github.com/gallery/gallery3/commit/ce937201d0eff90178e2c89219e1000fc1175177
Author: Bharat Mediratta <[email protected]>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M lib/mediaelementjs/mediaelement.js
M lib/mediaelementjs/mediaelementplayer.css
M lib/mediaelementjs/mediaelementplayer.js
Log Message:
-----------
Updated MediaElement.js to 2.12.0 (2601db5ebeeaa96b3fa1f1015c494433cbcd9a85)
Commit: b347d7919d5332bc845e6c448fa0c769ffbc8cf6
https://github.com/gallery/gallery3/commit/b347d7919d5332bc845e6c448fa0c769ffbc8cf6
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 415 for branch master
Last update: b7177cfb2dcfb8b057a15757943c5e733d6c8917 (1 commits ago)
[ci skip]
Commit: c31ab3611660273d3eb9290837334ca6f706bd64
https://github.com/gallery/gallery3/commit/c31ab3611660273d3eb9290837334ca6f706bd64
Author: Bharat Mediratta <[email protected]>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M lib/mediaelementjs/flashmediaelement.swf
Log Message:
-----------
Follow-on to ce937201d0eff90178e2c89219e1000fc1175177, update the swf file
to 2.12.0 in sync with vendor.
Commit: 49c4d6b56cccb871344cd9ea3a9cc8ec80879c6c
https://github.com/gallery/gallery3/commit/49c4d6b56cccb871344cd9ea3a9cc8ec80879c6c
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 416 for branch master
Last update: b347d7919d5332bc845e6c448fa0c769ffbc8cf6 (1 commits ago)
[ci skip]
Commit: e019046e40bd639483c4b7678be17956a8fab9d5
https://github.com/gallery/gallery3/commit/e019046e40bd639483c4b7678be17956a8fab9d5
Author: Bharat Mediratta <[email protected]>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M themes/wind/views/page.html.php
Log Message:
-----------
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.
Commit: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e
https://github.com/gallery/gallery3/commit/d81ed1145dfa57d17c2bb5e7505e2f2af62c823e
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 417 for branch master
Last update: 49c4d6b56cccb871344cd9ea3a9cc8ec80879c6c (1 commits ago)
[ci skip]
Commit: b1dad9974116b5cd8236041bc276519d50ee0866
https://github.com/gallery/gallery3/commit/b1dad9974116b5cd8236041bc276519d50ee0866
Author: Bharat Mediratta <[email protected]>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
R lib/mediaelementjs/flashmediaelement.swf
A lib/mediaelementjs/flashmediaelement.swf.php
M modules/gallery/views/movieplayer.html.php
Log Message:
-----------
Replace flashmediaelement.swf with a PHP wrapper that strips url
fragments and query parameters.
Commit: d17ae418d4c7a495d71eb93270878ab50327f41a
https://github.com/gallery/gallery3/commit/d17ae418d4c7a495d71eb93270878ab50327f41a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 418 for branch master
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (1 commits ago)
[ci skip]
Commit: 3aac0564dc4db8eb7fb2970eab11a330e0714ddc
https://github.com/gallery/gallery3/commit/3aac0564dc4db8eb7fb2970eab11a330e0714ddc
Author: Bharat Mediratta <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M .build_number
M lib/superfish/js/superfish.js
A lib/uploadify/uploadify.allglyphs.php
A lib/uploadify/uploadify.php
M modules/gallery/orphans/controllers/Uploader.php
M modules/gallery/orphans/views/form_uploadify.html.php
M modules/gallery/tests/File_Structure_Test.php
M modules/gallery/tests/xss_data.txt
M modules/search/classes/Search/Search.php
Log Message:
-----------
Mostly clean merge - the outlier is
modules/gallery/orphans/controllers/Uploader.php which is unmerged but
I figure that since it's an orphan that's ok, we can defer it till
later (or delete/replace it).
Merge branch 'master' into kohana_3
Conflicts:
lib/uploadify/jquery.uploadify.min.js
modules/gallery/classes/Gallery/Hook/GalleryTask.php
modules/gallery/controllers/movies.php
modules/gallery/orphans/controllers/Uploader.php
modules/gallery/orphans/views/form_uploadify.html.php
modules/gallery/views/error/admin.html.php
modules/gallery/views/gallery/movieplayer.html.php
modules/search/classes/Search/Search.php
system/helpers/remote.php
system/libraries/drivers/Cache/Xcache.php
themes/wind/views/required/page.html.php
Compare: https://github.com/gallery/gallery3/compare/f6fb813e2bc1...3aac0564dc4d
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
__[ g a l l e r y - c h e c k i n s ]_________________________
[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]