12997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Simon Welsh	3602ce2db8	Adds to nextString() method to ConfigStaticManifest ... This is used to get the classname out of the tokens, rather than assuming that the class name is a single T_STRING.	2014-05-06 15:35:37 +10:00
Hamish Friedlander	50e1ed2f72	Merge pull request #3101 from tractorcow/pulls/3.1-fileexists-checking ... BUG Better checking of existing files	2014-05-06 15:32:06 +12:00
Hamish Friedlander	149b4e4356	Merge pull request #3019 from tractorcow/pulls/3.1-dataquery-tables ... BUG Fix data query not always joining necessary tables	2014-05-06 15:26:26 +12:00
Damian Mooyman	9bfeffd06a	Path resolution cleanup ... Backport of #3085 to 3.0	2014-05-06 15:20:57 +12:00
Hamish Friedlander	54cbb53267	Merge pull request #2918 from tractorcow/pulls/3.1-requestfilter-versioned-fixes ... BUG Fix Versioned stage not persisting in Session	2014-05-06 15:16:45 +12:00
Damian Mooyman	ae573f829f	BUG Fix Versioned stage not persisting in Session. Fixes #962 ... BUG Disabled disruptive test case in DirectorTest API RequestProcessor and VersionedRequestFilter now both correctly implement RequestFilter Better PHPDoc on RequestFilter and implementations	2014-05-06 14:11:44 +12:00
Damian Mooyman	df28ccb59f	BUG Better checking of existing files ... [ref: CWPBUG-158]	2014-05-06 14:06:16 +12:00
Damian Mooyman	a3c8a594ca	BUG Fix data query not always joining necessary tables ... Fixes #2846	2014-05-06 12:22:46 +12:00
Hamish Friedlander	bbaf23331d	Merge pull request #3085 from tractorcow/pulls/3.1-path-checking ... Path resolution cleanup	2014-05-06 11:38:47 +12:00
Hamish Friedlander	bbd7bba11f	Merge pull request #3058 from tractorcow/pulls/injector-stack-tests ... API Injector supports nesting	2014-05-06 11:35:32 +12:00
Damian Mooyman	aef4b80fda	Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: .travis.yml forms/ConfirmedPasswordField.php	2014-05-06 10:06:58 +12:00
Will Morgan	06aa0c9993	MINOR Use composer @stable for PHPUnit ... Using stable will allow some packages to be downloaded as zips instead of clones all the time.	2014-05-05 15:30:05 +01:00
Simon Welsh	ddae5825b3	Merge pull request #3102 from ss23/patch-3 ... MINOR LeftAndMain::getRecord check $ClassName before use	2014-05-05 17:47:57 +10:00
Stephen Shkardoon	677f0edcfc	MINOR LeftAndMain::getRecord check $ClassName before use ... While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.	2014-05-05 19:26:05 +12:00
Damian Mooyman	d9bc352271	Path resolution cleanup ... [ref: CWPBUG-158]	2014-05-05 14:52:41 +12:00
Hamish Friedlander	ad27cd5ec9	FIX Folder Title not being exactly the same as Name field ... Backport to 3.0 of PR #3086	2014-05-05 14:39:45 +12:00
Ingo Schommer	f2b2ee8a68	Merge pull request #3021 from tractorcow/pulls/3.1-htmltext-whitelist ... BUG HTMLText whitelist considers text nodes	2014-05-05 13:23:52 +12:00
Ingo Schommer	fc8da3fb1d	Merge pull request #3087 from tractorcow/pulls/3.0-phpunit ... BUG Allow PHPUnit installation with composer / Fix travis	2014-05-05 13:20:17 +12:00
Damian Mooyman	1baefab391	Merge pull request #3096 from simonwelsh/nonexclusive-test ... Don't add the class manifest with tests as an exclusive manifest	2014-05-05 08:43:47 +12:00
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