stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-11 17:53:50 -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
1f82533a0b Merge pull request #117 from mikeage/fix_1987 
#1987 g2_import module should redirect with a 301, not 302
 2013-02-01 15:13:21 -08:00
Mike Miller
6e757f9988 #1987 g2_import module should redirect with a 301, not 302 
As the g2_import process is generally assumed to be permanent, the
redirect should be a 301, and not a 302.
 2013-02-01 15:36:49 +02:00
Automatic Build Number Updater
070095cf6c Automated update of .build_number to 322 for branch master 
Last update: f9aeb3b5cd (1 commits ago)
 2013-01-31 22:52:50 -07:00
Bharat Mediratta
314e2e67b1 Fix ctrl-click behavior. Fixes #1986. 2013-02-01 00:52:14 -05:00
Automatic Build Number Updater
f9aeb3b5cd Automated update of .build_number to 321 for branch master 
Last update: 340a14d306 (1 commits ago)
 2013-01-31 21:47:49 -07:00
Bharat Mediratta
f72c5a87c8 Follow-on to 9396342250 for #1985 which 
was breaking all unit tests.  Use module::install("gallery") instead
of calling gallery_installer::install directly.
 2013-01-31 23:45:36 -05:00
Automatic Build Number Updater
340a14d306 Automated update of .build_number to 320 for branch master 
Last update: 795f256994 (3 commits ago)
 2013-01-31 17:59:41 -07:00
Bharat Mediratta
a29fb3343c Merge branch 'master' of github.com:gallery/gallery3 2013-01-31 19:59:32 -05:00
Bharat Mediratta
9396342250 Drop the requirement to have the install() function set the module 
version.  It's redundant.  Fixes #1985.
 2013-01-31 19:55:53 -05:00
Automatic Build Number Updater
51995ae48a Automated update of .build_number to 319 for branch master 
Last update: 795f256994 (1 commits ago)
 2013-01-31 16:48:26 -07:00
Bharat Mediratta
cb08f6cc13 Merge pull request #115 from shadlaws/fix_1982 
#1982 - Add placeholder for albums with no album cover.
 2013-01-31 15:48:18 -08:00
Automatic Build Number Updater
795f256994 Automated update of .build_number to 318 for branch master 
Last update: 107735ffc4 (1 commits ago)
 2013-01-31 14:29:49 -07:00
Bharat Mediratta
ea54a88ec8 Escape the host/username/password arguments to mysqldump. Fixes #1984. 2013-01-31 16:29:09 -05:00
Automatic Build Number Updater
107735ffc4 Automated update of .build_number to 317 for branch master 
Last update: a15d062b23 (1 commits ago)
 2013-01-31 12:45:36 -07:00
Bharat Mediratta
60c37726ce Merge pull request #116 from shadlaws/fix_1983 
#1983: Remove item keys changed for/by graphics::generate from significant changes list.
 2013-01-31 11:45:10 -08:00
Automatic Build Number Updater
a15d062b23 Automated update of .build_number to 316 for branch master 
Last update: e17c39386b (1 commits ago)
 2013-01-31 12:42:38 -07:00
Bharat Mediratta
92bd0dd28e Merge pull request #114 from shadlaws/fix_1945_followon 
Follow-on to 5fca371a61 for #1945.
 2013-01-31 11:42:09 -08:00
shadlaws
fd8b8de242 #1983: Remove item keys changed for/by graphics::generate from significant changes list. 
There's no need to run through all of the item save/validation logic for these
entries, which are changed frequently during the course of thumb/resize generation.
 2013-01-31 18:59:33 +01:00
shadlaws
f83ed5f871 #1982 - Add placeholder for albums with no album cover. 
- Added missing_album_cover.jpg placeholder image.
- Modified the graphics helper to use it.  Calling graphics::generate will copy it.
- Modified item::remove_album_cover and gallery_event::item_created to run graphics::generate.
- Added unit test to Graphics_Helper_Test.
 2013-01-31 17:18:39 +01:00
shadlaws
8384d7948e Follow-on to 5fca371a61 for #1945. 
Previously skipped admin_watermarks mods to use new functionality of #1945
since there was concurrent work on it with #1970.
Now that both are done, we can wrap this up.
 2013-01-31 12:40:55 +01:00
Automatic Build Number Updater
e17c39386b Automated update of .build_number to 315 for branch master 
Last update: fc82f56f4b (2 commits ago)
 2013-01-30 19:43:42 -07:00
Bharat Mediratta
8d15e5cb2e Follow-in to cff1e76e8d for #1978 
Restrict which album cover ids we swap over to the hierarchy of the
current album, otherwise we can wind up in sticky situations with
hierarchical album cover chains.

Eg, you have a hierarchy like this:

root -> A1 -> A2 --> A3 -> P1
                     A4 -> P2

P1 is the album cover for its entire hierarchy.  But then you
swap A2's album cover for A3 making this:

root -> A1 -> A2 +   A3 -> P1
                 \-> A4 -> P2

Since A1, A2 and A3 all had P1 as their album cover item id.  Now
we're swapping it over to P2 but we want to leave P1 as A3's album
cover item id.  So only look at A4's hierarchy and ignore its peers.
 2013-01-30 21:42:47 -05:00
Bharat Mediratta
71cf911649 Support additional where tuples in ORM_MPTT::parents. Fixes #1980. 2013-01-30 21:38:32 -05:00
Automatic Build Number Updater
fc82f56f4b Automated update of .build_number to 314 for branch master 
Last update: 12ea6ad642 (3 commits ago)
 2013-01-30 19:19:24 -07:00
Bharat Mediratta
30ec44b3b2 Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 21:19:08 -05:00
Bharat Mediratta
075b95f0ed Actually disable the "make album cover" option when the item is already the album cover. Fixes #1979. 2013-01-30 21:18:26 -05:00
Automatic Build Number Updater
ec232f6a47 Automated update of .build_number to 313 for branch master 
Last update: 12ea6ad642 (1 commits ago)
 2013-01-30 19:09:46 -07:00
Bharat Mediratta
cff1e76e8d When changing the album cover, find and retarget any other albums which were using the old item as their album cover. Fixes #1978. 2013-01-30 21:08:36 -05:00
Automatic Build Number Updater
12ea6ad642 Automated update of .build_number to 312 for branch master 
Last update: 0ab40de11d (1 commits ago)
 2013-01-30 18:17:12 -07:00
Bharat Mediratta
d8d01e0aa0 Merge pull request #112 from shadlaws/fix_1968 
#1968 - Improve album cover generation/removal/etc.
 2013-01-30 17:17:06 -08:00
Automatic Build Number Updater
0ab40de11d Automated update of .build_number to 311 for branch master 
Last update: 28cd0ad2c1 (5 commits ago)
 2013-01-30 17:37:03 -07:00
Bharat Mediratta
b6b269948f Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 19:36:11 -05:00
Bharat Mediratta
49dd0994df Follow-on to 1e4d75c120 for #1975. 
Create a siblings() function which pulls together the siblings_callback
function and makes it a more palatable API.
 2013-01-30 19:32:35 -05:00
Automatic Build Number Updater
8de70ee7bc Automated update of .build_number to 310 for branch master 
Last update: 28cd0ad2c1 (3 commits ago)
 2013-01-30 16:47:17 -07:00
Bharat Mediratta
ee0a0d7bf7 Merge branch 'master' of github.com:gallery/gallery3 2013-01-30 18:47:04 -05:00
Bharat Mediratta
9ef891858c Protect admins from themselves - in case an admin changed the 
watermark.name setting to something terrible by accident via Admin >
Advanced, we'll just use the basename.  Fixes #1977.
 2013-01-30 18:45:49 -05:00
Automatic Build Number Updater
8ada16d887 Automated update of .build_number to 309 for branch master 
Last update: 28cd0ad2c1 (1 commits ago)
 2013-01-30 12:20:27 -07:00
Bharat Mediratta
92c264033a Don't concatenate tainted strings in JS. Fixes #1976. 2013-01-30 14:19:44 -05:00
Automatic Build Number Updater
28cd0ad2c1 Automated update of .build_number to 308 for branch master 
Last update: a983e8748e (1 commits ago)
 2013-01-30 10:12:06 -07:00
Bharat Mediratta
1e4d75c120 Improve the display context API to return a "siblings_callback" field 
containing a callback that returns all the siblings.  Fixes #1975.
 2013-01-30 12:10:18 -05:00
Automatic Build Number Updater
a983e8748e Automated update of .build_number to 307 for branch master 
Last update: 861e8628f5 (1 commits ago)
 2013-01-30 08:54:19 -07:00
Bharat Mediratta
6e609c249a Merge pull request #110 from mikeage/g2_import 
#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
 2013-01-30 07:53:56 -08:00
Mike Miller
91acf812a1 #1973 Handle redirected G2 URLs for tags, including g2_itemId passed 2013-01-30 05:59:08 +02:00
shadlaws
cf07742595 #1968 - Improve album cover generation/removal/etc. 
- Added stanza to Item_Model::save that handles when cover id is null.
- Added logic to graphics::generate to copy/convert album cover thumbs from their item thumbs to ensure they're always jpg, and eliminate the possibility that we copy/convert a dirty thumb.
- Redirected other places in code where we want to do one of the above two things to use these two functions instead (gallery_event::item_updated_data_file, item::make_album_cover, item::remove_album_cover).
- Improved validation in Item_Model so only albums can have covers and all covers must be non-albums.
- Added unit tests to Graphics_Helper_Test.
 2013-01-30 01:07:36 +01:00
Automatic Build Number Updater
861e8628f5 Automated update of .build_number to 306 for branch master 
Last update: 899590873b (1 commits ago)
 2013-01-29 11:29:53 -07:00
Bharat Mediratta
ed7e2d5089 Merge pull request #108 from shadlaws/fix_1970 
#1970 - Make add watermarks more secure and add unit tests.
 2013-01-29 10:29:25 -08:00
Automatic Build Number Updater
899590873b Automated update of .build_number to 305 for branch master 
Last update: b7c73ee693 (1 commits ago)
 2013-01-29 11:28:41 -07:00
Bharat Mediratta
a3478732f9 Merge pull request #105 from shadlaws/fix_1967 
#1967 - Improve how graphics::generate handles missing/bad images.
 2013-01-29 10:28:38 -08:00
shadlaws
4cf31d8850 #1970 - Make add watermarks more secure and add unit tests. 
This follows #1855 and #1951...
- Ensured that invalid or illegal files are not added even if they have valid extensions.
- Added unit tests (currently there aren't any...)
 2013-01-29 18:48:39 +01:00
shadlaws
536bdaa4db #1967 - Improve how graphics::generate handles missing/bad images. 
- Made missing_photo match the image format (jpg, png, etc.).
- Swapped missing_photo.png for missing_photo.jpg since it's likely to require less conversion to match.
- Improved error messages to user when things go wrong.
- Ensured that missing image placeholders are always copied when there's an error.
- Ensured we don't mistake no file output for a correct file output (delete target before attempt).
- Restructured graphics::generate a bit to work better with above changes.
- Added unit tests for graphics::generate.
 2013-01-29 18:35:10 +01:00