2930 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	f69be86c74	Some code cleanup courtesy of PHPStorm.	2016-01-15 17:53:54 +01:00
James Cole	820722f44e	Some code cleanup courtesy of PHPStorm.	2016-01-15 17:38:09 +01:00
James Cole	a755badd5f	Use correct parameter.	2016-01-15 16:33:54 +01:00
James Cole	4df1e5393b	Also updated all translations.	2016-01-15 16:33:03 +01:00
James Cole	8c55bd179f	Moved the option right under the file selection.	2016-01-15 16:27:17 +01:00
James Cole	ccfc5ece66	Put the form options in the translation files.	2016-01-15 16:27:01 +01:00
James Cole	6c12f1bc86	Some refactoring, courtesy of PHPStorm.	2016-01-15 16:26:49 +01:00
James Cole	88839e9610	For more clarity in the code, moved the array of options to the controller itself.	2016-01-15 16:26:24 +01:00
James Cole	4f6a733238	For more clarity in the code, moved the array of options to the controller itself.	2016-01-15 16:26:19 +01:00
James Cole	dc9083a764	Also forget delimiter.	2016-01-15 16:26:02 +01:00
James Cole	6f231b840b	Merge pull request #144 from roberthorlings/feature/import-csv-delimiter ... Option to choose CSV delimiter when importing data	2016-01-15 16:19:53 +01:00
Robert Horlings	61a703e605	Implemented option to choose field delimiter in CSV import	2016-01-15 15:24:07 +01:00
Robert Horlings	8e0e9734a5	Updated gitignore with eclipse files and storage directory	2016-01-15 15:07:42 +01:00
James Cole	2afb455bac	New translations.	2016-01-15 13:40:39 +01:00
James Cole	01792f91e2	Code cleanup	2016-01-15 13:13:33 +01:00
James Cole	651dff0750	Shorter method names.	2016-01-15 13:13:21 +01:00
James Cole	9cbfbd41dc	Shorter method names.	2016-01-15 13:10:34 +01:00
James Cole	168d6f403c	Shorter method names.	2016-01-15 13:09:27 +01:00
James Cole	41f200e630	Some code cleanup.	2016-01-15 13:08:25 +01:00
James Cole	0809cfdc6d	Move methods around	2016-01-15 13:06:17 +01:00
James Cole	466d739da8	Start with new controller for rule groups.	2016-01-15 11:28:27 +01:00
James Cole	daf65cb387	Split rule and rule group repositories.	2016-01-15 11:27:27 +01:00
James Cole	2605f60983	Refactor. Split rules and rule groups.	2016-01-15 11:16:41 +01:00
James Cole	fcf6cdb134	Better order and display.	2016-01-15 10:52:35 +01:00
James Cole	209258b507	Fixed various bugs.	2016-01-15 09:25:32 +01:00
James Cole	f80bc214f9	Edit rules.	2016-01-15 08:45:39 +01:00
James Cole	f76990bb9b	Twig methods.	2016-01-15 08:13:19 +01:00
James Cole	eef68c9b31	New extension for rules.	2016-01-15 08:10:22 +01:00
James Cole	006c2ae186	Refer to dedicated methods instead of variables.	2016-01-15 08:06:33 +01:00
James Cole	8b66ff6afe	First edit-rule code.	2016-01-15 08:04:57 +01:00
James Cole	4cc6d57e6e	Stop processing other rules if asked.	2016-01-15 06:43:00 +01:00
James Cole	af1c6b22bb	Translation.	2016-01-15 06:35:53 +01:00
James Cole	5958990ed5	Stop processing.	2016-01-15 06:35:31 +01:00
James Cole	cd4cbdc197	Accidentally used a php 7 thing.	2016-01-15 06:25:09 +01:00
James Cole	1f538be16e	More code for rules.	2016-01-14 21:34:17 +01:00
James Cole	9703439a4c	Some more rule things before I merge a change to the CSV importer.	2016-01-14 19:20:02 +01:00
James Cole	42203ba872	Attempt at validating.	2016-01-14 18:57:52 +01:00
James Cole	cd60b852a1	This isn't really working.	2016-01-14 18:09:20 +01:00
James Cole	5b1d9e1a0d	Start work on adding a rule.	2016-01-14 16:41:15 +01:00
James Cole	e02657a7c7	New font awesome	2016-01-14 13:12:20 +01:00
James Cole	c352eb0c74	First attempt at create rule form.	2016-01-14 12:37:49 +01:00
James Cole	81b9d5da09	User can now re-order triggers and actions.	2016-01-14 11:27:15 +01:00
James Cole	b9b0413510	More resources for rules.	2016-01-14 10:33:24 +01:00
James Cole	97770da619	Re-order rule groups.	2016-01-14 09:53:59 +01:00
James Cole	521623797e	Move rule groups.	2016-01-14 09:49:12 +01:00
James Cole	15d3414443	Can order rules.	2016-01-14 09:38:48 +01:00
James Cole	245f06c93a	Fix test, expand index.	2016-01-14 09:17:23 +01:00
James Cole	33899f0e2f	New test data, new translations.	2016-01-14 09:08:44 +01:00
James Cole	4697fbdeef	Routine to delete rules. Should include routine to move rules to other group.	2016-01-13 21:44:26 +01:00
James Cole	06174d6afb	Edit rule group.	2016-01-13 18:50:15 +01:00