16095 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	fb39022ef3	Merge branch '3.4' into 3.5	2016-11-29 11:40:37 +00:00
Daniel Hensby	3a009a5849	Merge branch '3.3' into 3.4	2016-11-29 11:39:58 +00:00
Daniel Hensby	f1244db49b	Merge pull request #6342 from open-sausages/pulls/3.3/fix-behat-html ... BUG Fix behat tests unable to capture HTML editor fields	2016-11-29 10:29:23 +00:00
Damian Mooyman	792a9ec3ed	Add missing changelog content	2016-11-29 16:21:14 +13:00
Damian Mooyman	9ec1d35f2b	BUG Fix behat tests unable to capture HTML editor fields	2016-11-29 14:49:39 +13:00
Daniel Hensby	4bb6765392	Merge branch '3.4' into 3.5	2016-11-28 13:36:06 +00:00
Daniel Hensby	71efd960b0	Merge tag '3.5.0' into 3.5 ... Release 3.5.0	2016-11-28 13:32:48 +00:00
Daniel Hensby	17690ff6bc	Merge branch '3.3' into 3.4	2016-11-28 13:30:29 +00:00
Daniel Hensby	fc83321b6e	Merge tag '3.4.2' into 3.4 ... Release 3.4.2	2016-11-28 13:29:33 +00:00
Daniel Hensby	6552dce70e	Merge branch '3.2' into 3.3	2016-11-28 13:26:31 +00:00
Daniel Hensby	b299a7921d	Merge tag '3.3.4' into 3.3 ... Release 3.3.4	2016-11-28 13:20:07 +00:00
Daniel Hensby	214c3d2582	Merge branch '3.1' into 3.2	2016-11-28 13:16:27 +00:00
Daniel Hensby	f7fd0d3f21	Merge tag '3.2.6' into 3.2 ... Release 3.2.6	2016-11-28 13:16:21 +00:00
Daniel Hensby	612a9164af	Merge tag '3.1.21' into 3.1 ... Release 3.1.21	2016-11-28 13:13:48 +00:00
Dan Hensby	179996b5f9	Added 3.5.0 changelog	2016-11-28 12:35:19 +00:00
Dan Hensby	7593df6db3	Update translations	2016-11-28 12:35:18 +00:00
Daniel Hensby	a9c85057b0	Merge pull request #6332 from andrewandante/BUGFIX/apply-send-all-emails-from-to-SS_LogEmailWriter	2016-11-25 11:21:21 +00:00
Andrew Aitken-Fincham	13aaa6badb	Apply email defaults to SS_LogEmailWriter	2016-11-25 09:59:41 +00:00
Damian Mooyman	76ce9fb94f	Merge pull request #6335 from webbuilders-group/shortcode-location-fix ... BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone	2016-11-25 10:56:25 +13:00
UndefinedOffset	a4760b8ee4	BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone	2016-11-24 17:28:15 -04:00
Daniel Hensby	464af18346	Merge pull request #6291 from dhensby/pulls/3.4/fix-uploadfield-max-size ... FIX UploadField incorrectly setting max upload size	2016-11-24 12:40:04 +00:00
Daniel Hensby	dd9ade4294	FIX UploadField incorrectly setting max upload size	2016-11-24 11:54:44 +00:00
Daniel Hensby	602062802e	Merge branch '3.4' into 3.5	2016-11-23 23:55:31 +00:00
Daniel Hensby	406307c77b	Merge branch '3.3' into 3.4	2016-11-23 23:29:25 +00:00
Daniel Hensby	b7bb7a46da	Merge branch '3.2' into 3.3	2016-11-23 22:26:15 +00:00
Daniel Hensby	17eb351f81	Merge branch '3.1' into 3.2	2016-11-23 21:54:22 +00:00
Damian Mooyman	730512f036	Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix ... FIX Tests shouldnt set date or time format to null	2016-11-24 10:01:42 +13:00
Damian Mooyman	396a47f824	Merge pull request #6330 from silverstripe/bugfix-framework-core-manifest-manifest-cache-ds ... Replace hard-coded directory separators constant	2016-11-24 09:20:43 +13:00
Christopher Pitt	a4167e29fe	Replace hard-coded directory separators constant ... This removes warnings when building the manifest cache in Windows environments.	2016-11-24 08:00:34 +13:00
Daniel Hensby	03b4e6ea32	FIX Tests shouldnt set date or time format to null	2016-11-23 12:36:53 +00:00
Dan Hensby	47c33dc7c2	Added 3.5.0-rc3 changelog	2016-11-22 14:53:03 +00:00
Dan Hensby	ee11b12e7a	Update translations	2016-11-22 14:53:02 +00:00
Daniel Hensby	3e36f5691b	Merge branch '3.4' into 3.5.0	2016-11-22 11:31:39 +00:00
Daniel Hensby	f57244d526	Merge branch '3.3' into 3.4	2016-11-22 11:29:32 +00:00
Daniel Hensby	f17e21c4a3	Merge branch '3.2' into 3.3	2016-11-22 11:26:41 +00:00
Daniel Hensby	d2633be56d	Merge branch '3.1' into 3.2	2016-11-22 11:21:08 +00:00
Dan Hensby	3067bcbd24	Added 3.4.2 changelog	2016-11-21 13:28:00 +00:00
Dan Hensby	50f456eed8	Update translations	2016-11-21 13:27:57 +00:00
Dan Hensby	375df539eb	Added 3.3.4 changelog	2016-11-21 12:37:09 +00:00
Dan Hensby	0d2710c31b	Update translations	2016-11-21 12:37:07 +00:00
Dan Hensby	4a82041061	Added 3.2.6 changelog	2016-11-18 15:14:42 +00:00
Dan Hensby	5890f6f7e2	Update translations	2016-11-18 15:14:40 +00:00
Dan Hensby	586e5281e0	Added 3.1.21 changelog	2016-11-18 12:17:03 +00:00
Daniel Hensby	69974d940a	Merge branch '3.3' into 3.4	2016-11-18 11:33:39 +00:00
Daniel Hensby	0ae4b57754	Merge branch '3.2' into 3.3	2016-11-18 11:32:36 +00:00
Daniel Hensby	5df077f24d	Merge branch '3.1' into 3.2	2016-11-18 11:29:19 +00:00
Damian Mooyman	c2287c14ff	Merge pull request #6216 from jonom/fix-version-sql ... FIX Versioned sort by ID	2016-11-17 15:47:44 +13:00
Damian Mooyman	f43a91a4f8	API Add FormField::canSubmitValue() ... API Add HTMLText::getProcessShortcodes() / setProcessShortcodes() API Split TextareaField::Value() into ValueEntities() with shortcodes disabled	2016-11-17 09:55:03 +13:00
Jonathon Menz	bec5adf09b	FIX Versioned sort by ID ... Prevent SQL error from a Versioned DataObject with e.g. $default_sort = 'ID DESC'	2016-11-16 12:16:33 -08:00
Daniel Hensby	8e5f786b8d	Merge branch '3.4' into 3.5.0	2016-11-15 11:43:16 +00:00