ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-11-15 01:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
577 commits 19 branches 0 tags 55 MiB
Commit graph

577 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absurdon
0b2aad6456 disabling calendar tests for now as they dont fit the new implementation anymore 2017-04-03 02:10:38 +02:00
Absurdon
0358817d91 Merge pull request #102 from Absurdon/CalendarIntegrationUpdate 
Calendar integration update
 2017-04-03 01:06:33 +02:00
Absurdon
bac4f137c3 Made Calendar Integration failsafe and use google-api-client gem 2017-04-03 01:02:09 +02:00
Absurdon
687a50ab6a Added Google API gem 2017-04-02 19:35:50 +02:00
Absurdon
50f74810ec Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
9c43c5cb8d Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
fedf1473d3 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
bc01a9fbb5 Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
946342bffb Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
cafd421d0a fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
839aae732a fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
4ce05f2563 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
5f3b56a9bb Merge pull request #101 from Absurdon/master 
Added Button to show user history for admins
 2017-03-07 01:50:57 +01:00
Absurdon
7b32035f67 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
dc4ee1c28f Merge pull request #100 from Absurdon/master 
Gave Gathermods simple banning permissions
 2017-03-06 02:37:31 +01:00
Absurdon
39758ff86c Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
3ef0f8aac6 Merge pull request #99 from Absurdon/master 
Made bans show who created them
 2017-03-04 22:57:42 +01:00
Absurdon
662f4129eb added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
c6a0ed106f Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
229dc827c5 Merge pull request #98 from Absurdon/master 
Fixed issue#97
 2017-03-03 14:14:53 +01:00
Absurdon
888f7ad9e2 Fixed issue#97 2017-03-03 14:09:14 +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
4a863ee5f4 Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
4bfe5132fa Merge remote-tracking branch 'upstream/master' 2017-02-27 17:14:03 +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
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
a8451f1466 Fixed new PMs not highlighted 2017-02-16 21:58:52 +02:00
Absurdon
11a300871f Fixed new PMs not highlighted 2017-02-16 01:41:36 +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
3d6826d467 fixed gathercount not getting loaded immediatly 2017-02-13 00:00:06 +01:00
Absurdon
0ebc9fb875 Fixed Comp Mod link lable 2017-02-12 22:59:23 +02:00
Luchs
d5d804a56f Also return users without a team on UserCollection service 2017-02-12 22:46:41 +02:00
Ari Timonen
e32dd60032 Change capistrano version 2017-02-12 21:39:54 +01:00
virtual-user
2a215f3ffe Change back to 2.2.2 2017-02-12 21:38:27 +01:00
Absurdon
cffa92e845 added link to comp mod article 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
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
096b1fcd85 Update Ruby to 2.2.3 2016-08-02 00:29:36 +02: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
cf6180366a Merge pull request #78 from cblanc/teams_api 
Teams api
 2016-04-17 00:15:27 +01:00
Chris Blanchard
970f5dd9cf Add teams api 2016-04-17 00:05:18 +01:00
Chris Blanchard
9e675bd1d4 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-16 23:19:54 +01:00
Chris Blanchard
c65750fc8f Merge pull request #77 from cblanc/develop 
Please forgive me
 2016-02-07 20:16:19 +00:00
Chris Blanchard
a496589d14 Please forgive me 2016-02-05 16:58:10 +00:00
Ari Timonen
bc95844520 Add more files to gitignore 2016-01-29 00:33:08 +02:00
Ari Timonen
710848546d Add more files to gitignore 2016-01-29 00:32:03 +02:00
Ari Timonen
1493dc9b42 Add sublime files to gitignore 2016-01-29 00:29:09 +02:00
simplefl
530c0a7f7f Merge pull request #76 from ENSL/develop 
Develop
 2015-12-31 12:43:16 +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
c19e0a056c Add gather category to issues 2015-12-31 00:30:48 +00:00