Commit Graph

13280 Commits

Author SHA1 Message Date
Simon Welsh
9116e40eb8 Don't add the class manifest with tests as an exclusive manifest 2014-05-04 11:46:06 +10:00
Ingo Schommer
447c1b97c2 Merge pull request #3079 from timsnadden/3.1
Fix 'Uncaught ReferenceError: jQuery is not defined'
2014-05-03 14:29:03 +12:00
Hamish Friedlander
d5b76a87d0 Merge pull request #3088 from tractorcow/pulls/3.1-phpunit
BUG Allow PHPUnit installation with composer / Fix travis
2014-05-02 18:37:59 +12:00
Damian Mooyman
b9872c0856 Allow PHPUnit installations with composer
Instruct travis to use composer version of phpunit
2014-05-02 18:23:58 +12:00
Will Morgan
bec8927a08 BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:22:04 +12:00
Damian Mooyman
7a772b2480 Merge pull request #3086 from hafriedlander/fix/CWPBUG-155
FIX Folder Title not being exactly the same as Name field
2014-05-02 18:17:37 +12:00
Simon Welsh
48f65669c8 Change PHP 5.6 to an allowed failure 2014-05-02 15:24:51 +10:00
Hamish Friedlander
8e841cc471 FIX folder Title not being exactly the same as Name field if setName modified the value 2014-05-02 14:41:10 +12:00
Damian Mooyman
73b2c7fe35 Merge pull request #3070 from dhensby/patch-3
Oembed warning if GD function is missing
2014-05-02 08:37:38 +12:00
Sean Harvey
e79e894970 Merge pull request #3083 from mparkhill/patch-1
FIX: parent::init is not called first
2014-05-01 15:53:57 +12:00
Michael Parkhill
bd5abb62ff FIX: parent::init is not called first
In the controller's init function, parent::init() should be called before any other method calls.
2014-05-01 15:35:45 +12:00
Ingo Schommer
512c7140cc Merge pull request #3082 from PapaBearNZ/patch-1
FIX: corrected link to CMS Alternating Button Page
2014-05-01 11:43:57 +12:00
James Pluck
4fd3015ea4 FIX: corrected link to CMS Alternating Button Page 2014-05-01 10:45:12 +12:00
Tim Snadden
afad65ee71 Fix 'Uncaught ReferenceError: jQuery is not defined' if jQuery is not included in template. 2014-04-30 09:30:22 +12:00
Ingo Schommer
ff42ad268e Merge pull request #3077 from tractorcow/pulls/fix-imagetest
BUG Fix ImageTest
2014-04-29 21:34:04 +12:00
Ingo Schommer
5524bd4ebb Merge pull request #3078 from tractorcow/pulls/3.1-remove-thirdparty-demo
Removed demo folder
2014-04-29 21:33:31 +12:00
Mateusz U
2c9f99c1f0 Merge pull request #3031 from tractorcow/pulls/3.1-fix-tree-duplication
BUG Fix jstree when duplicating subtrees
2014-04-29 16:19:00 +12:00
Damian Mooyman
0b4f62dfd8 BUG Fix jstree when duplicating subtrees 2014-04-29 16:00:07 +12:00
Damian Mooyman
cff42700ff Removed demo folder 2014-04-29 12:51:47 +12:00
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
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
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
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
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
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
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