stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-10 15:09:15 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 0 Tags
a5700a2f3cee5ef02ae1bba97bf8b2cdac8fa4a2
Commit Graph

7522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta
a5700a2f3c Merge pull request #202 from shadlaws/fix_2051 
#2051 - Revise how Gallery_View returns combined JS and CSS.
 2013-03-13 21:10:25 -07:00
Automatic Build Number Updater
23564554f2 Automated update of .build_number to 399 for branch master 
Last update: 11d8864064 (1 commits ago)
[ci skip]
 2013-03-13 20:59:18 -07:00
Bharat Mediratta
b69297db75 Merge pull request #216 from shadlaws/fix_2061 
#2061 - Remove Uploadify from add_photo_form/add_photo_form_completed events.
 2013-03-13 20:58:45 -07:00
Automatic Build Number Updater
11d8864064 Automated update of .build_number to 398 for branch master 
Last update: 8b457bf39b (1 commits ago)
[ci skip]
 2013-03-13 20:57:29 -07:00
Bharat Mediratta
3c8e521d40 Merge pull request #214 from shadlaws/fix_2059 
#2059 - Add album name sanitizing similar to photo/movie filename sanitizing
 2013-03-13 20:57:03 -07:00
shadlaws
a140303468 #2061 - Remove Uploadify from add_photo_form/add_photo_form_completed events. 
- Added code around event calls in uploader to add Uploadify-specific JS to update the inputs.
- Removed Uploadify JS from tag_event.  Now it's uploader-agnostic.
- Refactored tag_event autocomplete code (no functional changes).
 2013-03-13 16:18:12 +01:00
shadlaws
8d0e1b4c4d #2059 - Add album name sanitizing similar to photo/movie filename sanitizing. 
- added legal_file::sanitize_dirname(), analogous to sanitize_filename.
- revised item model to use new function when adding or updating an album.
- added some legal_file unit tests.
- revised some item model unit tests.
 2013-03-13 10:07:58 +01:00
Automatic Build Number Updater
8b457bf39b Automated update of .build_number to 397 for branch master 
Last update: 94ac552152 (1 commits ago)
[ci skip]
 2013-03-12 17:01:33 -07:00
Bharat Mediratta
e2ee3499ca Merge pull request #209 from shadlaws/fix_2057 
#2057 - Revise item name and slug validation - backslashes, refactor, error messages.
 2013-03-12 17:00:55 -07:00
Automatic Build Number Updater
94ac552152 Automated update of .build_number to 396 for branch master 
Last update: cb8a63bb48 (2 commits ago)
[ci skip]
 2013-03-12 16:56:38 -07:00
Bharat Mediratta
7cfbe3dc1f Merge pull request #210 from shadlaws/fix_2055_2056 
#2055, 2056 - jQuery updates for .attr("value", [value]) and .keyup(handler).
 2013-03-12 16:56:33 -07:00
Bharat Mediratta
81ab98e46d Merge pull request #211 from shadlaws/fix_2054 
#2054 - Revise albums_form_add.js: update for new jQuery, refactor.
 2013-03-12 16:55:56 -07:00
shadlaws
a1b5cf2e8d #2051 - Revise how Gallery_View returns combined JS and CSS. 
Changed Gallery_View's JS and CSS combining to:
- have get_combined() combine all groups if called without arguments.
- ensure the "core" group is combined first.
- always put links where get_combined() is called, even if combining is disabled (otherwise the order isn't preserved).
- add key as cache buster when combining is disabled.
- make "LOOKING FOR YOUR CSS/JAVASCRIPT..." comments in get_combined(), not in the theme itself.
Also, revised xss_data.txt golden file (line number changes only).
 2013-03-12 15:00:59 +01:00
shadlaws
ed20798b99 #2057 - Revise item name and slug validation - backslashes, refactor, error messages. 
- disallowed backslashes in item validation.
- refactored the validation logic in the item model a bit.
- added no_backslash error messages in edit album/photo/movie forms.
- fixed error messages in add album forum (some missing, some text different from edit)
- added unit tests
- updated to v58 to correct any existing backslashes in item names
 2013-03-12 12:14:34 +01:00
shadlaws
86a21cc881 #2055, 2056 - jQuery updates for .attr("value", [value]) and .keyup(handler). 
- changed .attr("value", [value]) to .val([value]) for new jQuery.
- changed .keyup(handler) to .on("input keyup", handler) to fire on mouse-only cut'n'paste.
 2013-03-12 10:33:33 +01:00
shadlaws
b3984f975a #2054 - Revise albums_form_add.js: update for new jQuery, refactor. 
- changed "change" event to "input" to catch cut'n'paste
- kept "keyup" event for old IE compatibility
- removed code duplication by using $(this) and combining events using .on()
- replaced attr("value",...) with val()
- added quotes around input names
 2013-03-12 10:10:47 +01:00
Automatic Build Number Updater
cb8a63bb48 Automated update of .build_number to 395 for branch master 
Last update: b10d175d9c (1 commits ago)
[ci skip]
 2013-03-11 16:46:19 -07:00
Bharat Mediratta
f49ce6542a Merge pull request #201 from shadlaws/fix_2049 
#2049 - Fix issues with ports other than http/80 or https/443.
 2013-03-11 16:45:50 -07:00
Automatic Build Number Updater
b10d175d9c Automated update of .build_number to 394 for branch master 
Last update: 7fbe5f0ab1 (1 commits ago)
[ci skip]
 2013-03-11 16:39:03 -07:00
Automatic Build Number Updater
063ebed5c1 Merge branch 'master' of github.com:gallery/gallery3 2013-03-11 16:39:03 -07:00
Bharat Mediratta
53c1ae7dca Merge pull request #204 from jozefs/issue1838 
#1838 - thumb_proportion should have a minimum size.
 2013-03-11 16:38:53 -07:00
Automatic Build Number Updater
7fbe5f0ab1 Automated update of .build_number to 393 for branch master 
Last update: c36a4e6bbd (1 commits ago)
[ci skip]
 2013-03-11 16:35:22 -07:00
Bharat Mediratta
cc80fa035a Merge pull request #207 from shadlaws/fix_siblings_callback 
Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback.
 2013-03-11 16:35:20 -07:00
Automatic Build Number Updater
c36a4e6bbd Automated update of .build_number to 392 for branch master 
Last update: ff5f386320 (1 commits ago)
[ci skip]
 2013-03-11 16:33:30 -07:00
Bharat Mediratta
243e3b66ca Merge pull request #206 from shadlaws/fix_2050 
#2050 - Update Admin_View to handle events like Theme_View.
 2013-03-11 16:32:55 -07:00
shadlaws
b6dc597c66 Fix Theme_View::siblings bug - limit and offset reversed in sibling_callback. 
I wonder if this could be causing some random issues I see on the forums...
 2013-03-11 23:10:27 +01:00
shadlaws
63e5dd76d9 #2049 - Fix issues with ports other than http/80 or https/443. 
- get SERVER_PORT and add to SERVER_NAME if it's not http/80 or https/443
 2013-03-11 18:44:45 +01:00
Automatic Build Number Updater
ff5f386320 Automated update of .build_number to 391 for branch master 
Last update: 24e720b48e (1 commits ago)
[ci skip]
 2013-03-11 09:46:31 -07:00
Bharat Mediratta
313f2abc0c Merge pull request #205 from shadlaws/fix_2053 
#2053 - Change all .bind() to .on() for jQuery future-proofing.
 2013-03-11 09:46:00 -07:00
Automatic Build Number Updater
24e720b48e Automated update of .build_number to 390 for branch master 
Last update: 5c137b655b (1 commits ago)
[ci skip]
 2013-03-11 09:45:51 -07:00
Bharat Mediratta
1ed4ef1fb1 Merge pull request #203 from shadlaws/fix_2052 
#2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor.
 2013-03-11 09:45:39 -07:00
Automatic Build Number Updater
5c137b655b Automated update of .build_number to 389 for branch master 
Last update: 2478bb06fd (1 commits ago)
[ci skip]
 2013-03-11 09:30:48 -07:00
Bharat Mediratta
12508a71e0 Merge pull request #200 from shadlaws/fix_2048 
#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
 2013-03-11 09:30:26 -07:00
Automatic Build Number Updater
2478bb06fd Automated update of .build_number to 388 for branch master 
Last update: 4d631a4cad (1 commits ago)
[ci skip]
 2013-03-11 09:30:03 -07:00
Bharat Mediratta
1a9f87d3ee Merge pull request #199 from shadlaws/unit_test_fix_20130310 
Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable.
 2013-03-11 09:29:51 -07:00
shadlaws
2e94edab53 #2053 - Change all .bind() to .on() for jQuery future-proofing. 
- on/off are preferred to bind/unbind, live/die, and delegate/undelegate in jQuery 1.7+
- they're likely on the road toward deprecation, so let's replace them now.
 2013-03-11 17:16:20 +01:00
Jozef Selesi
3c47deb9ef Themes can choose child thumbnail when asking for proportion. 
This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
 2013-03-11 15:59:00 +01:00
Jozef Selesi
bae14a76e5 Themes can set minimum thumbnail size when calculating proportions. 
This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
 2013-03-11 15:54:20 +01:00
shadlaws
67504a00eb #2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor. 
- fixed for new jQuery.
- removed unnecessary CSS.
- fixed bug where small images would get oversized when the window was resized.
- refactored a few other things.
 2013-03-11 15:49:27 +01:00
shadlaws
c137740e26 #2050 - Update Admin_View to handle events like Theme_View. 
- changed Admin_View event handling to reflect that of Theme_View
(gallery_theme gets called first, admin theme gets called last,
debug mode isn't called for body_attributes and gets g-clear-fix)
 2013-03-11 11:40:15 +01:00
shadlaws
b43349f4de #2048 - Remove unneeded jquery.autocomplete.css/js inclusions. 
- removed autocomplete.css/js calls in server_add, tag, and g2_import.
- revised xss_data.txt golden file (line number changes only).
 2013-03-10 22:08:16 +01:00
shadlaws
b036b8acc0 Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable. 2013-03-10 11:27:10 +01:00
Automatic Build Number Updater
4d631a4cad Automated update of .build_number to 387 for branch master 
Last update: e2cc29a61a (1 commits ago)
[ci skip]
 2013-03-09 15:33:57 -07:00
Bharat Mediratta
0899528ff5 Merge pull request #196 from shadlaws/fix_2046 
#2046 - Change Gallery over to using MediaElementJS as its movie player
 2013-03-09 14:33:47 -08:00
Automatic Build Number Updater
e2cc29a61a Automated update of .build_number to 386 for branch master 
Last update: 2b8fdd3b90 (1 commits ago)
[ci skip]
 2013-03-09 15:22:01 -07:00
Bharat Mediratta
2c2f61467a Merge pull request #195 from jozefs/master 
Add Vagrant-related files to .gitignore
 2013-03-09 14:21:58 -08:00
Automatic Build Number Updater
2b8fdd3b90 Automated update of .build_number to 385 for branch master 
Last update: 43f2c4ecaa (1 commits ago)
[ci skip]
 2013-03-09 15:00:55 -07:00
Bharat Mediratta
a01ec9ff5f Merge pull request #197 from shadlaws/followon_2003 
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
 2013-03-09 14:00:39 -08:00
Automatic Build Number Updater
43f2c4ecaa Automated update of .build_number to 384 for branch master 
Last update: f5475535a2 (1 commits ago)
[ci skip]
 2013-03-09 14:57:18 -07:00
Bharat Mediratta
451ec32555 Merge pull request #198 from shadlaws/followon_1935 
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/"
 2013-03-09 13:57:03 -08:00