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

334 commits

Author SHA1 Message Date
Absurdon
313500c257 added gather mod tab to staff page 2017-06-21 09:39:30 +02:00
Absurdon
29a6a83887 Added submit function and processing 2017-06-11 16:36:10 +02:00
Absurdon
c4fa4bd188 Added proposal actions 2017-06-11 15:09:30 +02:00
Absurdon
ca9cdeb200 Fixed Syntax Error and error in Access Control 2017-06-04 20:30:33 +02:00
Absurdon
04f2fd77ff Added view for creating proposals and added some controller functionality 2017-05-11 22:26:18 +02:00
Absurdon
0f05829bcc started to shape out the controllers 2017-05-05 17:17:00 +02:00
Absurdon
160fccd118 Added model and controller stub 2017-05-01 16:57:32 +02:00
Absurdon
925001b73d Updated all links to use https 2017-04-18 16:01:36 +02:00
Absurdon
d3fdef95c4 Updated all links to use https 2017-04-18 16:01:36 +02:00
Absurdon
f6ecbb9f4d gave referees a possibility to signup for matches 2017-04-13 19:32:07 +02:00
Absurdon
5cc9dc411f gave referees a possibility to signup for matches 2017-04-13 19:32:07 +02:00
Absurdon
0c18e7f9ba added correct linking to nsltv events 2017-04-04 12:16:32 +02:00
Absurdon
807fe267dc added correct linking to nsltv events 2017-04-04 12:16:32 +02:00
Absurdon
eb43c87f00 made streamlinks from event description show as link in calendar widget 2017-04-04 12:11:36 +02:00
Absurdon
bda00fbef9 made streamlinks from event description show as link in calendar widget 2017-04-04 12:11:36 +02:00
Absurdon
b411f559b8 Made Calendar Integration failsafe and use google-api-client gem 2017-04-03 01:02:09 +02:00
Absurdon
bac4f137c3 Made Calendar Integration failsafe and use google-api-client gem 2017-04-03 01:02:09 +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
50f74810ec 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
9c43c5cb8d 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
fedf1473d3 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
bc01a9fbb5 Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
b1e451030c fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
cafd421d0a fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
91d585f378 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
7b32035f67 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
569122862f Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
39758ff86c Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +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
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
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
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
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
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
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
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
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
Prommah
67f603789f Fixed caster selection 2015-11-05 07:59:52 +00:00
Prommah
6e9b84fdee Fixed caster selection 2015-11-05 07:59:52 +00:00
Prommah
9ef8b7a24b Remove disused & hidden match score page 2015-11-04 14:17:57 +00:00
Prommah
83efd5f21c Remove disused & hidden match score page 2015-11-04 14:17:57 +00:00
Prommah
f4e8ecdcd6 Don't show any SteamID stuff if that's blank too 2015-10-28 02:40:38 +00:00
Prommah
9541076d6c Don't show any SteamID stuff if that's blank too 2015-10-28 02:40:38 +00:00
Prommah
a96949340a Don't show anything for blank profile values. 2015-10-28 02:32:45 +00:00
Prommah
970f56bc9a Don't show anything for blank profile values. 2015-10-28 02:32:45 +00:00
simplefl
c128833f8f Merge pull request #56 from cblanc/expose_new_gathers 
Expose new gathers
 2015-09-18 17:05:01 +02:00
simplefl
e63bd866b6 Merge pull request #56 from cblanc/expose_new_gathers 
Expose new gathers
 2015-09-18 17:05:01 +02:00
Chris Blanchard
6fe08003b2 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
Chris Blanchard
d70075de84 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
simplefl
19b8cf877c Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
simplefl
c81c38ec27 Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
Chris Blanchard
3694832277 Show stream information on user page 2015-08-27 18:47:26 +01:00
Chris Blanchard
7c6b66a43d Show stream information on user page 2015-08-27 18:47:26 +01:00
Chris Blanchard
83dc747a51 Account goes to user profile 2015-08-24 16:02:55 +01:00
Chris Blanchard
3616b90e3d Account goes to user profile 2015-08-24 16:02:55 +01:00
Chris Blanchard
67999187dc Swap out old recent topics method 2015-08-20 16:20:50 +01:00
Chris Blanchard
4318f4116e Swap out old recent topics method 2015-08-20 16:20:50 +01:00
simplefl
8301064e3b Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
d03a78b023 Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
6b1f4d1a79 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
simplefl
9d8b84b3e0 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
Ari Timonen
d6baebc3bc Remove tweets 2015-07-02 02:34:39 +03:00
Ari Timonen
4c185aec76 Remove tweets 2015-07-02 02:34:39 +03:00
simplefl
b742be7982 Only admins can change usernames. 2015-06-27 14:23:37 +02:00
simplefl
9c0b29f4fe Only admins can change usernames. 2015-06-27 14:23:37 +02:00
Ari Timonen
7041c0bbe5 Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
Ari Timonen
432d2ae06d Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
simplefl
9112c5c52f Up shoutbox timeout. 2015-06-13 17:53:41 +02:00
simplefl
7433c9f9eb Up shoutbox timeout. 2015-06-13 17:53:41 +02:00
Chris Blanchard
39529bc8bc Add recipient to messages 2015-06-02 18:50:41 +01:00
Chris Blanchard
6b8f5677b4 Add recipient to messages 2015-06-02 18:50:41 +01:00
simplefl
ca732d76f2 Merge pull request #20 from cblanc/drop_rcon 
Drop RCON (danger!)
 2015-05-26 18:58:23 +02:00
simplefl
7e46153214 Merge pull request #20 from cblanc/drop_rcon 
Drop RCON (danger!)
 2015-05-26 18:58:23 +02:00
cblanc
83bdf550bb Remove rcon column from servers table 2015-05-18 17:30:45 +01:00
cblanc
89891d2679 Remove rcon column from servers table 2015-05-18 17:30:45 +01:00
simplefl
95e5f49167 Show extra points on edit contesters not for ladder. 2015-05-16 16:14:40 +02:00
simplefl
6ad165f108 Show extra points on edit contesters not for ladder. 2015-05-16 16:14:40 +02:00
simplefl
ce812b8f17 Init ladder prototype. Challenge stuff is still mostly broken. 2015-05-16 16:08:05 +02:00
simplefl
11635660ca Init ladder prototype. Challenge stuff is still mostly broken. 2015-05-16 16:08:05 +02:00
simplefl
fcf8f2111d Merge pull request #18 from cblanc/cleanup_server 
Attempt to remove RCON and clean up legacy code from Server Model
 2015-05-14 19:28:26 +02:00
simplefl
160e0ef44f Merge pull request #18 from cblanc/cleanup_server 
Attempt to remove RCON and clean up legacy code from Server Model
 2015-05-14 19:28:26 +02:00
cblanc
fe01cd6a76 Quick fix to bring back EU flag 2015-05-14 18:01:49 +01:00
cblanc
8c26fed542 Quick fix to bring back EU flag 2015-05-14 18:01:49 +01:00
cblanc
2990909163 No corresponding log method on servers controller 2015-05-14 14:25:27 +01:00
cblanc
195a287fad No corresponding log method on servers controller 2015-05-14 14:25:27 +01:00
cblanc
9a3e51a66a Not able to find references to these views 2015-05-14 14:25:27 +01:00
cblanc
57dab5021c Not able to find references to these views 2015-05-14 14:25:27 +01:00
cblanc
ec3498ec70 Admin route never used 2015-05-14 14:25:27 +01:00
cblanc
30a7ecb1a9 Admin route never used 2015-05-14 14:25:27 +01:00
simplefl
f800fdbeba Mute button for gather. 2015-05-13 23:21:14 +02:00
simplefl
6560fe18f9 Mute button for gather. 2015-05-13 23:21:14 +02:00
simplefl
c250c24745 Add steam group link to gather page. 2015-05-13 19:00:16 +02:00
simplefl
5a7c9f60d0 Add steam group link to gather page. 2015-05-13 19:00:16 +02:00
cblanc
5d8a693fed Cleanup 2015-05-09 16:43:02 +01:00
cblanc
52ba336572 Cleanup 2015-05-09 16:43:02 +01:00
cblanc
8db7da0b20 Added shoutbox controller to perform client side validation 2015-05-09 16:20:51 +01:00
cblanc
7bbb6441a9 Added shoutbox controller to perform client side validation 2015-05-09 16:20:51 +01:00
cblanc
05b02a3d31 Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
cblanc
932652a726 Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
simplefl
6082103a17 Display channel password on gather page. 2015-04-28 17:46:47 +02:00
simplefl
da6024f162 Display channel password on gather page. 2015-04-28 17:46:47 +02:00
cblanc
f9ca91b6cf Move shoutmsg polling invocation to instances where shoutbox is available 2015-04-27 23:36:27 +01:00
cblanc
d268eedc60 Move shoutmsg polling invocation to instances where shoutbox is available 2015-04-27 23:36:27 +01:00
simplefl
79a32c5095 Add gather spreadsheet links to gather page. 2015-04-19 12:04:27 +02:00
simplefl
2d7d8b7e4b Add gather spreadsheet links to gather page. 2015-04-19 12:04:27 +02:00
simplefl
01f3b3d32e Remove unloading hook from gather because its triggered to often. 2015-04-16 19:38:26 +02:00
simplefl
d2841680b0 Remove unloading hook from gather because its triggered to often. 2015-04-16 19:38:26 +02:00
simplefl
68f24bef9f Add twitter and steam to nav bar. 2015-04-11 18:35:25 +02:00
simplefl
cd20fe63d1 Add twitter and steam to nav bar. 2015-04-11 18:35:25 +02:00
simplefl
adbd4554d2 Staff is more important then ref and caster on posts. 2015-04-11 15:31:11 +02:00
simplefl
f28ffce6aa Staff is more important then ref and caster on posts. 2015-04-11 15:31:11 +02:00
simplefl
3e750ba6da Add group name and task to posts. 2015-04-11 12:34:52 +02:00
simplefl
abad7ff5f6 Add group name and task to posts. 2015-04-11 12:34:52 +02:00
simplefl
741a11a289 Add sticky class to topic links. 2015-04-09 19:23:29 +02:00
simplefl
2f8f41d6f3 Add sticky class to topic links. 2015-04-09 19:23:29 +02:00
simplefl
f4774fa22f More charackters from map are shown in gather. 2015-04-06 23:28:35 +02:00
simplefl
7d889b67f1 More charackters from map are shown in gather. 2015-04-06 23:28:35 +02:00
Ari Timonen
eb3f260f01 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
07fe0fc660 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
3f9ca0a4da Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
6f0e8f2a0f Fixed rules 2015 2015-04-04 15:49:53 +03:00
jamal
d6e0a5d1d1 Revert "Fix some logic errors with captains" 
Revert "Change Gather style to volunteer captains"

This reverts commits fb7d361, d8134ca, and ebd60d1.
 2014-12-08 09:35:40 -05:00
jamal
cf0b0461b6 Revert "Fix some logic errors with captains" 
Revert "Change Gather style to volunteer captains"

This reverts commits fb7d361, d8134ca, and ebd60d1.
 2014-12-08 09:35:40 -05:00
jamal
ca6630000c Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
jamal
d8134cadb7 Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
Luke Barratt
2ef1b536cd Merge remote-tracking branch 'jamal/self-captains' into develop 
Conflicts:
	app/views/gathers/_status.html.erb
 2014-10-11 23:13:57 +01:00
Luke Barratt
f50c209702 Merge remote-tracking branch 'jamal/self-captains' into develop 
Conflicts:
	app/views/gathers/_status.html.erb
 2014-10-11 23:13:57 +01:00
jamal
4c7041e4b3 Change Gather style to volunteer captains 
This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used.

Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus.
 2014-10-11 15:50:06 -04:00