ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-30 14:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
1242 commits 19 branches 0 tags 55 MiB
Commit graph

1242 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absurdon
3ef0f8aac6 Merge pull request #99 from Absurdon/master 
Made bans show who created them
 2017-03-04 22:57:42 +01:00
Absurdon
5fac74f715 added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
662f4129eb added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
9a0d2c6a25 Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
c6a0ed106f Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
eefde7277a Merge pull request #98 from Absurdon/master 
Fixed issue#97
 2017-03-03 14:14:53 +01:00
Absurdon
229dc827c5 Merge pull request #98 from Absurdon/master 
Fixed issue#97
 2017-03-03 14:14:53 +01:00
Absurdon
f3baf7e896 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
888f7ad9e2 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
038d9b37d5 Merge pull request #96 from Absurdon/master 
Fixing constants to reflect new organisational structure
 2017-02-27 23:26:12 +01:00
Absurdon
b22a16dfd1 Merge pull request #96 from Absurdon/master 
Fixing constants to reflect new organisational structure
 2017-02-27 23:26:12 +01:00
Absurdon
f17af42bfd Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
4a863ee5f4 Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
bb0845f9bd Merge remote-tracking branch 'upstream/master' 2017-02-27 17:14:03 +01:00
Absurdon
4bfe5132fa Merge remote-tracking branch 'upstream/master' 2017-02-27 17:14:03 +01:00
Absurdon
b87d2aaadd Merge pull request #90 from Lavode/bugfix/fix-user-api-specs 
Adjust user API specs to expect users without assigned teams.
 2017-02-24 21:00:40 +01:00
Absurdon
73c4b46bf8 Merge pull request #90 from Lavode/bugfix/fix-user-api-specs 
Adjust user API specs to expect users without assigned teams.
 2017-02-24 21:00:40 +01:00
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
Michael Senn
f390c1b38c 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
a8451f1466 Fixed new PMs not highlighted 2017-02-16 21:58:52 +02:00
Absurdon
cdb77d27a7 Fixed new PMs not highlighted 2017-02-16 01:41:36 +01:00
Absurdon
11a300871f Fixed new PMs not highlighted 2017-02-16 01:41:36 +01: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
dab26d0759 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
3d6826d467 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
Absurdon
0ebc9fb875 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
Luchs
d5d804a56f 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
Ari Timonen
e32dd60032 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
virtual-user
2a215f3ffe 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
cffa92e845 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
0f66511f95 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
Absurdon
a6876b8d9d 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
Ari Timonen
096b1fcd85 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
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