Commit Graph

3329 Commits

Author SHA1 Message Date
James Cole
82a4c706b0 Update something in travis. 2016-02-05 19:16:42 +01:00
James Cole
082e6f5e99 Removed the composer.lock, see what happens. 2016-02-05 19:14:06 +01:00
James Cole
b90c7c09b6 Smaller travis file. Try to fix the search. 2016-02-05 19:12:54 +01:00
James Cole
1ee72a6ce5 Travis file update. 2016-02-05 18:53:31 +01:00
James Cole
f72a8c5c06 Fixed some errors. Debug tests. 2016-02-05 17:38:58 +01:00
James Cole
ba5db2c15f Fixed test data. 2016-02-05 17:29:51 +01:00
James Cole
f5b89ca783 Some code cleanup. 2016-02-05 15:41:40 +01:00
James Cole
4ef840e210 More test data tweaks. 2016-02-05 15:20:44 +01:00
James Cole
e2d0ee125f Cleaning up test data. 2016-02-05 15:01:33 +01:00
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
9c0893fa8c Merge branch 'hotfix/3.7.2.2' 2016-02-05 13:22:02 +01:00
James Cole
0dfb97c5f7 Fix #171 2016-02-05 13:21:56 +01:00
James Cole
cb52af28e7 Also fixes #171 2016-02-05 13:20:10 +01:00
James Cole
4b4384b1a8 Merge branch 'hotfix/3.7.2.1' 2016-02-05 13:16:21 +01:00
James Cole
62483e748b Merge branch 'hotfix/3.7.2.1' into develop 2016-02-05 13:16:21 +01:00
James Cole
9b10984d81 Fix for bug #171 2016-02-05 13:16:12 +01:00
James Cole
c5e283a13e This is a fix for #171 2016-02-05 13:13:47 +01:00
James Cole
df918e8529 Fixed all problems related to strict types. 2016-02-05 13:09:18 +01:00
James Cole
aa1193a9eb Fixed all problems related to strict types. 2016-02-05 12:28:05 +01:00
James Cole
8f7f263a48 Declare strict type. 2016-02-05 12:08:25 +01:00
James Cole
0bad227548 No more PHP 5.6 tests. 2016-02-05 09:30:06 +01:00
James Cole
78bcd3e1bb Changed a lot of parameters. 2016-02-05 09:25:15 +01:00
James Cole
554640c345 These are the first commits that make FF require php 7. 2016-02-05 08:03:26 +01:00
James Cole
baecc256f6 Secretly updated some migrations. 2016-02-05 07:55:36 +01:00
James Cole
10a2a4cf5b Merge branch 'hotfix/3.7.2' 2016-02-05 07:40:38 +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
d357142075 Merge branch 'release/3.7.1' 2016-02-05 07:34:34 +01:00
James Cole
af17381e04 Merge branch 'release/3.7.1' into develop 2016-02-05 07:34:34 +01:00
James Cole
2e7d339d7e Fix for bug #170, caught thanks to @boerbiet 2016-02-05 07:34:25 +01:00
James Cole
c6cddad13c Let's see if this works as well. 2016-02-05 07:31:22 +01:00
James Cole
54bd54b521 First install with no-dev, then update? 2016-02-05 07:27:07 +01:00
James Cole
8cbbb970e1 Attempt to fix the tests. 2016-02-05 07:26:20 +01:00
James Cole
fbbf7f75c3 Fix for test. 2016-02-05 07:24:33 +01:00
James Cole
5a23b95352 Final fix for #170. Now to make a new release! 2016-02-05 07:21:51 +01:00
James Cole
6f9675b6d6 Catch the latest exceptions for #170. 2016-02-05 07:16:55 +01:00
James Cole
bb8ce30552 Added missing ranges to Navigation, see issue #170 2016-02-05 06:56:10 +01:00
James Cole
581e2ad431 Updated all tests to include the range. 2016-02-05 06:45:54 +01:00
James Cole
45deb493ba Added the provider annotation to all tests. 2016-02-05 06:41:28 +01:00
James Cole
4531d0ee32 Expand test to set a "custom" range. 2016-02-05 06:37:08 +01:00
James Cole
a26e8a5f83 Added the $range argument to every test that might need it. See #170 2016-02-05 06:36:56 +01:00
James Cole
be74fbd677 The tests now reflect that not all category-related views support all date ranges, see issue #170 2016-02-05 06:31:27 +01:00
James Cole
ee8c83bbd8 Some small fixes. 2016-02-04 17:57:36 +01:00
James Cole
dbd32abdd1 Also delete old files. 2016-02-04 17:50:35 +01:00
James Cole
f300287814 Better cleanup routine. 2016-02-04 17:22:09 +01:00
James Cole
dd361bb9ad Delete files used. 2016-02-04 17:22:01 +01:00
James Cole
744205cb6e New composer. 2016-02-04 17:21:46 +01:00
James Cole
86c22c9fdd New export functionality. 2016-02-04 17:16:16 +01:00
James Cole
d7a66f6782 New model for export. 2016-02-04 17:14:59 +01:00
James Cole
902f310eb0 New export directory. 2016-02-04 17:14:32 +01:00