ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-26 04:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
574 commits 19 branches 0 tags 55 MiB
Commit graph

574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absurdon
6d5536ea94 Added Google API gem 2017-04-02 19:35:50 +02:00
Absurdon
624da53bb6 Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
c882419af2 Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
4e319ed5e9 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
e50ba391fe Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
4ebb95ca3a Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
b1e451030c fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
9989e840aa fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
035f15648a fixed error for old bans that don't have a creator 
validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working.
 2017-03-08 01:45:33 +01:00
Absurdon
a3a7e92789 Merge pull request #101 from Absurdon/master 
Added Button to show user history for admins
 2017-03-07 01:50:57 +01:00
Absurdon
91d585f378 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
7d60a90d69 Merge pull request #100 from Absurdon/master 
Gave Gathermods simple banning permissions
 2017-03-06 02:37:31 +01:00
Absurdon
569122862f Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
303fbf9587 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
9a0d2c6a25 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
f3baf7e896 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
f17af42bfd 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
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
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
cdb77d27a7 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
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