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

291 commits

Author SHA1 Message Date
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
jamal
ebd60d19eb 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
jamal
bffbbcb572 Disable leave confirm when voting for map or server 2014-10-11 10:04:16 -04:00
jamal
4da97ce553 Fix double confirm when you click the 'Leave Gather' button 2014-10-11 09:13:07 -04:00
jamal
d6b501ac46 Add state to gatherers and track when a gatherer has left or is away 2014-10-10 20:50:17 -04:00
Luke Barratt
47c2bc4006 Added steam profile lookup API endpoint 2014-08-28 23:04:18 +01:00
Luke Barratt
0420de8983 Check for upcoming matches before showing the calendar 2014-08-28 23:04:18 +01:00
Luke Barratt
e57a3f569d Added site layout configuration for users 2014-08-28 23:04:18 +01:00
Luke Barratt
987a28d7d0 Remove TS3 Password 2014-08-28 23:04:18 +01:00
Luke Barratt
af521fc997 Fixes error when viewing team pages when not logged in 2014-08-28 23:04:17 +01:00
Luke Barratt
b27ef8c465 Fixes linking to latest posts in forums 2014-06-06 22:37:43 +01:00
Luke Barratt
3d6904cd5f Fixes word wrapping issues 2014-06-06 21:10:37 +01:00
Luke Barratt
180ab8a408 Prefer 1.9 hash syntax 
Remove unused log entries?
 2014-05-19 21:44:47 +01:00
Room5-Joey
60404adf63 Can now join teams from the teams pages individually. If you already have a request active, it will remove that request and replace it with a new one (with a confirmation). I left the Agenda way of joining/cancelling join of teams. 2014-05-19 20:52:26 +01:00
Room5-Joey
463b2d7e23 added autolink gem to site. We should integrate this with the forums as well? And pretty much any text field? 2014-05-19 20:52:21 +01:00
Luke Barratt
ed71ad5344 Fixes updating contests 2014-05-19 20:51:32 +01:00
Luke Barratt
8bef59868e Fixes gather music not playing during voting phase 
Fixes issues with topic ordering
Tweaked read/unread icon colours for forums
 2014-05-16 23:54:41 +01:00
Luke Barratt
e46735d912 Update favicon and titles 2014-05-16 22:25:40 +01:00
Luke Barratt
c64df4e70d Merge in alternate CSS 2014-05-16 22:10:24 +01:00
Luke Barratt
8ea7c95c8d Isolate design CSS 2014-05-11 11:27:59 +01:00
Luke Barratt
9edc514275 Fixes gather captains not able to pick players 
Added missing gather translation
Cleanup JS
 2014-05-10 14:52:45 +01:00
Luke Barratt
1ce05c3757 Fixes shoutbox styling 2014-05-10 13:55:40 +01:00
Ari Timonen
648248eecd Fix match admin page 2014-05-10 13:02:57 +03:00
Ari Timonen
d91a2eae52 Add match admin page and casting 2014-05-10 11:52:00 +03:00
Luke Barratt
faa895b3f0 Bump to Rails 3.2.18 
Reduce aggressive topic reply/view count caching
Improve shout box spacing
Pass broken tests
 2014-05-10 02:26:18 +01:00
Luke Barratt
bfbc834803 Fixes firefox rendering issues: 
Header z-index
Gather page columns
 2014-05-10 01:22:11 +01:00
Luke Barratt
ca75960bdd Added gather player count 
Improved content spacing
Colour tweaks
 2014-05-09 22:38:14 +01:00
Luke Barratt
644ffb41ef Added forum styling 
Improvements to sizing/spacing
 2014-05-04 12:53:47 +01:00
Luke Barratt
838fa343aa Added flash notification and header styling 2014-05-04 00:01:36 +01:00
Luke Barratt
616c96c45b Added base CSS for rantology's design 2014-05-03 18:50:45 +01:00
Luke Barratt
bef2b7d887 Improved forums layout 
Made profile avatar proportional
Added header to sidebar widgets
Added bbcode colour support
 2014-05-02 17:43:23 +01:00
Luke Barratt
09026a2e4b Refactor some article views 
Tweak colour brightnesses
 2014-05-02 09:27:18 +01:00
Luke Barratt
6aa8903c11 Update button copy 
Improve news archive
 2014-05-02 09:06:12 +01:00
Ari Timonen
6f59a83fbd Change news articles to be seperate boxes 2014-05-01 23:38:33 +03:00
Luke Barratt
1376b6c897 Improve teams/matches styling 2014-04-30 01:02:07 +01:00
Luke Barratt
338d788b5a Correct error messages for PMs 2014-04-30 00:50:27 +01:00
Luke Barratt
3e757e2d76 New header layout 
Improves spacing
Improves button layout on forums
 2014-04-30 00:34:48 +01:00
Luke Barratt
5a89d4c92c Improve news page layout 
Fix forums unread icon
Fix double linebreaks in BBcode
Increase colour darkness
 2014-04-29 21:02:20 +01:00
Luke Barratt
ae9717f00d Change units to px from em. Downsize all widths and font sizes 2014-04-29 19:18:14 +01:00
Luke Barratt
fd0e681aa2 Rescue from AccessError with pretty and informative error page 
Add pagination to teams page
 2014-04-28 00:16:28 +01:00
Luke Barratt
30230bf645 Tweaks to users/teams list 2014-04-27 03:14:17 +01:00
Luke Barratt
8e3670f430 Merged in changes from https://github.com/taekwonjoe01/ensl.org 2014-04-27 03:11:47 +01:00
Luke Barratt
c172d04ef9 Further styling tweaks to users/profile/maps 2014-04-27 02:59:45 +01:00
Luke Barratt
563a875cb2 Improve admin challenge listing 2014-04-27 02:46:11 +01:00