Will Rossiter
fd344c3b3e
Merge pull request #3043 from martinduparc/patch-3
...
Fixed small typo
2014-04-16 11:24:21 -07:00
Martin D.
4535448bce
Fixed small typo
...
ration changed to ratio
2014-04-16 13:26:47 -04:00
Will Morgan
c6797f52ea
Test nested controller actions and Controller->getViewer
...
Adds tests and supporting classes for testing that the correct action is passed to Controller->getViewer inside Controller->handleRequest.
2014-04-16 13:34:09 +01:00
Damian Mooyman
6bc9cfe46d
Merge pull request #3040 from mateusz/plugins30
...
BUG Load just one of each plugin.
2014-04-16 15:38:52 +12:00
Mateusz Uzdowski
9d74bc461d
BUG Load just one of each plugin.
2014-04-16 15:08:31 +12:00
Damian Mooyman
0ccd9f5bb9
Merge pull request #3039 from mateusz/plugins
...
BUG Load just one of each plugin.
2014-04-16 15:05:15 +12:00
Mateusz Uzdowski
bde16f0eb6
BUG Load just one of each plugin.
2014-04-16 14:40:48 +12:00
Sean Harvey
1005593dba
Merge pull request #3038 from igor-silverstripe/patch-1
...
minor debug text
2014-04-16 12:08:06 +12:00
igor-silverstripe
f720b9026b
minor debug text
...
Seconds, not milliseconds.
microtime(true) returns "a float, which represents the current time in seconds since the Unix epoch accurate to the nearest microsecond" as per php docs.
2014-04-16 11:49:07 +12:00
Damian Mooyman
3620d01998
Merge pull request #3004 from stecman/delete-resampled-after-image-upload
...
Delete formatted images after image upload
2014-04-16 08:10:37 +12:00
Damian Mooyman
3d112173f0
Merge pull request #3036 from ss23/patch-2
...
MINOR Clarify DataQuery::where functionality
2014-04-15 13:27:32 +12:00
Stephen Shkardoon
b2836ae041
MINOR Clarify DataQuery::where functionality
...
As per the doc type, this method will append a new filter, not *set* one.
2014-04-15 13:17:35 +12:00
Damian Mooyman
bd39dc2d84
Merge pull request #3027 from stevie-mayhew/patch-3
...
FIX Delete Character \x01
2014-04-11 14:54:24 +12:00
Stevie Mayhew
a261f223e4
BUG Delete Character \x01
2014-04-11 14:51:52 +12:00
Mateusz U
36d925543b
Merge pull request #3020 from tractorcow/pulls/3.1-autocomplete-username
...
API Security.remember_username to disable login form autocompletion
2014-04-11 09:17:27 +12:00
Damian Mooyman
997077ae83
API Security.remember_username to disable login form autocompletion
2014-04-11 09:05:25 +12:00
Damian Mooyman
8e16768797
Merge pull request #3024 from silverstripe-iterators/pulls/changepw-return
...
Returning response from doChangePassword()
2014-04-10 17:46:43 +12:00
Ingo Schommer
be12656bd9
Returning response from doChangePassword()
2014-04-10 17:21:56 +12:00
Damian Mooyman
a5ab477e9f
Merge pull request #3023 from camfindlay/patch-5
...
Fixed reference to the templates documentation
2014-04-10 09:57:24 +12:00
camfindlay
86aef8a42b
Fixed reference to the templates documentation
2014-04-09 18:27:43 +12:00
Damian Mooyman
25796654ea
Merge pull request #3013 from silverstripe-iterators/pulls/login-form-js
...
Prevent IE errors on hidden login forms
2014-04-09 17:45:33 +12:00
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
