1249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	bc1773fc63	Merge pull request #784 from creative-commoners/pulls/5.0/fix-toolbar ... FIX Prevent form's toolbar from extending into the preview	2018-06-15 22:03:10 +12:00
Raissa North	ed80e1c95b	FIX Prevent form's toolbar from extending into the preview	2018-06-15 17:17:44 +12:00
Robbie Averill	8454a3ef06	FIX Remove invalid duplicate of core translation	2018-05-30 10:24:29 +12:00
Daniel Hensby	e4871b880c	Merge branch '4.5' into 5.0	2018-05-09 14:01:17 +01:00
Daniel Hensby	47d344903e	Merge pull request #768 from creative-commoners/pulls/4.5/remove-unnecessary-translation ... FIX Remove unnecessary translation of parameterised field value	2018-05-09 13:39:25 +01:00
Raissa North	8f363d6b60	FIX Remove unnecessary translation of parameterised field value	2018-05-09 17:43:08 +12:00
Dylan Wagstaff	3184e66299	Merge pull request #760 from Firesphere/patch/fieldloop ... [Bugfix] the each loop to propperly get the field passed in	2018-04-12 18:01:01 +12:00
Simon Erkelens	caab51122b	Fix the each loop to propperly get the field passed in	2018-04-12 17:18:57 +12:00
Robbie Averill	549498a323	Switch test assertion to be more flexible in URL pieces (versioned changes in 4.2)	2018-04-12 17:18:40 +12:00
Robbie Averill	35733f46e3	Increase memory limit for code coverage runs	2018-04-12 17:06:37 +12:00
Dylan Wagstaff	d9bef262a4	Merge pull request #752 from creative-commoners/pulls/4.5/member-list-template ... FIX Use userforms template for member list field, fixes display rule issue	2018-03-26 11:28:32 +13:00
Robbie Averill	f7ffb706ce	FIX Use userforms template for member list field, fixes display rule issue	2018-03-23 14:11:39 +13:00
Dylan Wagstaff	5b68e7bb58	Merge pull request #739 from creative-commoners/pulls/5.0/bootstrap-alert ... Use bootstrap alert instead of old .message.notice	2018-03-21 12:18:06 +13:00
Dylan Wagstaff	ffa7f9a1cc	Merge pull request #742 from creative-commoners/pulls/5.0/escaped-right-title ... FIX Do not convert right title to XML, templates escape values by default now	2018-03-21 12:17:29 +13:00
Dylan Wagstaff	3faf55652d	Merge pull request #741 from creative-commoners/pulls/5.0/step-progress ... FIX Re-enable step progress and navigation for multi page forms	2018-03-21 12:16:12 +13:00
Robbie Averill	029a69b937	FIX Do not convert right title to XML, templates escape values by default now	2018-03-21 11:57:30 +13:00
Robbie Averill	4e285c4142	FIX Re-enable step progress and navigation for multi page forms	2018-03-21 11:33:19 +13:00
Robbie Averill	df1d428df8	Use bootstrap alert instead of old .message.notice	2018-03-21 10:49:13 +13:00
Dylan Wagstaff	e041c4805f	Merge pull request #737 from creative-commoners/pulls/5.0/fix-cwp-compat ... FIX getFormParent does not automatically look up arbitrary test stubs, remove theme dependency	2018-03-20 10:33:17 +13:00
Robbie Averill	d19914044a	FIX getFormParent does not automatically look up arbitrary test stubs, remove theme dependency	2018-03-19 16:00:57 +13:00
Damian Mooyman	9403ee2cc1	Merge pull request #725 from creative-commoners/pulls/5.0/travis-matrix ... Add PHP 7.2 to Travis build matrix	2018-03-05 15:02:09 +13:00
Robbie Averill	ab68c43d07	Add PHP 7.2 to Travis build matrix	2018-03-05 14:32:07 +13:00
Dylan Wagstaff	48bf46215e	FIX stop form items double duplicating (#728) ... When calling `duplicate` on a form, a form field, or suchlike, the results would be that all related items to the thing being duplicated (such as fields for a form, or options to an editabledropdown) would be duplicated _twice_; ie. where a form had two fields, it's new duplicate would have four (each one occurring twice). We have stopped this in a backwards compatible way - that is the bug was introduced with core 4.1, and this change leaves the userforms module compatible with 4.0.	2018-03-05 14:31:33 +13:00
Robbie Averill	190e4ba14e	Merge branch '4'	2018-02-21 14:06:38 +13:00
Robbie Averill	ee0e43118f	Merge branch '4.5' into 4	2018-02-21 14:06:13 +13:00
Robbie Averill	1ee7e1543b	Merge branch '4.4' into 4.5	2018-02-21 14:05:10 +13:00
Robbie Averill	54b1db79da	Merge branch '4.3' into 4.4	2018-02-21 14:04:08 +13:00
Robbie Averill	56381f7a8d	Merge branch '4.2' into 4.3	2018-02-21 14:03:41 +13:00
Robbie Averill	809227213e	Merge branch '4.1' into 4.2	2018-02-21 14:03:14 +13:00
Robbie Averill	b58c2ef44f	Merge branch '4.0' into 4.1	2018-02-21 14:03:00 +13:00
Robbie Averill	89e8c8be50	Merge branch '3.1' into 4.0	2018-02-21 13:59:15 +13:00
Scott Hutchinson	0ce8b95546	FIX Escape dollar signs in UserForm contents before inserting them with regex (#723)	2018-02-21 13:52:51 +13:00
Dylan Wagstaff	7e54584615	Merge pull request #722 from creative-commoners/pulls/5.0/fix_getFormParent ... refactor how getCMSFields is built to handle no parent form	2018-02-21 09:46:08 +13:00
Andrew Aitken-Fincham	e2066a55b3	missing 'not', add alert-warning for unsaved form	2018-02-20 14:44:31 +00:00
Andrew Aitken-Fincham	bc5c6221f0	refactor how getCMSFields is built to handle no parent form	2018-02-20 11:45:45 +00:00
Dylan Wagstaff	20570ef108	Merge pull request #717 from creative-commoners/pulls/5.0/better_email_recipient_logic ... adds logic for presence of email recipient fields	2018-02-15 10:41:27 +13:00
Daniel Hensby	ebdfbb5502	Merge pull request #719 from creative-commoners/pulls/5.0/revert_DO_to_UF_relationship_change ... revert UDF has_one to DO has_one	2018-02-14 15:08:27 +00:00
Andrew Aitken-Fincham	201282874f	revert UDF has_one to DO has_one	2018-02-14 15:02:27 +00:00
Andrew Aitken-Fincham	0f6efea12a	add proper fallbacks to cover tests	2018-02-14 11:30:35 +00:00
Dylan Wagstaff	516452bb14	Merge pull request #716 from creative-commoners/pulls/5.0/fix_permissions_on_email_recipient ... fall back to CMSMain rather than LeftAndMain to getFormParent correctly	2018-02-14 09:55:43 +13:00
Andrew Aitken-Fincham	8c34519644	adds logic for presence of email recipient fields	2018-02-13 16:24:53 +00:00
Andrew Aitken-Fincham	579028982c	fall back to CMSMain rather than LeftAndMain to getFormParent correctly	2018-02-13 14:41:38 +00:00
Dylan Wagstaff	46460c0e7c	FIX Enhance JS for multiple userform instances (#715) ... After testing it seems that having multiple user defined forms on a page has already been added as a feature. However various load time dynamically generated javascript segments had not been adapted to suit. Now they have. Also fixed a variable that no longer exists in the external requirements from preventing a webpack build.	2018-02-12 16:56:36 +13:00
Dylan Wagstaff	311eee9d2c	Merge pull request #713 from martinduparc/patch-3 ... jquery version update	2018-02-09 10:11:41 +13:00
Martin D	eafe6609e1	jquery version update	2018-02-08 15:48:51 -05:00
Robbie Averill	fa249dd09f	Merge branch '4'	2018-02-05 12:10:50 +13:00
Robbie Averill	f348590cbe	Merge branch '4.5' into 4	2018-02-05 12:10:34 +13:00
Scott Hutchinson	96cde0f04c	FIX: Ensure display rules work correctly for EditableFormHeading (#712)	2018-02-05 12:08:24 +13:00
Dylan Wagstaff	9ca53d1adb	Merge pull request #709 from creative-commoners/pulls/5.0/display-rules-message ... FIX Update display rules not enabled warning message to be full width	2018-02-02 14:37:38 +13:00
Raissa North	36e25b7a6a	FIX Update source translation for Form.FIELDISREQUIRED (#710) ... Change made so that template output is populated correctly.	2018-02-02 14:33:31 +13:00