1
0
Commit Graph

2004 Commits

Author SHA1 Message Date
Mike Miller
bc9c591791 Merge commit 'd9b709f3075d1060f9279d366a278e9b2362367e' into panorama_flash_fix 2013-01-29 07:48:47 +02:00
Mike Miller
d9b709f307 Squashed '3.0/modules/panorama/' changes from 1018b10..66ad243
66ad243 Merge remote-tracking branch 'origin/master'
3040fc7 Set wmode

git-subtree-dir: 3.0/modules/panorama
git-subtree-split: 66ad243d66494d4ed98e3d9a5b0a21f68357f292
2013-01-29 07:46:37 +02:00
Bharat Mediratta
20acc71371 Merge branch 'master' of git://github.com/jonathanmtran/gallery3-contrib 2013-01-25 18:48:27 -05:00
Bharat Mediratta
8b6c3ddb44 Merge branch 'patch-5' of git://github.com/floridave/gallery3-contrib 2013-01-25 18:43:21 -05:00
Bharat Mediratta
fc29ab82a4 Merge branch 'master' of git://github.com/floridave/gallery3-contrib
Conflicts:
	3.0/modules/author/helpers/author_block.php
2013-01-25 18:42:12 -05:00
Bharat Mediratta
f70b564d43 Merge branch 'master' of git://github.com/jtenkate/gallery3-contrib 2013-01-25 18:33:50 -05:00
Bharat Mediratta
30e750ad6e Merge branch 'remote' of git://github.com/the0ne/gallery3-contrib 2013-01-25 18:29:41 -05:00
Bharat Mediratta
b2de0365dc Merge pull request #139 from mikeage/date_tag
Proposed new module: Date tag
2013-01-25 08:30:55 -08:00
Mike Miller
ced903cad1 Count the number of photo items only 2013-01-25 15:06:47 +02:00
Mike Miller
82175b896c Merge commit '5af4ce81e3bb64a1a7908d06e290997229e68ab7' as '3.0/modules/date_tag' 2013-01-25 11:26:30 +02:00
Mike Miller
5af4ce81e3 Squashed '3.0/modules/date_tag/' content from commit 0a94df7
git-subtree-dir: 3.0/modules/date_tag
git-subtree-split: 0a94df70e809bc3d16cff0133ce06401f3fa83c4
2013-01-25 11:26:30 +02:00
Bharat Mediratta
f99add4e70 switch from .autocomplete to .gallery_autocomplete which supports
eating the <meta> tag that comes back from /tags/autocomplete requests.
2013-01-23 17:31:06 -05:00
Bharat Mediratta
7898bf2b04 Pick up some straggling copyrights. 2013-01-21 01:30:22 -05:00
Bharat Mediratta
ef14a265dd Update copyright to 2013. 2013-01-21 01:24:24 -05:00
Bharat Mediratta
d5ea23f230 Merge pull request #137 from sappjw/master
Use escapeshellarg() in jhead module to quote new file name
2013-01-20 11:16:39 -08:00
Joe Sapp
c1edc681b7 Use escapeshellarg() in jhead module to quote new file name 2013-01-20 12:37:06 -04:00
Bharat Mediratta
f8fbedac07 Merge pull request #136 from mikeage/master
New panorama module
2013-01-16 14:59:45 -08:00
Mike Miller
d6c3b54f14 Squashed '3.0/modules/panorama/' content from commit 1018b10
git-subtree-dir: 3.0/modules/panorama
git-subtree-split: 1018b100813e4f9e43428b4872ce2e8478aca493
2013-01-15 12:54:37 +02:00
Mike Miller
152527c1c2 Merge commit 'd6c3b54f1463df5cce2207153eebd41e28d1e154' as '3.0/modules/panorama' 2013-01-15 12:54:37 +02:00
Mike Miller
a4830182d1 Remove old panorama subtree attempt 2013-01-15 12:52:18 +02:00
Mike Miller
a5adb6a5c1 Add panorama as a subtree 2013-01-15 08:35:52 +02:00
Bharat Mediratta
bb8886845e Merge pull request #135 from mikeage/master
Add tag->abs_url() to tag_albums
2013-01-13 20:22:55 -08:00
Mike Miller
57025d18dc Add tag->abs_url() to tag_albums 2013-01-14 05:47:31 +02:00
Bharat Mediratta
48a1269547 Merge pull request #134 from mikeage/master
Show CSS for editcreation/editcaptured for all albums
2013-01-08 12:28:39 -08:00
Mike Miller
78e63a474d Merge branch 'master' of github.com:mikeage/gallery3-contrib
Conflicts:
	3.0/modules/editcaptured/helpers/editcaptured_theme.php
	3.0/modules/editcreation/helpers/editcreation_theme.php
2013-01-08 20:46:38 +02:00
Mike Miller
c022a0af59 Always add the editcaptured and editcreation CSS files 2013-01-08 20:44:56 +02:00
vkdimitrov
e15e2a106c adding allcomments module 2013-01-08 20:44:55 +02:00
shadlaws
9ed8abecb1 forgot to add these files to the previous commit... oops. 2013-01-08 20:44:55 +02:00
shadlaws
7f08600c85 -proofsheet: updated to v7 (previously v4 on github)
-tag_cloud_html5: updated to v7 (previously v5 on github)
-short_search_fix: updated to v2 (previously v1 on github)
-register: updated to v2 (previously v1 on github)
-image_optimizer: v1
2013-01-08 20:44:54 +02:00
Bharat Mediratta
36c2d74bae Merge commit 'bd9a5e38bf21c2c57baad01f8d5f529ad5ca8783' 2013-01-08 12:02:15 -05:00
Mike Miller
8115135e17 Always add the editcaptured and editcreation CSS files 2013-01-03 17:29:36 +02:00
Thomas E. Horner
bd9a5e38bf added redirect for sized+thumbs and hotfix for buggy dat files 2012-12-29 10:34:51 +01:00
Jeroen ten kate
f161549027 Minor cleanup (whitspace) 2012-12-27 21:47:09 +01:00
Jeroen ten kate
36d84001a2 Minor cleanup (whitespace, comments) 2012-12-27 21:31:27 +01:00
Jeroen ten kate
8eec645c40 Initial commit of modified Basket module
Additions: order status, customer object, e-mails for order status
changes, additional order view, webshop configuration options
2012-12-27 20:51:16 +01:00
Bharat Mediratta
959c710775 Merge pull request #133 from vkdimitrov/master
add module (AllComments) that shows all comments in public page
2012-12-15 18:53:49 -08:00
vkdimitrov
3a13a0f287 adding allcomments module 2012-12-15 22:10:35 +02:00
Bharat Mediratta
b616184ebe Merge pull request #132 from shadlaws/master
New: image_optimizer; Updates: proofsheet, tag_cloud_html5, short_search_fix, register
2012-12-12 16:00:22 -08:00
shadlaws
7e19410003 forgot to add these files to the previous commit... oops. 2012-12-12 22:59:46 +01:00
shadlaws
ab0265b1c4 -proofsheet: updated to v7 (previously v4 on github)
-tag_cloud_html5: updated to v7 (previously v5 on github)
-short_search_fix: updated to v2 (previously v1 on github)
-register: updated to v2 (previously v1 on github)
-image_optimizer: v1
2012-12-12 22:51:42 +01:00
Bharat Mediratta
3551623837 Merge pull request #130 from rWatcher/master
EXIF_GPS Bug Fix.
2012-12-12 08:06:20 -08:00
rWatcher
73818d27ae Forum User bozek fix to cut back on the number of database queries used by EXIF_GPS ( http://gallery.menalto.com/node/109227#comment-399841 ). 2012-12-11 19:46:31 -05:00
Bharat Mediratta
fe359ce21e Merge pull request #129 from rWatcher/master
Module Bug Fixes
2012-11-27 17:08:33 -08:00
rWatcher
5a17cf285f Add extra linebreak for Grey Dragon theme display. 2012-11-27 19:20:14 -05:00
rWatcher
3b1a29b805 Bugfix. 2012-11-27 19:18:57 -05:00
rWatcher
260a5a7987 Fix link for Google API console key. 2012-11-27 19:18:18 -05:00
rWatcher
108a1151bf Grey Dragon theme support for Tag Albums. 2012-11-27 19:17:35 -05:00
rWatcher
d5ead9bace Check if the page belongs to an item before accessing $theme->item. Prevents sidebar crashes on dynamic pages. 2012-11-27 19:16:27 -05:00
Bharat Mediratta
2a706217cd Merge pull request #128 from DanielMuller/master
[modulesupdates] Use tmp folder for ini files
2012-11-18 09:31:03 -08:00
Daniel Muller
628b027792 Reflect version in change in module_installer 2012-11-18 11:58:19 +08:00