stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2024-10-29 21:07:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,753 Commits 4 Branches 0 Tags 32 MiB
6cca47732f
Commit Graph

7753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shadlaws
e8752f60b8 Remove extension from cache busters of non-combined JS/CSS links (follows 2078). 2013-07-09 11:19:20 +02:00
Automatic Build Number Updater
b8899a3f79 Automated update of .build_number to 427 for branch master 
Last update: 1882094460 (1 commits ago)
[ci skip]
 2013-07-08 00:46:19 -07:00
Shad Laws
88eeccb126 Merge pull request #448 from shadlaws/fix_2077_master 
Move "item_moved" event later in the item update process.  Fixes #2077.
 2013-07-08 00:46:00 -07:00
shadlaws
d0aef95a65 Move "item_moved" event later in the item update process. Fixes #2077. 
Before, this was before the children's caches were cleared, so if the
"item_moved" set an album cover, it would fail with an invalid path.  For the
same reason, we move it after the data file update, too.  Lastly, get we get
rid of duplicated code in item::move() since the "item_moved" event already
does this.
 2013-07-08 09:39:54 +02:00
Automatic Build Number Updater
1882094460 Automated update of .build_number to 426 for branch master 
Last update: 69baeb145d (1 commits ago)
[ci skip]
 2013-07-06 03:15:27 -07:00
Shad Laws
7f8e2db6a8 Merge pull request #442 from DanielMuller/master 
Add file extension to combined css/js links for better CDN caching
 2013-07-06 03:15:11 -07:00
Daniel Muller
2d20af76f9 #2078 Missing file type extension on combined css/js 2013-07-06 13:08:51 +08:00
Automatic Build Number Updater
69baeb145d Automated update of .build_number to 425 for branch master 
Last update: 3b5817a1e0 (1 commits ago)
[ci skip]
 2013-06-26 14:59:44 -07:00
Shad Laws
6573fac049 Merge pull request #434 from shadlaws/fix_controller_auth_test_master 
Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{".  Update golden file.
 2013-06-26 14:59:04 -07:00
shadlaws
fe40dadd5c Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{". Update golden file. 
--HG--
extra : source : 816294dd5f6fe23160baf9f516e49c66ea8fcb6c
 2013-06-26 23:49:48 +02:00
Automatic Build Number Updater
3b5817a1e0 Automated update of .build_number to 424 for branch master 
Last update: a038f11a9f (1 commits ago)
[ci skip]
 2013-06-17 05:05:10 -07:00
Shad Laws
dc782203f4 Merge pull request #416 from shadlaws/master_themeroller_20130617 
Update themeroller for v1.10.3 (in sync with vendor)
 2013-06-17 05:05:02 -07:00
shadlaws
23bcc22c36 Update themeroller for v1.10.3 (in sync with vendor) 2013-06-17 13:51:34 +02:00
Automatic Build Number Updater
a038f11a9f Automated update of .build_number to 423 for branch master 
Last update: a3d06cc5bc (1 commits ago)
[ci skip]
 2013-06-16 00:46:47 -07:00
Shad Laws
7f2b299064 Merge pull request #412 from shadlaws/master 
Update jQuery libraries (in sync with vendor)
 2013-06-16 00:46:42 -07:00
shadlaws
f187a8ce47 Update jQuery libraries (in sync with vendor) 2013-06-16 09:38:00 +02:00
Automatic Build Number Updater
a3d06cc5bc Automated update of .build_number to 422 for branch master 
Last update: 47803a2d46 (5 commits ago)
[ci skip]
 2013-06-12 16:10:17 -07:00
jamaa
2d2503680e change "size" to "dimensions" and display unit "px" 2013-06-12 19:10:02 -04:00
jamaa
8b14cc5a78 internationalize image size display 
as per comment
https://github.com/gallery/gallery3/pull/394/files#r4643737
 2013-06-12 19:10:02 -04:00
jamaa
ad63451275 fix upgrade function 
allow for sequential upgrades
 2013-06-12 19:10:01 -04:00
jamaa
5d8ac644a5 fix whitespace 2013-06-12 19:10:01 -04:00
jamaa
632285ee0c add the image size (in pixels) to the info module 
adds a new variable "show_size", so had to increment the version number
to 3
 2013-06-12 19:10:01 -04:00
Automatic Build Number Updater
47803a2d46 Automated update of .build_number to 421 for branch master 
Last update: 53d3fa8125 (1 commits ago)
[ci skip]
 2013-06-11 22:34:19 -07:00
Shad Laws
b024c07036 Merge pull request #396 from shadlaws/fix_2074_master 
#2074 - Mirror some additional file_proxy checks in data_rest.
 2013-06-11 22:33:50 -07:00
shadlaws
3c100d06ff #2074 - Mirror some additional file_proxy checks in data_rest. 2013-06-12 07:25:26 +02:00
Automatic Build Number Updater
53d3fa8125 Automated update of .build_number to 420 for branch master 
Last update: d81ed1145d (5 commits ago)
[ci skip]
 2013-06-08 15:12:47 -07:00
Bharat Mediratta
7ebdc1bb2f Merge branch 'master' of github.com:gallery/gallery3 2013-06-08 16:53:00 -04:00
Bharat Mediratta
ac804d8700 Drop PHP 5.5 - it's segfaulting on Travis and it's not released yet anyway. 2013-06-08 16:46:32 -04:00
Automatic Build Number Updater
683ab45d54 Automated update of .build_number to 419 for branch master 
Last update: d81ed1145d (3 commits ago)
[ci skip]
 2013-06-08 13:34:58 -07:00
Bharat Mediratta
0aebd9e9f6 Merge branch 'master' of github.com:gallery/gallery3 2013-06-08 16:34:44 -04:00
Bharat Mediratta
c70646237e Rename uploadify SWF wrappers to end in .swf.php for consistency. 2013-06-08 16:34:16 -04:00
Automatic Build Number Updater
d17ae418d4 Automated update of .build_number to 418 for branch master 
Last update: d81ed1145d (1 commits ago)
[ci skip]
 2013-06-06 15:46:33 -07:00
Bharat Mediratta
b1dad99741 Replace flashmediaelement.swf with a PHP wrapper that strips url 
fragments and query parameters.
 2013-06-06 18:45:46 -04:00
Automatic Build Number Updater
d81ed1145d Automated update of .build_number to 417 for branch master 
Last update: 49c4d6b56c (1 commits ago)
[ci skip]
 2013-06-05 21:05:45 -07:00
Bharat Mediratta
e019046e40 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.
 2013-06-06 00:05:31 -04:00
Automatic Build Number Updater
49c4d6b56c Automated update of .build_number to 416 for branch master 
Last update: b347d7919d (1 commits ago)
[ci skip]
 2013-06-05 15:03:21 -07:00
Bharat Mediratta
c31ab36116 Follow-on to ce937201d0, update the swf file 
to 2.12.0 in sync with vendor.
 2013-06-05 18:02:32 -04:00
Automatic Build Number Updater
b347d7919d Automated update of .build_number to 415 for branch master 
Last update: b7177cfb2d (1 commits ago)
[ci skip]
 2013-06-05 12:20:51 -07:00
Bharat Mediratta
ce937201d0 Updated MediaElement.js to 2.12.0 (2601db5ebeeaa96b3fa1f1015c494433cbcd9a85) 2013-06-04 19:19:12 -04:00
Automatic Build Number Updater
b7177cfb2d Automated update of .build_number to 414 for branch master 
Last update: 666f3a30e2 (1 commits ago)
[ci skip]
 2013-05-15 11:11:47 -07:00
Shad Laws
1ba8f0aa0f Merge pull request #371 from shadlaws/followon2069_master 
Follow-on to #2069 - Decrease stack size of MPTT rebuild task.
 2013-05-15 02:29:52 -07:00
shadlaws
6f922ca427 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
 2013-05-15 11:16:46 +02:00
Automatic Build Number Updater
666f3a30e2 Automated update of .build_number to 413 for branch master 
Last update: 4d8fbd1b9d (1 commits ago)
[ci skip]
 2013-05-14 04:48:37 -07:00
Shad Laws
2713389c01 Merge pull request #367 from shadlaws/fix_2069_master 
#2069 - Change "Fix your Gallery" task go faster and be more comprehensive.
 2013-05-14 04:48:27 -07:00
shadlaws
2ebe38b148 #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
 2013-05-14 13:35:09 +02:00
Automatic Build Number Updater
4d8fbd1b9d Automated update of .build_number to 412 for branch master 
Last update: 07af91e05d (1 commits ago)
[ci skip]
 2013-05-09 17:10:21 -07:00
Bharat Mediratta
b6ad4157d1 Get rid of the security preamble - we intend for these files to be directly accessible. 2013-05-09 20:09:15 -04:00
Automatic Build Number Updater
07af91e05d Automated update of .build_number to 411 for branch master 
Last update: 9f8435c7f5 (7 commits ago)
[ci skip]
 2013-05-09 17:04:54 -07:00
Bharat Mediratta
f35578982c Merge branch 'master' of github.com:gallery/gallery3 2013-05-09 20:04:21 -04:00
Bharat Mediratta
e4a3abdd20 Change upload code to use new uploadify urls. 2013-05-09 20:04:01 -04:00