Commit Graph

13383 Commits

Author SHA1 Message Date
Damian Mooyman
91034d1341 BUG HTMLText whitelist considers text nodes
Minor improvement to #2853.
If a list of whitelisted elements are specified, text nodes no longer evade the whitelist
2014-04-29 11:52:16 +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
a46f5f133a Merge pull request #3068 from kinglozzer/patch-1
DOCS: Minor fixes to RestfulService documentation
2014-04-29 09:04:29 +12:00
Damian Mooyman
d06d5c113b API Injector supports nesting
BUG Resolve issue with DirectorTest breaking RequestProcessor
Injector::nest and Injector::unnest are introduced to better support sandboxing of testings.
Injector and Config ::nest and ::unnest support chaining
Test cases for both Injector::nest and Config::nest
2014-04-29 08:59:33 +12:00
Damian Mooyman
8673b11cd9 BUG Fix ImageTest
Image test would erroneously reset the Image::$backend to null if the test was skipped, breaking subsequent test cases
2014-04-29 08:57:23 +12:00
Ingo Schommer
781eee1620 Merge pull request #3076 from martinduparc/patch-4
Fixed config setting link
2014-04-29 08:15:56 +12:00
Martin D.
6b3a21653b Fixed config setting link 2014-04-28 10:31:54 -04:00
Ingo Schommer
280ab2dcd3 Merge pull request #3026 from tractorcow/pulls/3.1-gridfield-paging
API Make default gridfield paging configurable
2014-04-28 23:06:23 +12:00
Loz Calver
61f6f2e814 DOCS: Minor fixes to RestfulService documentation 2014-04-28 09:14:27 +01:00
Damian Mooyman
892b440115 API Make default gridfield paging configurable
Documentation improved
2014-04-28 15:13:01 +12:00
Damian Mooyman
7188eab905 Merge pull request #3067 from sanjaymundhra/patch-7
update 3-forms.md
2014-04-28 10:31:36 +12:00
Mateusz U
07f4f63729 Merge pull request #3069 from tractorcow/pulls/3.1-ie8-download-ssl-crash
BUG Fix edge case IE8 / dev / ssl / download file crash
2014-04-28 10:13:29 +12:00
Damian Mooyman
5e9ae578c3 BUG Fix edge case IE8 / dev / ssl / download file crash
Prevents issue at http://support.microsoft.com/kb/323308 appearing on dev
2014-04-28 09:17:35 +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
Simon Welsh
e2f3001438 Merge pull request #3073 from dhensby/patch-5
FIX Docs for DataList::filter()
2014-04-25 21:37:22 +12:00
Daniel Hensby
ff5f60718a FIX Docs for DataList::filter()
The docs incorrectly stated that DataList::filter() needed escaped input, but this isn't true as the ExactMatch filter (and others) escape the values for you.

Anyone following that advice would have double escaped arguments
2014-04-25 10:13:04 +01:00
Stephan Bauer
81210bb6fe Enhanced DBTest to respect SS_DATABASE_PREFIX if set 2014-04-24 23:32:23 +02:00
Daniel Hensby
0e58e97eea Oembed warning if GD function is missing
Silencing errors from a function is terrible so I've stopped that.

I've also added detection for if `imagecreatefromstring` is a declared function and a useful error is thrown if not
2014-04-24 09:10:24 +01:00
Damian Mooyman
346990c877 Merge pull request #3062 from jimt/patch-1
remove leading tab
2014-04-24 17:27:26 +12:00
sanjay
044b68f973 update 3-forms.md
adds the missing "/" in the url
2014-04-23 17:19:41 +05:30
Jim Tittsler
8acb28ffc5 remove leading tab
fix rendering
2014-04-23 14:50:34 +09:00
Damian Mooyman
d16db2d4f4 API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
This is legacy behaviour which does not often reflect the expected behaviour of the current editor. indent and outdent can (in some situations) prefer to use margin instead of padding. sapphiremce_cleanup faultily assumes that such indented text should be block quoted, and replaces this with a block quote element. This is not necessary, since the blockquote element can be placed explicitly by the user when necessary.

To replicate the incorrect indentation behaviour, configure tinymce to use the 'lists' plugin (via admin/_config.php) and attempt to indent some text. Indented text will be unexpectedly replaced with blockquotes.
2014-04-23 12:01:50 +12: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
Damian Mooyman
1766cccace Merge pull request #3044 from mateusz/hash
FIX: ConfirmedPasswordField used to expose existing hash
2014-04-17 13:11:58 +12:00
Hamish Friedlander
f2c4a629a7 FIX: ConfirmedPasswordField used to expose existing hash 2014-04-17 11:57:57 +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
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