Commit graph

1199 commits

Author SHA1 Message Date
Chris Blanchard
c2238a3375 Merge pull request #79 from ENSL/develop
Merge develop into master
2016-04-17 09:26:50 +01:00
Chris Blanchard
d589cc60be Merge pull request #79 from ENSL/develop
Merge develop into master
2016-04-17 09:26:50 +01:00
Chris Blanchard
7b43a8da20 Merge pull request #78 from cblanc/teams_api
Teams api
2016-04-17 00:15:27 +01:00
Chris Blanchard
cf6180366a Merge pull request #78 from cblanc/teams_api
Teams api
2016-04-17 00:15:27 +01:00
Chris Blanchard
24c825e2c9 Add teams api 2016-04-17 00:05:18 +01:00
Chris Blanchard
970f5dd9cf Add teams api 2016-04-17 00:05:18 +01:00
Chris Blanchard
2e2962705e Merge remote-tracking branch 'upstream/develop' into develop 2016-04-16 23:19:54 +01:00
Chris Blanchard
9e675bd1d4 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-16 23:19:54 +01:00
Chris Blanchard
703ce0f002 Merge pull request #77 from cblanc/develop
Please forgive me
2016-02-07 20:16:19 +00:00
Chris Blanchard
c65750fc8f Merge pull request #77 from cblanc/develop
Please forgive me
2016-02-07 20:16:19 +00:00
Chris Blanchard
ba556ca1fe Please forgive me 2016-02-05 16:58:10 +00:00
Chris Blanchard
a496589d14 Please forgive me 2016-02-05 16:58:10 +00:00
Ari Timonen
b63c2f607f Add more files to gitignore 2016-01-29 00:33:08 +02:00
Ari Timonen
bc95844520 Add more files to gitignore 2016-01-29 00:33:08 +02:00
Ari Timonen
5be50c1139 Add more files to gitignore 2016-01-29 00:32:03 +02:00
Ari Timonen
710848546d Add more files to gitignore 2016-01-29 00:32:03 +02:00
Ari Timonen
b74f187306 Add sublime files to gitignore 2016-01-29 00:29:09 +02:00
Ari Timonen
1493dc9b42 Add sublime files to gitignore 2016-01-29 00:29:09 +02:00
simplefl
79dcfd0e65 Merge pull request #76 from ENSL/develop
Develop
2015-12-31 12:43:16 +01:00
simplefl
530c0a7f7f Merge pull request #76 from ENSL/develop
Develop
2015-12-31 12:43:16 +01:00
simplefl
1515627ba5 Merge pull request #75 from cblanc/develop
Add gather category to issues
2015-12-31 12:42:19 +01:00
simplefl
fe64843117 Merge pull request #75 from cblanc/develop
Add gather category to issues
2015-12-31 12:42:19 +01:00
Chris Blanchard
9aa8d3169e Add gather category to issues 2015-12-31 00:30:48 +00:00
Chris Blanchard
c19e0a056c Add gather category to issues 2015-12-31 00:30:48 +00:00
simplefl
e2670c7c9f Merge pull request #74 from ENSL/develop
Develop
2015-11-09 09:50:27 +01:00
simplefl
d18aee8ebf Merge pull request #74 from ENSL/develop
Develop
2015-11-09 09:50:27 +01:00
simplefl
c226eb504c Merge pull request #73 from Prommah/develop
Fix Verification.contain bug & other cleanliness
2015-11-09 09:48:44 +01:00
simplefl
9dc068e5fc Merge pull request #73 from Prommah/develop
Fix Verification.contain bug & other cleanliness
2015-11-09 09:48:44 +01:00
Prommah
66fe8c0726 Fix styling 2015-11-08 23:09:56 +00:00
Prommah
3016346211 Fix styling 2015-11-08 23:09:56 +00:00
Prommah
c68ee2efe5 Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
d64d3051dc Bug fixes, improved consistency & cleanliness 2015-11-08 22:59:22 +00:00
Prommah
080619ba54 Fix Verification.contain not processing string keys 2015-11-08 07:27:49 +00:00
Prommah
7c1865d8c1 Fix Verification.contain not processing string keys 2015-11-08 07:27:49 +00:00
Prommah
dd899cddb0 Spec tidying 2015-11-07 06:21:31 +00:00
Prommah
9805d3a66e Spec tidying 2015-11-07 06:21:31 +00:00
Prommah
b55ff01ff5 Add match-related factories 2015-11-07 06:21:09 +00:00
Prommah
33455ee4f0 Add match-related factories 2015-11-07 06:21:09 +00:00
Prommah
97f9366403 Fixed profle query error when there are zero results 2015-11-07 06:11:26 +00:00
Prommah
7a41f1294c Fixed profle query error when there are zero results 2015-11-07 06:11:26 +00:00
simplefl
b8ca86cd10 Merge pull request #72 from Prommah/develop
Merge lineup forms & fix hound (again)
2015-11-07 01:02:18 +01:00
simplefl
a1ca59df88 Merge pull request #72 from Prommah/develop
Merge lineup forms & fix hound (again)
2015-11-07 01:02:18 +01:00
Prommah
dbad31fddc Merge lineup forms 2015-11-06 19:43:30 +00:00
Prommah
e7d5662bb6 Merge lineup forms 2015-11-06 19:43:30 +00:00
simplefl
38f61d68fb Merge pull request #71 from ENSL/develop
Develop
2015-11-06 18:56:53 +01:00
simplefl
2cc1fb0aa4 Merge pull request #71 from ENSL/develop
Develop
2015-11-06 18:56:53 +01:00
simplefl
f7123b3c92 Merge pull request #70 from cblanc/team_country_flags
Add EU flag to teams
2015-11-06 18:56:23 +01:00
simplefl
b03d09614b Merge pull request #70 from cblanc/team_country_flags
Add EU flag to teams
2015-11-06 18:56:23 +01:00
Chris Blanchard
1faed511fc Add EU flag to teams 2015-11-06 15:23:50 +00:00
Chris Blanchard
b4d50b7eb3 Add EU flag to teams 2015-11-06 15:23:50 +00:00