stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-21 11:59:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,494 Commits 4 Branches 0 Tags
e8a3fe97a43dc257a70431defbcc6fb330cdfee2
Commit Graph

3494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta
e8a3fe97a4 Fix whitespace. 2009-08-28 09:09:33 -07:00
Bharat Mediratta
7c5275a63c Fix indentation. 2009-08-28 09:08:39 -07:00
Bharat Mediratta
b72b09163b Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-28 08:48:56 -07:00
Tim Almdal
f27919aa1e Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 21:56:27 -07:00
Bharat Mediratta
826e104fa9 Get rid of the extra "Folder name" row. It's noisy. Fixes ticket #593. 2009-08-27 17:15:20 -07:00
Bharat Mediratta
a28dd09c4e Properly deal with invalid images. This fixes ticket #611 which shows 
a BMP masquerading as a .jpg causing us to be unable to rebuild
resizes and thumbnails.  Now if that happens, we discard the file, log
it and move on.
 2009-08-27 17:04:48 -07:00
Tim Almdal
377bdf2803 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 16:29:22 -07:00
Tim Almdal
5235c7a0b7 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 16:28:27 -07:00
Tim Almdal
254feecd0a Fix ticket #644 
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
 2009-08-27 16:28:22 -07:00
Tim Almdal
93138f6ae7 Don't display the slideshow icon if there are no descendants. ticket #660 2009-08-27 16:28:17 -07:00
Bharat Mediratta
8d2cd12c58 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-27 16:15:01 -07:00
Tim Almdal
e0e430bd84 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 16:12:44 -07:00
Tim Almdal
5db90d432d Fix ticket #644 
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
 2009-08-27 16:12:44 -07:00
Bharat Mediratta
74363ced87 Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD 
Conflicts:
	modules/slideshow/helpers/slideshow_event.php
 2009-08-27 16:11:47 -07:00
Bharat Mediratta
98e9a96ba4 Don't display the slideshow icon if there are no descendants. ticket #660 
Conflicts:

	modules/slideshow/helpers/slideshow_event.php
 2009-08-27 16:10:38 -07:00
Bharat Mediratta
4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use 
the system's default table specification.  Fixes ticket #597.
 2009-08-27 15:47:54 -07:00
Tim Almdal
bfc64685e4 Allow clicking on the overlay to close the fullsize and remove some debug code 2009-08-27 15:37:18 -07:00
Tim Almdal
84b018b08d Fix ticket #644 
1) remove close button
2) extend the grey overlay to the document size
3) allow any keypress to close the fullize image
4) click on the fullsize will close
 2009-08-27 15:22:27 -07:00
Tim Almdal
56937cac5b Don't display the slideshow icon if there are no descendants. ticket #660 2009-08-27 15:04:14 -07:00
Bharat Mediratta
77ac00c3b8 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-27 14:57:35 -07:00
Bharat Mediratta
980ee6b4b2 Revert "delete the simple slideshow" 
This reverts commit 940edac81c.

Revert "Add window resizing support. Just can't seem to get loading icon to show up"

This reverts commit afd85945d7.

Revert "Resolve issues with show the wrong album when slideshow is invoked from a photo page.  In addition, implement the slideshow based on tags."

This reverts commit 152caf5195.

Revert "Initial commit of a basic slideshow"

This reverts commit 5943761df2.
 2009-08-27 14:56:08 -07:00
Bharat Mediratta
ea717bbe2a Add a comment about putting the mod_rewrite block into the apache 
config files, since .htaccess will get clobbered.
 2009-08-27 14:56:07 -07:00
Chad Kieffer
2c6328a47b Make the info block display 'File name', instead of 'Folder name' when showing a photo. Fixes #631 2009-08-27 14:56:07 -07:00
Bharat Mediratta
db1f6e3e35 Don't ask for csrf when we're resetting passwords. They're not gonna have one. Duh! 
Fixes #642.
 2009-08-27 14:56:07 -07:00
Bharat Mediratta
88149a5afa Convert tabs to spaces. 2009-08-27 14:56:07 -07:00
Tim Almdal
752594f87a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-27 14:47:42 -07:00
Bharat Mediratta
75c098204f Add a comment about putting the mod_rewrite block into the apache 
config files, since .htaccess will get clobbered.
 2009-08-27 14:13:47 -07:00
Bharat Mediratta
7771d0cf83 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 13:30:22 -07:00
Bharat Mediratta
e586389f65 Don't ask for csrf when we're resetting passwords. They're not gonna have one. Duh! 
Fixes #642.
 2009-08-27 13:29:45 -07:00
Chad Kieffer
b7803e99c1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 14:28:23 -06:00
Chad Kieffer
ddddfc5e8e Make the info block display 'File name', instead of 'Folder name' when showing a photo. Fixes #631 2009-08-27 14:27:49 -06:00
Bharat Mediratta
5f86332db9 Convert tabs to spaces. 2009-08-27 11:41:19 -07:00
Tim Almdal
940edac81c delete the simple slideshow 2009-08-27 11:35:14 -07:00
Tim Almdal
dc67de520d Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-25 15:00:44 -07:00
Andy Staudacher
0be38d143c Workaround to make G3 work with Turkish locale. 
Thanks to katpatuka for providing the fix.
 2009-08-25 13:32:57 -07:00
Bharat Mediratta
deafc01c21 Remove accidentally submitted .DS_Store file. 2009-08-23 15:05:18 -07:00
Chad Kieffer
2264a80368 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-23 15:00:00 -06:00
Chad Kieffer
457708311a Cut down on jittering of the context menu on open on resize view. 2009-08-23 14:58:26 -06:00
Tim Almdal
88995e5a2e Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-20 16:26:54 -07:00
Tim Almdal
afd85945d7 Add window resizing support. Just can't seem to get loading icon to show up 2009-08-20 13:51:53 -07:00
Tim Almdal
256822a1e8 Refactor the _auto_fit method in gallery.show_full_size to a common method in gallery.common.js 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-21 03:56:38 +08:00
Tim Almdal
74d79dc819 Refactor the _auto_fit method in gallery.show_full_size to a common method in gallery.common.js 2009-08-20 12:53:20 -07:00
Tim Almdal
152caf5195 Resolve issues with show the wrong album when slideshow is invoked from a photo page. In addition, implement the slideshow based on tags. 2009-08-20 08:47:42 -07:00
Tim Almdal
5943761df2 Initial commit of a basic slideshow 2009-08-20 07:30:49 -07:00
Tim Almdal
230b9a26ac Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-20 05:23:52 -07:00
Tim Almdal
2da7f93784 Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-20 12:26:47 +08:00
Tim Almdal
c85df82fde Fix the setting of the mime type header. as per 
http://gallery.menalto.com/node/90306
Thanks rWatcher
 2009-08-19 21:24:05 -07:00
Chad Kieffer
7d36f43d0b Update docblocks and todos 2009-08-19 18:51:14 -06:00
Tim Almdal
b989383fe6 Modified the conversion of the margin-top and margin-bottom css values. The 
problem arises because $(selector).css("margin-top) does not return a string
and therefore the replace function is undefined.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-20 07:11:13 +08:00
Tim Almdal
bfcbb60039 Modified the conversion of the margin-top and margin-bottom css values. The 
problem arises because $(selector).css("margin-top) does not return a string
and therefore the replace function is undefined.
 2009-08-19 16:06:36 -07:00