15989 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Lock	11bc05de96	Altering error message to show the exception	2016-12-28 11:39:12 +00:00
Damian Mooyman	7ca876a4c7	Merge pull request #6369 from dhensby/pulls/3.4/travis-simplification ... Move travis env vars out of .travis.yml and into travis CI dashboard	2016-12-07 12:17:01 +13:00
Daniel Hensby	6af1e5bf0d	Move travis env vars out of .travis.yml and into travis CI dashboard	2016-12-06 22:29:13 +00:00
Loz Calver	1919b05980	Merge pull request #6365 from tractorcow/pulls/3.4/fix-localisation-strings ... BUG Fix localisation issues	2016-12-06 09:38:19 +00:00
Damian Mooyman	2181e3b86b	BUG Fix localisation issues	2016-12-06 11:20:10 +13:00
Daniel Hensby	afb7652459	Merge branch '3.3' into 3.4	2016-11-29 17:17:08 +00:00
Daniel Hensby	2e538ca9ab	Merge tag '3.4.2' into 3.4 ... Release 3.4.2	2016-11-29 17:17:00 +00:00
Daniel Hensby	c875d7a3ea	Merge branch '3.2' into 3.3	2016-11-29 17:14:43 +00:00
Daniel Hensby	cbbfc50675	Merge tag '3.3.4' into 3.3 ... Release 3.3.4	2016-11-29 17:14:37 +00:00
Daniel Hensby	8865f680e6	Merge tag '3.2.6' into 3.2 ... Release 3.2.6	2016-11-29 17:10:13 +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	9ec1d35f2b	BUG Fix behat tests unable to capture HTML editor fields	2016-11-29 14:49:39 +13: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
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	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
Daniel Hensby	03b4e6ea32	FIX Tests shouldnt set date or time format to null	2016-11-23 12:36:53 +00:00
Dan Hensby	64595118fe	Added 3.4.2 changelog	2016-11-22 13:55:31 +00:00
Dan Hensby	5cd794bc03	Update translations	2016-11-22 13:55:25 +00:00
Dan Hensby	be86c342b6	Added 3.3.4 changelog	2016-11-22 13:12:14 +00:00
Dan Hensby	c809b044f6	Update translations	2016-11-22 13:12:11 +00:00
Dan Hensby	182522b018	Added 3.2.6 changelog	2016-11-22 11:59:04 +00:00
Dan Hensby	5019f2a8cf	Update translations	2016-11-22 11:59:02 +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
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