| 
							
							
								 James Cole | 8e1dbc03d9 | Merge branch 'hotfix/3.7.2.2' into develop Conflicts:
	app/Http/Controllers/RuleGroupController.php | 2016-02-05 13:23:00 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 0dfb97c5f7 | Fix #171 | 2016-02-05 13:21:56 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | c5dc073d49 | Merge branch 'hotfix/3.7.2' into develop | 2016-02-05 07:40:38 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | d48e4c66b2 | I have no idea what I'm doing | 2016-02-05 07:40:15 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 86c22c9fdd | New export functionality. | 2016-02-04 17:16:16 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 1b3198c143 | New: upgrade instructions when installing or upgrading composer packages. | 2016-01-17 07:50:09 +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 | 5ac88623ed | Prep stuff for routes and actions. | 2016-01-13 16:05:39 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 668633e764 | All actions and triggers. | 2016-01-13 15:10:49 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 1270e5d15c | More valid triggers. | 2016-01-13 14:37:19 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | afec8480fb | More working triggers. | 2016-01-13 14:12:46 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 8720511046 | From account contains trigger. | 2016-01-13 14:05:26 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | a7a00ecf40 | More rule possibilities | 2016-01-13 14:02:22 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 46ee2a0568 | Can now automatically handle some rules. No user interface, yet. | 2016-01-13 08:14:14 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 1087b9f5df | Can now trigger. | 2016-01-13 07:47:26 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 7836feba63 | New trigger. | 2016-01-12 21:10:16 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 166d32f073 | Add actions | 2016-01-12 21:09:28 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | f9703eca4c | Removed double configuration. | 2016-01-12 20:56:36 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 48551e8bf5 | Merge branch 'feature/rules' into develop | 2016-01-12 20:39:49 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 74b538805b | Expand config. | 2016-01-12 20:38:19 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 06d11c9133 | New stuff for the rule thing. | 2016-01-12 20:36:47 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 358d9aac7d | New version. | 2016-01-09 14:27:17 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 47ccc513ad | New version. | 2016-01-07 10:11:37 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 9c929ecd1b | New release. | 2015-12-28 16:53:30 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 5cb497596d | New release. | 2015-12-28 08:07:26 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | c5dee29e4b | New version. | 2015-12-27 08:58:25 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 8dae8b1a7f | More code. Forgot to push. | 2015-12-24 16:59:38 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 56ee830558 | Moved locale information from the language to the translation files. | 2015-12-24 08:20:47 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | ad577e4e81 | Expand language files. | 2015-12-22 20:46:16 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 32771fe7e1 | Add Português do Brasil | 2015-12-20 08:20:50 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | c1ba591b26 | Rename languages. | 2015-12-19 20:54:27 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 6cf8102de5 | Update version for coming release. | 2015-12-12 22:32:19 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 0f685e8789 | New version. | 2015-11-13 07:01:14 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | af107ad5e8 | New release. | 2015-10-30 07:23:33 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 5f2317af7f | New version | 2015-08-23 07:42:32 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7ffb48a87a | New translations | 2015-08-15 21:42:45 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | cf0c7ef6b2 | New version. | 2015-08-13 17:32:22 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 710e9c9423 | new version. | 2015-08-10 20:13:33 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 8642ae8180 | New version. | 2015-07-25 19:27:14 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | ed4fcc9011 | Some optimisation. | 2015-07-18 22:17:31 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 76d7a97f93 | New release with all changes so far. Change log coming soon. | 2015-07-15 21:02:27 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a9f1b31dd6 | New version. | 2015-07-12 22:43:43 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5153591c8f | New version. | 2015-07-07 10:38:53 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d67db74ca2 | Optimized some code. | 2015-07-06 22:12:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 39af9e4414 | More translations. | 2015-07-06 10:39:44 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 9105104303 | Make CSV import a feature that can be turned on / off. | 2015-07-05 08:47:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d3a4c3795d | New version. | 2015-06-29 09:53:10 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 4cceb3ddaa | Completed the index. | 2015-06-27 17:32:52 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | f6b1ec27e5 | Renamed google chart methods and data. | 2015-06-27 12:04:53 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 9e5484937e | Code cleanup [skip ci] | 2015-06-27 08:06:24 +02:00 |  |