Commit Graph

13158 Commits

Author SHA1 Message Date
Will Morgan
9cbfd14d9d FIX TemplateManifest prevent cache collision 2014-05-02 17:57:28 +01:00
Ingo Schommer
612a096765 Merge pull request #3022 from tractorcow/pulls/3.2-upload-restrictions
API Remove html,htm,xhtml,xml as default allowed uploadable file types
2014-04-29 21:36:15 +12:00
Damian Mooyman
2e73dcb891 API Remove swf,html,htm,xhtml,xml as default allowed upload able file types 2014-04-29 11:09:30 +12:00
Damian Mooyman
a67f853d7f Merge pull request #3071 from sb-relaxt-at/DBTest-fix-missing-prefix
Enhanced DBTest to respect SS_DATABASE_PREFIX if set
2014-04-28 08:10:57 +12:00
Stephan Bauer
81210bb6fe Enhanced DBTest to respect SS_DATABASE_PREFIX if set 2014-04-24 23:32:23 +02:00
Damian Mooyman
1dcaf36c9b Fix merge regressions 2014-04-22 13:28:44 +12:00
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +12:00
Damian Mooyman
99c4b58681 Merge pull request #3053 from nhorstmeier/patch-1
Update remove extra ); from relation callback function
2014-04-22 07:26:23 +12:00
muskie9
04f834c317 Update remove extra ); from relation callback function 2014-04-18 14:36:03 -05:00
Simon Welsh
fc9864eed3 Wording fix to forms.md
Closes #3032
2014-04-17 17:44:54 +12:00
Simon Welsh
e7d45c9222 Merge pull request #3047 from tractorcow/pulls/http-429
HTTP 429 Allowed for use with rate limiting methods
2014-04-17 17:43:09 +12:00
Damian Mooyman
a6017a0506 API HTTP 429 Allowed for use with rate limiting methods 2014-04-17 16:35:09 +12:00
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
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
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