1
0
Commit Graph

1939 Commits

Author SHA1 Message Date
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
Daniel Muller
bcf00ccd33 Use TMPPATH instead of VARPATH 2012-11-18 11:57:36 +08:00
Daniel Muller
59780cf27a Write ini files to tmp folder to avoid write permissions errors 2012-11-18 02:54:25 +08:00
Bharat Mediratta
ae3e9fbf71 Merge pull request #127 from chalbertgit/master
Fixed an introduced bug and verified the new implementation works properly
2012-11-13 09:05:41 -08:00
chalbertgit
96bb867fb9 [#1563] Corrected an introduced bug when a tag is created and reworked so that the extract function recreates tags for when iptc data is rescanned. 2012-11-12 16:48:16 -05:00
Bharat Mediratta
1fe17c41af Merge pull request #126 from mikemayer67/master
Add Event Watcher module
2012-11-09 16:46:49 -08:00
Michael A Mayer
bf2dd87153 Rollback emboss module to gallery3-contrib/master 2012-11-08 06:17:06 -05:00
Michael A Mayer
7b5e2cae7c Adding Event Watcher module 2012-11-08 04:19:14 -05:00
Bharat Mediratta
dc37f4be48 Merge pull request #124 from chalbertgit/master
Incorporated tag module's add keyword into iptc::extract
2012-11-01 09:56:32 -07:00
chalbertgit
aa11952e28 Fixing allcaps typo. 2012-10-19 16:09:00 -04:00
chalbertgit
82bb01ba71 In IPTC, extracting an item now tries to add keywords as tags. 2012-10-19 15:32:56 -04:00
Mike Mayer
b0c2a60c8c Merge pull request #2 from gallery/master
Retrofit gallery/gallery3-contrib into mikemayer67/gallery3-contrib (master)
2012-10-18 22:37:42 -07:00
Bharat Mediratta
f4ad8c3c8b Merge pull request #123 from CChiappa/master
Fix for carousel module's admin page
2012-09-27 19:50:40 -07:00
Chris Chiappa
afd6a99580 Update per Bharat's request 2012-09-27 22:21:00 -04:00
Chris Chiappa
d32f9cb53e Fix bad variable assignment & some typos 2012-09-26 16:01:14 -04:00
floridave
0e16587bc4 Update 3.0/modules/author/helpers/author_block.php
Rwatcher updated to work with recent versions.
2012-09-16 19:01:15 -07:00
Bharat Mediratta
c2501e5180 Merge pull request #121 from floridave/patch-4
Update 3.0/modules/author/helpers/author_block.php
2012-09-10 17:31:56 -07:00
floridave
b519a8fb18 Update 3.0/modules/author/helpers/author_block.php
Update so module will work with dynamic modules.
2012-09-10 18:04:55 -06:00
Bharat Mediratta
b58acc0729 Merge pull request #120 from psychoph/master
Update to social_share module to fix issues
2012-09-01 21:58:58 -07:00
Jason Hardin
c70576ed61 Fixing the x2po issues in google. 2012-09-01 20:56:55 -07:00
Jason Hardin
a9e66a9878 Merge remote-tracking branch 'upstream/master' 2012-09-01 20:39:55 -07:00
Jason Hardin
f87cc87ebd Fixed pinerest to work and facebook like. THere were mistakes in facebook that it was not using action. In general settings i was not storing the page setting. 2012-09-01 20:21:31 -07:00
Jason Hardin
1cd9f66665 Removed error with test.com, added pinterest support and the support for only module and block page display. 2012-09-01 19:18:56 -07:00
Bharat Mediratta
f8558c531c Merge pull request #119 from fredrike/master
Upgrades the theme pear4gallery3 to 3.5.4
2012-08-17 09:43:00 -07:00
Fredrik Erlandsson
4dabd7c08c Merge commit '91df191c28fdf0aeaff1125eab96f4bfb748969e' 2012-08-17 10:28:42 +02:00
Fredrik Erlandsson
91df191c28 Squashed '3.0/themes/pear4gallery3/' changes from af5f903..51c6af4
51c6af4 layout fixes

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 51c6af48bf333028d770f70b5441a57092565ecc
2012-08-17 10:28:42 +02:00
Fredrik Erlandsson
9cce8f8058 Merge commit '96304ae2aaf153d169b9ca4dbaf8f30b135dc6ed' 2012-08-17 10:17:03 +02:00
Fredrik Erlandsson
96304ae2aa Squashed '3.0/themes/pear4gallery3/' changes from 0d77c91..af5f903
af5f903 better support for g-action-status Version 3.5.4

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: af5f90342ee2a55d014d4580ef412a256f7e25e5
2012-08-17 10:17:03 +02:00
Fredrik Erlandsson
2fd277119f Merge commit '6f6a980336c3f1fb8120da0ae33f08c08fcdde52' 2012-08-17 10:03:01 +02:00
Fredrik Erlandsson
6f6a980336 Squashed '3.0/themes/pear4gallery3/' changes from f6e42a9..0d77c91
0d77c91 Version up to 3.5.3
24b2bdd better support for g-site-status
f3d705e added description of skimm_lim=0 to theme_options

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 0d77c91bab4e8cc231cab576763d0c1c5427d084
2012-08-17 10:03:01 +02:00
Bharat Mediratta
23b01aeff0 Merge pull request #118 from fredrike/master
Upgrades the theme pear4gallery3 to 3.5.2
2012-08-16 14:42:20 -07:00
Fredrik Erlandsson
b297aba1e3 Merge commit '25ae7f02cd893127901bd26fc1297d109b781746' 2012-08-16 21:51:02 +02:00
Fredrik Erlandsson
25ae7f02cd Squashed '3.0/themes/pear4gallery3/' changes from f9f9805..f6e42a9
f6e42a9 Support for custom size of photo resizes. Version up to 3.5.2
639cc53 fixes #27, support for image count re-enabled
fe33691 Merge pull request #32 from oneoftwo/patch-3
9790a15 Update views/thumbs.html.php
77408dc Merge pull request #30 from oneoftwo/patch-1
62f7886 Update views/thumbs.html.php
25145c0 b3.4 + threaded thumbLoad
32ddbcc Merge branch 'b3.4'
5db2a89 new attempt for custom logo
1b18764 full url to custom logo stored in var
cd067e4 stupid pear logo..
d64bdbf Attempt to fix custom logo issues, version up
9e8ea7f minor fixes for the FB-comment module support
9af348f version 3.4.3.1
0e6db7c fix for problematic Tag-Cloud module
a7b0a70 Fixes issues with facebook plugins when the user is commenting on a photo and FB links to the album image version 3.4.3
900b94c minor errors
7954cf4 version up
d307b65 attempt to fix #17, image prefetch
015ceca various fixed thanks to e-nando/chris@2243c91c40
4971e20 closes #21, no longer have a discontinuous slideshowImages array
ac86dec fixes for facebook-comments, now we are using the full url
efb4fde closes #20, support for the search module in a good way
7a12558 minor fixes to eleminate some debug errors

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: f6e42a99776267d39c074f8c6b4c3ed606e280f7
2012-08-16 21:51:01 +02:00
Bharat Mediratta
aca2c7ec53 Merge pull request #117 from floridave/master
updated theme to work better with G3.0.4

(manually merged in 91efff1a45)
2012-08-04 12:07:25 -07:00
floridave
91efff1a45 Update 3.0/themes/browny_wind/views/page.html.php
update view to be compatible with G3.0.4
Conflicts:

	3.0/themes/browny_wind/views/page.html.php
2012-08-04 12:06:30 -07:00
Michael A Mayer
9ca04c6819 Added rotation awareness.
Current overlay is removed and image is marked as needing to be reembossed.
2012-07-27 23:53:30 -04:00
floridave
35dda08e8e Update 3.0/themes/browny_wind/views/page.html.php
update view to be compatible with G3.0.4
2012-07-26 13:05:13 -06:00
Michael A Mayer
e589fd5df1 Test3 2012-07-18 22:50:53 -04:00
Michael A Mayer
c7e78ec027 Test2 2012-07-18 22:48:33 -04:00
Michael A Mayer
7767f9ee03 Test 2012-07-18 22:36:46 -04:00
Bharat Mediratta
83cde81cc4 Merge pull request #116 from rWatcher/master
Module Updates
2012-07-03 13:53:01 -07:00
rWatcher
1140dd7a34 Merge remote-tracking branch 'gallery3-contrib/master' 2012-07-03 16:13:08 -04:00
rWatcher
892d28b2ad Added breadcrumbs to pages display. 2012-07-03 16:07:53 -04:00
rWatcher
d76d8569af Added option to disable rich text editor. 2012-07-03 16:07:34 -04:00