16007 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	0a835c6fe7	Merge branch '3.4' into 3	2016-11-03 13:27:31 +00:00
Daniel Hensby	5f99c4aa5f	Merge branch '3.3' into 3.4	2016-11-03 13:27:11 +00:00
Daniel Hensby	fad53ae33e	Merge branch '3.2' into 3.3	2016-11-03 13:26:30 +00:00
Daniel Hensby	6eebf07a8e	Merge branch '3.1' into 3.2	2016-11-03 13:20:11 +00:00
Daniel Hensby	c914dde7d1	Update travis build to use target branch as core release	2016-11-03 13:17:41 +00:00
Damian Mooyman	182c9fb70f	Merge pull request #6282 from sminnee/fix-32 ... FIX: Ensure that builds use the 3.2 dependencies.	2016-11-03 17:40:30 +13:00
Sam Minnee	edfe514540	FIX: Ensure that builds use the 3.4 dependencies. ... This fix does it in a way that doesn’t need manual maintenance per-branch	2016-11-03 16:38:38 +13:00
Damian Mooyman	a633b01c7c	Merge pull request #6283 from sminnee/fix-34-builds ... FIX: Ensure that builds use the 3.4 dependencies.	2016-11-03 16:28:44 +13:00
Sam Minnee	135a64761f	FIX: Ensure that builds use the 3.4 dependencies. ... This fix does it in a way that doesn’t need manual maintenance per-branch	2016-11-03 14:56:51 +13:00
Damian Mooyman	3bad5fcd9b	Merge pull request #6269 from dhensby/pulls/3/inherited-default-records ... FIX default_records are no longer inherited to child classes	2016-11-02 13:29:39 +13:00
Daniel Hensby	c61d61d003	FIX default_records are no longer inherited to child classes	2016-11-01 20:58:03 +00:00
Jono Menz	fdfd0c4fc3	DOCS Remove duped content (#6214) ... D.R.Y.	2016-11-01 17:56:32 +13:00
Damian Mooyman	2a9138aa14	Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix ... DOCS Docblock fixes for ValidationResult	2016-11-01 10:38:33 +13:00
Daniel Hensby	0b850e0819	DOCS Docblock fixes for ValidationResult	2016-10-31 13:33:59 +00:00
Loz Calver	b6bbed8de0	Merge pull request #6249 from dhensby/pulls/3.4/fix-error-message ... FIX filterAny error message now refers to correct method name	2016-10-31 09:02:49 +00:00
Daniel Hensby	747bd4cac0	FIX filterAny error message now refers to correct method name	2016-10-30 12:04:07 +00:00
Daniel Hensby	3859a1d7e7	Merge branch '3.4' into 3	2016-10-27 16:16:04 +01:00
Daniel Hensby	2a3768266e	Merge branch '3.3' into 3.4	2016-10-27 16:15:43 +01:00
Daniel Hensby	a97ebf93de	Merge branch '3.2' into 3.3	2016-10-27 16:15:10 +01:00
Daniel Hensby	5f4f07a256	Merge branch '3.1' into 3.2	2016-10-27 16:14:01 +01:00
Loz Calver	68866ad31f	Merge pull request #6238 from nfauchelle/patch-2 ... Remove double quotes so example is not parsed.	2016-10-27 09:05:36 +01:00
Nick	d1c29d6595	Remove double quotes so example is not parsed. ... [Notice] Undefined variable: map Since it's using double quotes it tries to process $map, $key and $value	2016-10-27 09:06:11 +13:00
Matthew Hailwood	7778357b03	Switch Mandrill recommendation to sparkpost. (#6196) ... Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost. The package I've linked to is by the same author as the original Mandrill package.	2016-10-25 13:26:56 +13:00
Nicola Fontana	4d327f81fd	DOCS Specify that the selectors change the scope (#6213) ... Follow up of issue #4015.	2016-10-21 09:15:27 -07:00
Damian Mooyman	0f8f9f2732	Merge pull request #6199 from jonom/fix-ambiguous-field ... FIX Ambiguous column SQL error	2016-10-19 17:57:32 +13:00
Jonathon Menz	b0445f72e4	FIX Ambiguous column SQL error ... Specify the table for the field we’re fetching, in case a joined table has a field with the same name	2016-10-18 21:35:37 -07:00
Daniel Hensby	9a6121c867	Merge branch '3.4' into 3	2016-10-16 22:56:37 +01:00
Daniel Hensby	66e6b016c0	Merge pull request #6181 from jonom/docs-additions ... Docs additions	2016-10-16 14:17:04 +01:00
Jonathon Menz	d2c0b98bc5	DOCS Clarify nested cache block restrictions ... Fixes #6078	2016-10-13 14:52:41 -07:00
Jonathon Menz	646d34ec48	DOCS Non-extendable classes ... Closes #6129	2016-10-13 09:39:46 -07:00
Jonathon Menz	bfdac2b7b6	DOCS Template debugging	2016-10-13 09:39:10 -07:00
Jonathon Menz	e9a75a54d9	DOCS Partial caching of relationships ... Fixes #6177	2016-10-13 09:38:49 -07:00
Jonathon Menz	a893e2aa0f	DOCS How to increase partial cache expiry ... Closes #3649	2016-10-13 09:37:52 -07:00
Damian Mooyman	7aa257594f	Merge pull request #3935 from dhensby/pulls/bigint-support ... Added MySQL support for Bigint.	2016-10-12 10:20:45 +13:00
Daniel Hensby	4c7ba731be	Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4	2016-10-11 20:16:33 +01:00
Damian Mooyman	7368deca8f	BUG Fix issue with SS_List as datasource for dropdown field ... BUG Fix validation issue with CheckboxSetField Fixes #6166	2016-10-11 14:58:48 +13:00
Daniel Hensby	5580100ade	Merge pull request #6157 from madmatt/patch-2 ... Make __call() clearer that a method may be non-public	2016-10-07 12:40:48 +01:00
Matt Peel	5a2591ec7d	Make __call() clearer that a method may be non-public ... Resolves #6151	2016-10-06 14:01:38 +13:00
Daniel Hensby	420cbadaac	Merge pull request #6149 from jonom/sort-fix-2 ... FIX Revert natural sort	2016-10-04 23:43:10 +01:00
Damian Mooyman	17c6580d3a	Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls ... FIX Absolute alternate_base_url no longer breaks session cookies	2016-10-05 11:26:27 +13:00
Jonathon Menz	797be6ac82	FIX Revert natural sort ... More backwards compatible and more consistent with ORM sorting (fixes #6124)	2016-10-04 13:56:12 -07:00
Daniel Hensby	6dde5ce571	FIX Absolute alternate_base_url no longer breaks session cookies	2016-10-04 14:21:32 +01:00
Daniel Hensby	111ab5f0af	Merge pull request #6137 from lekoala/patch-4 ... Have a clear error message	2016-10-04 14:13:00 +01:00
Thomas Portelange	3d8db488d4	Have a clear error message ... Because it's really annoying not knowing which field causes the error	2016-10-04 12:24:29 +02:00
Loz Calver	f1894b9712	Merge pull request #6132 from jonom/docs-template-global-provider ... DOCS Introduce TemplateGlobalProvider	2016-10-04 09:03:52 +01:00
Jonathon Menz	24f8f2715c	DOCS Introduce TemplateGlobalProvider	2016-10-03 09:36:47 -07:00
Daniel Hensby	5e9d16646d	Merge branch '3.4' into 3	2016-10-03 10:24:32 +01:00
Daniel Hensby	f2d3026e93	Merge pull request #3628 from JeremyRoundill/3.1	2016-09-30 17:16:47 +01:00
Stephan van Diepen	95b66d19b2	Added MySQL support for Bigint. ... Conflicts: model/MySQLDatabase.php	2016-09-30 16:38:25 +01:00
Anton Smith	ae4108bf00	BUG Content-Disposition header breaks in Firefox (#4087)	2016-09-29 13:25:14 +13:00