Commit graph

551 commits

Author SHA1 Message Date
Michael Senn
38ac72f01e Adjust user API specs to expect users without assigned teams.
In  d5d804a56f, the user API was changed to
also return users without an assigned team, but specs were not adjusted.
2017-02-24 17:53:25 +01:00
Absurdon
e0710c9efc Fixed new PMs not highlighted 2017-02-16 21:58:52 +02:00
Absurdon
472cad9155 Merge pull request #88 from Absurdon/master
fixed gathercount not getting loaded immediatly
2017-02-13 00:03:29 +01:00
Absurdon
d066dcc303 fixed gathercount not getting loaded immediatly 2017-02-13 00:00:06 +01:00
Absurdon
e7f41948d3 Fixed Comp Mod link lable 2017-02-12 22:59:23 +02:00
Luchs
f89771ffaf Also return users without a team on UserCollection service 2017-02-12 22:46:41 +02:00
Ari Timonen
04b2638ebd Change capistrano version 2017-02-12 21:39:54 +01:00
virtual-user
91cc27fb78 Change back to 2.2.2 2017-02-12 21:38:27 +01:00
Absurdon
0f397f9e7c added link to comp mod article 2017-01-14 22:30:19 +02:00
Absurdon
be6d5ec461 fallback gather link as fixed redirect link
changing the fallback gather link to point to "http://www.ensl.org/gathers/latest/ns2" to make sure it points to the correct gather even without the user having to reload the page first
requested by mega Jan 01 2017
2017-01-14 22:30:19 +02:00
Absurdon
ac2e95799c periodic gather count update
Made it so the page updates the gather fill status in the navigation periodicaly (every 10 seconds)
2017-01-14 22:30:19 +02:00
Ari Timonen
8ca9dfb7fe Update Ruby to 2.2.3 2016-08-02 00:29:36 +02:00
Chris Blanchard
c2238a3375 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
24c825e2c9 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
703ce0f002 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
Ari Timonen
b63c2f607f 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
b74f187306 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
1515627ba5 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
simplefl
e2670c7c9f 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
Prommah
66fe8c0726 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
080619ba54 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
b55ff01ff5 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
simplefl
b8ca86cd10 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
simplefl
38f61d68fb 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
Chris Blanchard
1faed511fc Add EU flag to teams 2015-11-06 15:23:50 +00:00
Prommah
099d1eb7dd Fix hound rubocop rules (hopefully) 2015-11-05 23:32:22 +00:00
simplefl
78dbe18df6 Merge pull request #69 from Prommah/develop
Tidying & fixes
2015-11-05 19:16:49 +01:00
Prommah
71424d9207 Fix rubocop offenses 2015-11-05 08:25:54 +00:00
Prommah
67f603789f Fixed caster selection 2015-11-05 07:59:52 +00:00
Prommah
a4f4f074ae Cleaned up match model 2015-11-05 07:57:55 +00:00
Prommah
7bbb1a1fb1 Clean up Verification.contain 2015-11-04 14:26:32 +00:00
Prommah
9ef8b7a24b Remove disused & hidden match score page 2015-11-04 14:17:57 +00:00
Prommah
0b347baee7 Revert Verification.contain 2015-11-03 11:46:11 +00:00
Prommah
a460020a3e Clean up Verification lib 2015-11-03 08:41:25 +00:00
Prommah
9b2ba68551 Add new user API spec 2015-11-03 07:50:14 +00:00
simplefl
99588b0280 Merge pull request #67 from ENSL/develop
Develop
2015-10-30 22:23:23 +01:00
simplefl
2fbfaac968 Merge pull request #66 from Prommah/develop
General cleanliness
2015-10-30 22:22:22 +01:00
Prommah
d976acb759 Update deprecated spec_helper code & styling 2015-10-29 22:02:29 +00:00