200 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maxime Rainville	c2c4342c01	MNT Remove obsolete branch-alias	2021-05-05 11:17:33 +12:00
Steve Boyd	050ef82451	Merge branch '3.0' into 3	2021-02-02 14:11:10 +13:00
Steve Boyd	3a8702b1fa	Merge pull request #76 from creative-commoners/pulls/3.0/update-form-field ... [Backport] Makes use of EditableFormField updateFormField	2021-02-02 14:09:40 +13:00
3Dgoo	857389c7ff	Makes use of EditableFormField updateFormField ... This fixes issue #61	2021-02-02 13:55:21 +13:00
Steve Boyd	1459ed89ff	Update build status badge	2021-01-21 16:41:59 +13:00
Steve Boyd	e717411a9d	Merge pull request #75 from 3Dgoo/patch-1 ... ENH Make use of EditableFormField updateFormField	2021-01-14 16:16:06 +13:00
3Dgoo	d5ae93c88e	Makes use of EditableFormField updateFormField ... This fixes issue #61	2020-11-25 15:52:44 +10:30
Steve Boyd	0db3e7aee0	Merge branch '3.0' into 3	2020-11-11 17:45:16 +13:00
Serge Latyntsev	856cc80ffa	Merge pull request #74 from creative-commoners/pulls/3.0/shared-config ... MNT Use shared travis config, use sminnee/phpunit	2020-11-10 16:46:52 +13:00
Steve Boyd	a20b215e5c	MNT Use shared travis config, use sminnee/phpunit	2020-11-10 14:03:59 +13:00
Steve Boyd	a36bb28b0c	Merge pull request #73 from creative-commoners/pulls/3.0/travis ... Update travis 3.0	2020-07-06 09:04:06 +12:00
Steve Boyd	6ecccd2625	Update travis	2020-06-23 16:11:03 +12:00
Garion Herman	669b189ba7	Merge branch '3.0' into 3	2019-11-20 22:15:43 +13:00
Robbie Averill	dce36b8fe7	Merge pull request #71 from creative-commoners/pulls/3.0/xenial ... Update to Xenial, expand build matrix	2019-11-20 00:18:27 -08:00
Garion Herman	5978c62022	Update to Xenial, expand build matrix	2019-11-20 18:35:30 +13:00
Robbie Averill	f3fa9fe9fc	Merge branch '3.0'	2019-05-10 10:14:27 +12:00
Robbie Averill	e024613ede	Update translations	2019-05-10 10:13:46 +12:00
Robbie Averill	b88a706ae7	Merge branch '3.0'	2018-11-07 16:35:56 +02:00
Will Rossiter	0c445a1dbf	Add legacy mapping	2018-11-07 16:35:45 +02:00
Guy Marriott	6d39bc23ec	Merge pull request #68 from creative-commoners/pulls/3.0/remove-json-methods ... FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4	2018-10-29 11:28:25 +13:00
Robbie Averill	fc934d93fd	FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4	2018-10-28 21:40:35 +00:00
Will Rossiter	506d82fc9d	Add legacy mapping	2018-09-19 21:01:36 +12:00
Robbie Averill	27a40c6210	Merge pull request #67 from creative-commoners/pulls/master/add-supported-module-badge ... Add supported module badge to readme	2018-06-18 10:15:13 +12:00
Dylan Wagstaff	fe2aed7e58	Add supported module badge to readme	2018-06-15 17:48:43 +12:00
Robbie Averill	4c65d66931	Update branch alias for 3.x-dev	2018-06-11 12:12:27 +12:00
Robbie Averill	b826f232c4	Merge branch '3.0'	2018-06-11 12:12:07 +12:00
Robbie Averill	21d8212807	Remove obsolete branch alias	2018-06-11 12:11:43 +12:00
Dylan Wagstaff	192a1c4c2b	Merge pull request #66 from JorisDebonnet/patch-1 ... Removed still unsupported Invisible reCaptcha from README	2018-04-06 12:17:35 +12:00
JorisDebonnet	0fd7971cd9	Removed still unsupported Invisible reCaptcha from README ... UndefinedOffset's plugin actually supports reCAPTCHA v2 (a.k.a. NoCaptcha), same as chillu's, so I merged them into one line.	2018-04-05 08:09:30 +02:00
Ingo Schommer	f69ee07ec0	Mentioned new invisible Recaptcha option	2018-01-12 15:31:22 +13:00
Robbie Averill	059191d91e	Merge pull request #63 from creative-commoners/pulls/3.0/upgrade-upgrade-upgrade ... FIX Check and make updates for SS4 compatibility	2017-12-20 15:22:53 +13:00
Raissa North	38ee7a76da	ENHANCEMENT Check and make updates for SS4 compatability	2017-12-20 10:07:31 +13:00
Raissa North	46fde9a573	Merge branch '2'	2017-12-19 15:43:25 +13:00
Raissa North	79e2958fad	Merge branch '2.0' into 2	2017-12-19 15:41:03 +13:00
Raissa North	68ba83dd6d	Remove Transifex configuration. Please commit directly to lang files.	2017-12-19 15:39:26 +13:00
Raissa North	4513998f1e	Remove PHP 5.3 from Travis builds	2017-12-19 15:38:57 +13:00
Dylan Wagstaff	1dda806f39	Merge pull request #60 from creative-commoners/pulls/3.0/ican ... FIX Ensure getIcon returns exposed resource URL for icon	2017-11-03 14:38:09 +13:00
Robbie Averill	47eef922c7	FIX Ensure getIcon returns exposed resource URL for icon	2017-11-03 11:12:20 +13:00
Daniel Hensby	654f45292c	Merge pull request #59 from creative-commoners/pulls/3.0/update-ci-and-vendorise ... Vendorise, update Travis config, fix polymorphic relationship	2017-11-02 11:04:14 +00:00
Robbie Averill	e38c6c3a87	FIX Update for polymorphic relationship for UserDefinedForm and child Fields	2017-11-02 14:53:20 +13:00
Robbie Averill	88b1b10f61	FIX Vendorise module, update CI to include userforms	2017-11-02 14:42:30 +13:00
Damian Mooyman	0a7b3f768d	Merge pull request #58 from creative-commoners/pulls/vendorise-ci ... FIX convert CI bootstrap references to new their new locations in vendor	2017-10-05 13:25:46 +13:00
Dylan Wagstaff	d09dbdd9f1	FIX convert CI bootstrap references to new their new locations in vendor	2017-10-05 10:07:59 +13:00
Franco Springveldt	b4e9b6e5cb	Merge pull request #57 from creative-commoners/pulls/3.0/update-docs ... DOCS Add namespaces to class references in readme, fix typos	2017-09-05 09:46:30 +12:00
Robbie Averill	779b155ee0	DOCS Add namespaces to class references in readme, fix typos	2017-09-05 09:40:17 +12:00
Franco Springveldt	42c733061d	Merge pull request #51 from Firesphere/master ... SilverStripe 4 and Namespacing	2017-09-05 09:29:33 +12:00
Robbie Averill	05fcdb6f41	FIX Typo in userforms form field class name	2017-08-28 17:41:04 +12:00
Robbie Averill	680411e2ac	FIX Missing syntax opening in readme, and tweaks for pre-emptive userforms compatibility	2017-08-28 13:44:53 +12:00
Robbie Averill	a1ea0df540	Add upgrader mapping file	2017-08-28 13:20:19 +12:00
Robbie Averill	cef1e24f86	FIX Add versioned to dev requirements	2017-08-28 13:19:39 +12:00