stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 03:19:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,135 Commits 4 Branches 0 Tags
e8b7e155d5c3e315942ecfde8800a2c7679ec6b3
Commit Graph

7135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta
e8b7e155d5 Follow-on to b507681427 - add a default 
value for lock_timeout so that folks who get the latest code but don't
run the upgrader don't get burned by a SQL error.
 2013-01-24 23:48:07 -05:00
Automatic Build Number Updater
4926615cd0 Automated update of .build_number to 290 for branch master 
Last update: 31807a59a5 (13 commits ago)
 2013-01-24 16:16:01 -07:00
Bharat Mediratta
0353578630 Merge branch 'master' of github.com:gallery/gallery3 2013-01-24 18:14:28 -05:00
Bharat Mediratta
86a2759062 If profiling is enabled, dump out profiling data instead of proxied 
images so that we can see how efficient our proxying is.  Follow-on
for #1959.
 2013-01-24 18:14:14 -05:00
Bharat Mediratta
727a595447 Add back a comment that I accidentally removed in the last commit. 2013-01-24 18:13:26 -05:00
Automatic Build Number Updater
98d09c3740 Automated update of .build_number to 289 for branch master 
Last update: c9a30e3b7e (1 commits ago)
 2013-01-24 13:46:34 -07:00
Bharat Mediratta
6830ac4542 Merge pull request #99 from shadlaws/fix_1955 
#1955 - Make unit test photos unique.
 2013-01-24 12:46:26 -08:00
Automatic Build Number Updater
c9a30e3b7e Automated update of .build_number to 288 for branch master 
Last update: 3e451d6edc (1 commits ago)
 2013-01-24 13:40:45 -07:00
Bharat Mediratta
d8f99c258c Merge pull request #101 from shadlaws/fix_1960 
#1960 - Add unit test to look for extra spaces at end of line
 2013-01-24 12:40:32 -08:00
shadlaws
126727b4f2 #1955 - Make unit test photos unique. 
- Added test::random_unique_photo and test::random_unique_photo_unsaved to uniquify test photos.
- Uniquified the black dot of test.jpg by coloring it with the six-digit hex code already used to name the random photos (e.g. "name_a48801.jpg").
- Modified four tests in Item_Model_Test that check photo file contents to use new functions to guarantee uniqueness.
 2013-01-24 15:56:13 +01:00
shadlaws
031dd3bd6f #1960 - Add unit test to look for extra spaces at end of line 
- Added no_extra_spaces_at_end_of_line_test to File_Structure_Test.
- Updated Gallery_Filters to exclude testing code that isn't ours.
- Removed existing extra spaces.  New test now passes.
 2013-01-24 12:03:05 +01:00
Automatic Build Number Updater
3e451d6edc Automated update of .build_number to 287 for branch master 
Last update: 31807a59a5 (10 commits ago)
 2013-01-23 19:34:42 -07:00
Bharat Mediratta
da5fbd10c7 Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 21:34:14 -05:00
Bharat Mediratta
aa8fffcd8f Extract reweighting logic out of Organize_Controller into 
item::reweight_all_children as an API and write a test for it.  Work
in progress on #1914.
 2013-01-23 21:33:19 -05:00
Automatic Build Number Updater
d34a45f640 Automated update of .build_number to 286 for branch master 
Last update: 31807a59a5 (8 commits ago)
 2013-01-23 18:53:40 -07:00
Bharat Mediratta
de78d3bfca Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 20:52:17 -05:00
Bharat Mediratta
34198e71d3 Add a cache buster to all data_rest urls, add caching headers to all 
data_rest responses, and check cache validity.  Fixes #1909.
 2013-01-23 20:50:54 -05:00
Automatic Build Number Updater
52fb40ad3c Automated update of .build_number to 285 for branch master 
Last update: 31807a59a5 (6 commits ago)
 2013-01-23 17:00:34 -07:00
Bharat Mediratta
7f0a844794 Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 18:58:53 -05:00
Bharat Mediratta
cc926cb9e1 After finding a test in Item_Model_Test that didn't end in the string "_test" and 
fixing it in 9ba9f39531 I decided to write a test to make
sure that we don't have any other overlooked tests.  We don't.
 2013-01-23 18:58:37 -05:00
Bharat Mediratta
bc5dbd812a Fix comment typo. 2013-01-23 18:56:30 -05:00
Automatic Build Number Updater
efc3730ebe Automated update of .build_number to 284 for branch master 
Last update: 31807a59a5 (3 commits ago)
 2013-01-23 16:29:29 -07:00
Bharat Mediratta
32c09b9dd6 Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 18:28:49 -05:00
Bharat Mediratta
e6783b7aa7 Update golden files after 80d6a895ed 2013-01-23 18:28:28 -05:00
Automatic Build Number Updater
2dc12b709c Automated update of .build_number to 283 for branch master 
Last update: 31807a59a5 (1 commits ago)
 2013-01-23 16:26:02 -07:00
Bharat Mediratta
9ba9f39531 Add a "can_add" permission bit similar to the "can_edit" bit to the RESTful array 
representation of Item_Model.  Fixes #1903.
 2013-01-23 18:24:31 -05:00
Automatic Build Number Updater
31807a59a5 Automated update of .build_number to 282 for branch master 
Last update: d928064f0b (2 commits ago)
 2013-01-23 16:07:14 -07:00
Bharat Mediratta
1d700bf665 Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 18:06:50 -05:00
Bharat Mediratta
a1a6600457 Enable the profiler and debug output if var/PROFILE exists. This 
provides a quick/easy way for server admins to provide profile output.
Fixes #1959.
 2013-01-23 18:03:09 -05:00
Automatic Build Number Updater
df60cf2883 Automated update of .build_number to 281 for branch master 
Last update: d928064f0b (1 commits ago)
 2013-01-23 15:08:24 -07:00
Bharat Mediratta
937102e888 Merge pull request #97 from mikeage/organize_tag2 
Add batch tagging via the organize module
 2013-01-23 14:07:59 -08:00
Mike Miller
80d6a895ed #1952 Add bulk tagging to the Organize module. 
Allow a user to highlight one or more items (images, videos, or albums), and enter a tag (or tags, comma delimited) and apply it to all of the selected items. The code is based on the batchtag module.

If the tags module is not enabled, no changes to the Organize UI will be shown.
 2013-01-23 22:58:45 +02:00
Automatic Build Number Updater
d928064f0b Automated update of .build_number to 280 for branch master 
Last update: b1fd5c9c85 (1 commits ago)
 2013-01-23 12:04:10 -07:00
Bharat Mediratta
eefc9d5553 Use the thumb proportion from the first item in an album if the album has children. Fixes #1958. 2013-01-23 14:03:44 -05:00
Automatic Build Number Updater
b1fd5c9c85 Automated update of .build_number to 279 for branch master 
Last update: 9b75a4e926 (3 commits ago)
 2013-01-23 09:41:31 -07:00
Bharat Mediratta
e8302ffce5 Merge pull request #98 from shadlaws/fix_1954 
#1954 - Skip buffer calls for unit tests of file_proxy and data_rest.
 2013-01-22 17:57:58 -08:00
Bharat Mediratta
49f6ce2d94 gallery.menalto.com -> galleryproject.org 
codex.gallery2.org -> codex.galleryproject.org

Fixes #1957.
 2013-01-22 18:39:24 -05:00
shadlaws
8436e16b2f #1954 - Skip buffer calls for unit tests of file_proxy and data_rest. 
Moved the "if (TEST_MODE)" statement before the buffer calls in file_proxy and data_rest.
This has no impact on normal use, but will make the unit tests more compatible with different server/PHP configurations.
Note: We do not have to skip setting the headers, which means we can build unit tests around them if we wish.
 2013-01-21 10:45:34 +01:00
Bharat Mediratta
d45a737779 Update copyright to 2013. Fixes #1953. 2013-01-21 01:22:01 -05:00
Automatic Build Number Updater
9b75a4e926 Automated update of .build_number to 278 for branch master 
Last update: 49ebef7f00 (1 commits ago)
 2013-01-20 23:06:15 -07:00
Bharat Mediratta
61eebe13c9 Merge pull request #95 from shadlaws/fix_1950 
#1950 - Replace bogus file overwrites from item model unit test.
 2013-01-20 22:06:12 -08:00
Automatic Build Number Updater
49ebef7f00 Automated update of .build_number to 277 for branch master 
Last update: 2353c92c1a (3 commits ago)
 2013-01-20 22:55:00 -07:00
Bharat Mediratta
090814e56c Merge branch 'master' of github.com:gallery/gallery3 2013-01-21 00:53:11 -05:00
Bharat Mediratta
8dc34dade8 Add unit tests for data_rest. While I'm in there, get rid of the 
clause that returns nothing when the album has no album cover - we'll
fail before that if the album's thumbnail is missing, and if it's not
missing then we'll have something to serve even if it's out of date.
 2013-01-21 00:52:52 -05:00
Automatic Build Number Updater
ca21cfbfc0 Automated update of .build_number to 276 for branch master 
Last update: 2353c92c1a (1 commits ago)
 2013-01-20 21:55:02 -07:00
Bharat Mediratta
f1d2a8e871 Add a long overdue test for File_Proxy_Controller that tests all the various 
edge case behaviors.  It doesn't cover the various headers, but it does cover
the permission based code paths.
 2013-01-20 23:54:01 -05:00
shadlaws
14b02a5b12 #1950 - Replace bogus file overwrites from item model unit test. 
- modified rename_photo_test, rename_album_test, move_album_test, move_photo_test
- unit tests still test file system integrity and pass
 2013-01-20 10:01:41 +01:00
Automatic Build Number Updater
2353c92c1a Automated update of .build_number to 275 for branch master 
Last update: dc3f2f637e (1 commits ago)
 2013-01-20 00:51:11 -07:00
Bharat Mediratta
38797ad82a Merge pull request #94 from shadlaws/fix_1949 
#1949 - Fix album thumb mime types given by data_rest and file_proxy
 2013-01-19 23:50:47 -08:00
shadlaws
1927dd00e4 #1949 - Fix album thumb mime types given by data_rest and file_proxy 
Correct result: always "image/jpeg"
Old data_rest result: mime of cover item
Old file_proxy result: mime of album item (null)
 2013-01-20 08:34:12 +01:00