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

262 commits

Author SHA1 Message Date
simplefl
d03a78b023 Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
9d8b84b3e0 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
Ari Timonen
4c185aec76 Remove tweets 2015-07-02 02:34:39 +03:00
simplefl
9c0b29f4fe Only admins can change usernames. 2015-06-27 14:23:37 +02:00
Ari Timonen
c56ff6fff5 Fix access check bug 2015-06-22 00:43:16 +03:00
Ari Timonen
432d2ae06d Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
Chris Blanchard
dda68059dc Restore render out method 2015-06-15 23:44:24 +01:00
Chris Blanchard
a42547d227 Bring back user plugin 2015-06-15 23:16:59 +01:00
simplefl
7433c9f9eb Up shoutbox timeout. 2015-06-13 17:53:41 +02:00
Christopher Blanchard
9cd652c3bf Fix for can_create? weirdness 2015-06-07 10:20:23 +01:00
Christopher Blanchard
b919600663 Added initial issue specs 2015-06-07 00:26:09 +01:00
Chris Blanchard
6b8f5677b4 Add recipient to messages 2015-06-02 18:50:41 +01:00
simplefl
055f896c3f Merge pull request #21 from cblanc/remove_plugins 
Revoke banhammers
 2015-05-26 18:58:49 +02:00
simplefl
7e46153214 Merge pull request #20 from cblanc/drop_rcon 
Drop RCON (danger!)
 2015-05-26 18:58:23 +02:00
Christopher Blanchard
cd2c421f0f Remove plugins all hush like 2015-05-22 14:17:28 +01:00
Christopher Blanchard
3aa865e1c9 Rerun annotate on server spec 2015-05-22 14:17:07 +01:00
Christopher Blanchard
60e5279d2a Remove unrouted controller method 2015-05-22 14:04:15 +01:00
Christopher Blanchard
619136325f Remove unusued method 2015-05-22 14:04:15 +01:00
Christopher Blanchard
15f5fb5832 Removed unused accessors and validation 2015-05-22 14:04:15 +01:00
cblanc
89891d2679 Remove rcon column from servers table 2015-05-18 17:30:45 +01:00
cblanc
032b21874a Remove rcon from log model 2015-05-18 17:24:18 +01:00
simplefl
6ad165f108 Show extra points on edit contesters not for ladder. 2015-05-16 16:14:40 +02:00
simplefl
11635660ca Init ladder prototype. Challenge stuff is still mostly broken. 2015-05-16 16:08:05 +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
8c26fed542 Quick fix to bring back EU flag 2015-05-14 18:01:49 +01:00
cblanc
fdfd582846 Create new annotations for models 2015-05-14 17:29:16 +01:00
cblanc
dd29d92af0 Indentation 2015-05-14 17:29:05 +01:00
cblanc
195a287fad No corresponding log method on servers controller 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
2d58884faf hltvs not used in index template 2015-05-14 14:25:27 +01:00
cblanc
3ccca2fda0 save never invoked 2015-05-14 14:25:27 +01:00
cblanc
30a7ecb1a9 Admin route never used 2015-05-14 14:25:27 +01:00
cblanc
94a2473133 Remove methods which are never invoked 2015-05-14 14:25:27 +01:00
cblanc
bb507623fd Remove methods not defined on routes 2015-05-14 14:25:26 +01:00
simplefl
6560fe18f9 Mute button for gather. 2015-05-13 23:21:14 +02:00
simplefl
5a7c9f60d0 Add steam group link to gather page. 2015-05-13 19:00:16 +02:00
cblanc
52ba336572 Cleanup 2015-05-09 16:43:02 +01:00
cblanc
a97e310528 Listen on both keyup and change events 2015-05-09 16:36:50 +01:00
cblanc
7bbb6441a9 Added shoutbox controller to perform client side validation 2015-05-09 16:20:51 +01:00
cblanc
5f06775a26 Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:05:03 +01:00
cblanc
44109675ae Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:04:41 +01:00
cblanc
0485cbaf8a render_shoutmsgs never invoked 2015-05-05 20:35:54 +01:00
cblanc
932652a726 Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
simplefl
da6024f162 Display channel password on gather page. 2015-04-28 17:46:47 +02:00
cblanc
d268eedc60 Move shoutmsg polling invocation to instances where shoutbox is available 2015-04-27 23:36:27 +01:00
cblanc
699b5c612f Cleanup 2015-04-26 11:36:18 +01:00
simplefl
2d7d8b7e4b Add gather spreadsheet links to gather page. 2015-04-19 12:04:27 +02:00
simplefl
d2841680b0 Remove unloading hook from gather because its triggered to often. 2015-04-16 19:38:26 +02:00
simplefl
cd20fe63d1 Add twitter and steam to nav bar. 2015-04-11 18:35:25 +02:00
simplefl
77d59cb2af Add staff? to user model. 2015-04-11 15:37:47 +02:00
simplefl
f28ffce6aa Staff is more important then ref and caster on posts. 2015-04-11 15:31:11 +02:00
simplefl
abad7ff5f6 Add group name and task to posts. 2015-04-11 12:34:52 +02:00
onyxserpent
899502c8c1 Added .sticky class 2015-04-09 10:52:14 -07:00
simplefl
2f8f41d6f3 Add sticky class to topic links. 2015-04-09 19:23:29 +02:00
simplefl
85a2092a7c Remove old points before adding new points them on updates of matches. Also remove points if match gets deleted. 2015-04-09 18:45:33 +02:00
simplefl
0c00697ed0 Fix up/down moving. 2015-04-09 15:49:35 +02:00
simplefl
5330f10a12 Fix forum access rules. 2015-04-09 13:44:30 +02:00
onyxserpent
1560d569f7 Fixed too bold links by avatar 2015-04-08 10:14:15 -07:00
onyxserpent
a28d43f384 Fixed wrapping issue 2015-04-08 09:57:42 -07:00
onyxserpent
63c04655a8 Fixed broken new topic buttons, unread boldness 2015-04-08 09:56:33 -07:00
onyxserpent
0457986ec0 Fixed h# a being too bold 2015-04-08 09:44:31 -07:00
Luke Barratt
dc402f4b43 Hotfix: Added clear: both to headings to fix side effects of opacity: 0.99 2015-04-08 09:49:06 +01:00
onyxserpent
0d55ba0e3e Redoing that stupid fix mobile/small screen thing 
Conflicts:
	app/assets/stylesheets/themes/default/layout/_body.scss
 2015-04-07 23:07:32 +01:00
Luke Barratt
f79969b1d4 Squashed commit of the following: 
commit 752ddcdc5f
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Apr 4 09:10:05 2015 -0700

    Redoing that stupid fix mobile/small screen thing

commit b5d003855d
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Oct 11 16:55:09 2014 -0700

    Kludge fix for boldness

commit 31cb2ba6a0
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Oct 11 01:26:08 2014 -0700

    Put the bold hack thing here.

commit 888062726e
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Oct 11 01:25:36 2014 -0700

    Actually didn't want the hack here.

commit 8c8c5b8819
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Oct 11 01:15:12 2014 -0700

    Moved the bold hack to here

commit b57c982779
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Sat Oct 11 01:12:32 2014 -0700

    Moving the bold hack

commit 26cee800f6
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:28:33 2014 -0700

    Possibly fixing font weight issues in OSX Firefox

commit 6afa73dc91
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:25:35 2014 -0700

    Reverting font weight changes

commit 2269fcbb8a
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:25:00 2014 -0700

    Reverting font weight changes

commit cbcf30daff
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:24:33 2014 -0700

    Reverting font weight changes

commit fe3424b79a
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:23:53 2014 -0700

    Reverting font weight changes

commit e0b6c15c90
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:22:53 2014 -0700

    Reverting font weight changes

commit f5d00cc2fc
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:20:58 2014 -0700

    Reverting font weight changes

commit 77bff486f0
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:19:01 2014 -0700

    Reverting font weight changes

commit 1f954206de
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Thu Oct 9 20:18:13 2014 -0700

    Reverting font weight changes

commit 0b843d9fd8
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:32:50 2014 -0700

    Fixes wrapping issues with small screens/mobile

    Theoretically should work this time.  Initially put the code int he wrong CSS class.

commit 3f3e705387
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:23:26 2014 -0700

    Fixed incorrect font useage

commit d13e460bf7
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:17:35 2014 -0700

    Copying font weight changes

commit a765901ab5
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:16:50 2014 -0700

    Copying font weight changes

commit 97c664ec81
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:16:15 2014 -0700

    Copying font weight changes

commit 9c4631fc23
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:13:39 2014 -0700

    Copying font weight changes

commit 819ffb5077
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:12:43 2014 -0700

    Copying font weight changes

commit 36dd502310
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:11:05 2014 -0700

    Copying font weight changes

commit 5d669ef7f5
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:10:23 2014 -0700

    Copying font weight changes

commit 2467c186ff
Author: onyxserpent <jkanne@onyxserpent.com>
Date:   Mon Sep 29 18:09:26 2014 -0700

    Copying font weight changes
 2015-04-07 23:04:43 +01:00
simplefl
7d889b67f1 More charackters from map are shown in gather. 2015-04-06 23:28:35 +02:00
simplefl
8832030034 Use base-font in sidebar as default. 2015-04-06 22:30:36 +02:00
simple
e97e72cf59 Merge branch 'master' of https://github.com/ENSL/ensl.org 2015-04-06 17:21:40 +02:00
simple
248e06b1a2 Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +02:00
Ari Timonen
07fe0fc660 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
6f0e8f2a0f Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
4a35b6bbee Merge fixes 2015-04-03 23:55:22 +03:00
Ari Timonen
f7d7c429da Fix timezone parsing for google calendar 2015-04-02 04:01:41 +03: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
fb7d36146e Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
756da67058 Catch RecordNotFound exception 2014-10-11 19:39:14 -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
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
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
38e2da1bf3 Update rules article constant 2014-09-27 19:21:25 +01:00
Luke Barratt
89b3e94728 Update rules article constant 2014-09-27 19:11:19 +01:00
Luke Barratt
94840f5623 Hotfix: Rollback rules url helper 2014-08-29 00:21:23 +01:00
Luke Barratt
a8e6d20027 Hotfix: Rollback rules url helper 2014-08-28 23:43:15 +01:00
Luke Barratt
a081c910bd Tweak font weights 2014-08-28 23:33:35 +01:00
Luke Barratt
72ce102958 Fixes invalid CSS syntax 2014-08-28 23:13:07 +01: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
086e3ade83 Fixes forum topic ordering by latest post 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
8c4dd7b5e3 Bump ruby to 2.1.2 
See:

http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
 2014-08-28 23:04:17 +01:00
Luke Barratt
1f4f26a5c9 Fixes body background 2014-08-28 23:04:17 +01:00
Luke Barratt
4f6cc69611 Added steam profile lookup API endpoint 2014-08-28 22:42:00 +01:00
onyxserpent
111da6b5e3 Font changes to forum thread list (theoretically) 2014-08-12 23:30:21 -07:00
onyxserpent
ffccea6c76 Shoutbox rearrangement 2014-08-10 17:07:12 -07:00
onyxserpent
949bf54e8a Shoutbox rearrangement 2014-08-10 17:07:06 -07:00
onyxserpent
7d29079430 Fixed naming conventions 2014-08-10 16:41:32 -07:00