Will Morgan
438fe02116
FIX change action variable source to getViewer
...
Previously we were using the request to get the action parameter. However for custom URL structures and nested controllers, this won't work and causes template selection to break.
2014-04-08 12:55:57 +01:00
Damian Mooyman
ee487e28f1
Merge remote-tracking branch 'origin/3.1.4' into 3.1
2014-04-08 17:10:28 +12:00
Damian Mooyman
d8836fd488
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-08 17:10:07 +12:00
Damian Mooyman
81b14b4352
Update upgrading docs 3.1.4
2014-04-08 16:19:19 +12:00
Damian Mooyman
05e4d1af71
BUG Fix Date and SS_DateTime::FormatFromSettings
...
This issue is caused by the odd default behaviour of Zend_Date, which attempts to parse yyyy-mm-dd format date and times as though they were yyyy-dd-mm.
2014-04-08 16:17:43 +12:00
Damian Mooyman
b22aaaab1f
3.1.4 upgrading docs
2014-04-08 15:58:17 +12:00
Damian Mooyman
e33e869731
Merge remote-tracking branch 'composer/3.0.10' into 3.1.4
2014-04-08 15:57:57 +12:00
Stephen Holdaway
3be01968ec
Delete formatted images after image upload
...
This change fixes an issue where old/existing formatted images are used
when a filename is reused (by overwrite or by coincidence), regardless
of if the file contents have changed. To users this mainly manifests
as a file overwrite appearing not to work; the thumbnails in the CMS
show the original image until regeneration is forced.
Calling Image::deleteFormattedImages() after image upload ensures that
no stagnant formatted images will be used.
2014-04-08 14:33:44 +12:00
Damian Mooyman
1bda7d2dd1
Merge pull request #3014 from camfindlay/patch-4
...
FIX - missing link url for composer
2014-04-08 13:40:10 +12:00
camfindlay
a0607845e4
FIX - missing link url for composer
...
My bad, have amended this.
2014-04-08 13:21:05 +12:00
Damian Mooyman
14f6e7a784
Merge pull request #3010 from camfindlay/patch-3
...
Info about getting set up using composer and MAMP
2014-04-08 13:16:38 +12:00
Damian Mooyman
c87373d095
Add 3.0.10 upgrade docs
2014-04-08 12:30:24 +12:00
Ingo Schommer
f737922cdf
Prevent IE errors on hidden login forms
...
In order to focus a field, it needs to be visible,
which can't be guaranteed on a core level by the login form JavaScript.
Optionally check for visibility via jQuery if it exists,
and allow explicit disabling of this behaviour via a unique identifier.
2014-04-08 11:28:54 +12:00
Hamish Friedlander
5b0a969794
Merge pull request #3011 from tractorcow/pulls/absurl
...
Docs / Tests for Director::absoluteURL
2014-04-08 10:04:36 +12:00
Damian Mooyman
15c6b67c29
Docs / Tests for Director::absoluteURL
2014-04-08 09:16:48 +12:00
camfindlay
026e4be429
Info about getting set up using composer and MAMP
...
Added by request of Gábor Novoszádi from community feedback and thanks to the gist from @kkirsche. I have supplied a link to the gist as it is well written, with permission we may look to rework for direct inclusion at some point :)
2014-04-07 21:59:43 +12:00
Simon Welsh
4681b3275d
Merge pull request #3009 from scottmcmurray/patch-1
...
Update dataobject.md
2014-04-07 07:19:13 +12:00
Scott McMurray
36763abcec
Update dataobject.md
...
This page is grid-field not gridfield.
2014-04-06 18:35:42 +01:00
Chris Turner
32760555f7
Update datefield.md
...
Removed ; at the end of ->setConfig('dmyfields', true) in the three chain example. Is confusing for new users/developers who are not aware of how to chain methods.
Closes #3006
2014-04-04 09:49:01 +13:00
Damian Mooyman
4c69d42bd2
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:23:39 +13:00
Damian Mooyman
a2cadf9d5a
Merge pull request #2974 from sunnysideup/patch-30
...
typo fix
2014-04-02 16:17:15 +13:00
Mateusz U
068e23d72f
Merge pull request #3002 from tractorcow/pulls/3.1-datetime-fix
...
BUG Fix issue with SS_DateTime::FormatFromSettings failing to parse dates
2014-04-02 16:15:33 +13:00
Damian Mooyman
84d8022b32
BUG Fix Date and SS_DateTime::FormatFromSettings
...
This issue is caused by the odd default behaviour of Zend_Date, which attempts to parse yyyy-mm-dd format date and times as though they were yyyy-dd-mm.
2014-04-02 15:38:35 +13:00
Sean Harvey
f58fd7ea55
Merge pull request #3000 from mateusz/preview-behaviours
...
Add Behat behaviours to click links and submit forms in preview.
2014-04-02 13:36:13 +13:00
Damian Mooyman
61b03b79b5
Merge pull request #3003 from OliBridgman/patch-1
...
Update index.md
2014-04-02 10:54:47 +13:00
OliBridgman
49232151af
Update index.md
...
topics/templates doesn't exist.
2014-04-02 10:19:47 +13:00
Damian Mooyman
93ca3f7f23
Documentation link fixes
2014-04-01 17:46:08 +13:00
Damian Mooyman
2f91826b28
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-01 17:43:38 +13:00
Damian Mooyman
9230d41186
Include announcement links for security fixes
2014-04-01 17:40:39 +13:00
Ingo Schommer
f540e5bd18
Merge pull request #2999 from tractorcow/pulls/3.1-release-docs
...
3.1.4-rc1 release docs
2014-04-01 11:30:43 +13:00
Damian Mooyman
f2725523ae
3.1.4-rc1 release docs
2014-04-01 11:28:44 +13:00
Mateusz Uzdowski
38609c0762
Add Behat behaviours to click links and submit forms in preview.
2014-04-01 11:04:42 +13:00
Damian Mooyman
6ae7d43a5d
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-01 07:56:01 +13:00
Damian Mooyman
cf2a314a50
Added change log to upgrade docs
2014-03-31 16:31:25 +13:00
Ingo Schommer
7d0f03a454
Merge pull request #2993 from tractorcow/pulls/translation-update
...
Updated translation masters
2014-03-31 16:27:46 +13:00
Damian Mooyman
21f50f44e5
3.0.10-rc1 upgrading docs
2014-03-31 16:07:53 +13:00
Damian Mooyman
da1231a6e5
Updated translation masters
2014-03-31 14:13:15 +13:00
Simon Welsh
1d5706f15c
Correct line length and indentation
2014-03-30 21:11:56 +13:00
Simon Welsh
e07b14f5bc
Correct line length and endings
2014-03-30 20:59:28 +13:00
Simon Welsh
dde90dc346
Correct line length and endings
2014-03-30 19:51:38 +13:00
Simon Welsh
2566795b59
Merge branch '3.1'
...
Conflicts:
view/SSViewer.php
2014-03-30 19:39:18 +13:00
Simon Welsh
ac1546eb97
Correct line length and indentation
2014-03-30 19:37:54 +13:00
Simon Welsh
6db96eac8f
Correct errors from differening behaviour between 3.0 and 3.1
2014-03-30 19:29:18 +13:00
Simon Welsh
c59cf624df
Merge branch '3.0' into 3.1
2014-03-30 18:32:54 +13:00
Simon Welsh
241583858a
Correct line length
2014-03-30 18:32:40 +13:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Simon Welsh
f9c44e4ceb
Merge branch '3.0' into 3.1
...
Conflicts:
model/Versioned.php
view/SSTemplateParser.php
view/SSViewer.php
2014-03-30 18:15:12 +13:00
Damian Mooyman
cf5d524235
BUG Fix regressions from #2206 in hasValue and dbObject
...
Fixes #2982
2014-03-30 18:05:46 +13:00
Martin D
3e05ccb9b7
Fix link to the HtmlEditorField API page
...
Closes #2990
2014-03-30 18:04:17 +13:00
Nathan Glasl
398e5bc688
Cast TreeTitle to HTMLText
...
Closes #2989
2014-03-30 18:01:05 +13:00
