ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-30 14:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
1192 commits 19 branches 0 tags 55 MiB
Commit graph

612 commits

Author SHA1 Message Date
simplefl
94bbece2d6 Merge pull request #55 from ENSL/develop 
Develop
 2015-09-06 11:58:31 +02:00
Chris Blanchard
d4db1aafdf Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
c51ec2447c Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
fc7dd7286e Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
a5cfa4df74 Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
bafb67f702 Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Chris Blanchard
e0eaa89fbf Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Luke Barratt
2901f815e4 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
Luke Barratt
6b6de118e1 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
Chris Blanchard
66fc2c3220 Return steamid to users api 2015-08-30 15:58:06 +01:00
Chris Blanchard
22df398bae Return steamid to users api 2015-08-30 15:58:06 +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
f05f072f1c Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
0d090f78c3 Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
8032c8e93e Account goes to user profile 2015-08-27 11:58:16 +01:00
Chris Blanchard
14eebf985e Account goes to user profile 2015-08-27 11:58:16 +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
simplefl
817f32ce90 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
simplefl
f652536307 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
Luke Barratt
7738c2b845 Fold legacy has_view_count plugin into lib 2015-08-23 15:43:40 +01:00
Luke Barratt
e3f0a79479 Fold acts_as_rateable plugin into lib 2015-08-23 13:25:41 +01:00
Luke Barratt
4d04c47251 Fold in acts_as_readable plugin into lib so that it's loaded properly 2015-08-23 12:06:27 +01:00
Luke Barratt
f8fd66e152 Use steam-condenser from GitHub source again to avoid issues with Constant collisions 2015-08-23 11:25:35 +01:00
Luke Barratt
48dc948fc0 Merge branch 'develop' into feature/rails-4 2015-08-23 11:00:14 +01:00
Chris Blanchard
eecabbf1e6 Hound 2015-08-22 11:53:26 +01:00
Chris Blanchard
4cfa9a7e0d Hound 2015-08-22 11:53:26 +01:00
Chris Blanchard
9ba7f4b0d1 Add filter to recent topics 2015-08-22 10:48:08 +01:00
Chris Blanchard
4377d07095 Add filter to recent topics 2015-08-22 10:48:08 +01:00
Chris Blanchard
a0318805e7 Annotate & fix style 2015-08-20 19:36:01 +01:00
Chris Blanchard
5948364ec2 Annotate & fix style 2015-08-20 19:36:01 +01:00
Chris Blanchard
5f53893756 Added forumer exclusion on recent_topics 2015-08-20 19:33:22 +01:00
Chris Blanchard
5bde263e8c Added forumer exclusion on recent_topics 2015-08-20 19:33:22 +01:00
Chris Blanchard
53110c9aa4 Scope no longer used 2015-08-20 17:21:56 +01:00
Chris Blanchard
19b5679ff3 Scope no longer used 2015-08-20 17:21:56 +01:00
Chris Blanchard
a68bdd3de7 Remove inefficient scope 2015-08-20 17:01:42 +01:00
Chris Blanchard
70171dfbbd Remove inefficient scope 2015-08-20 17:01:42 +01:00
Chris Blanchard
8074f0c3aa Style fix 2015-08-20 16:35:25 +01:00
Chris Blanchard
efc75736dd Style fix 2015-08-20 16:35:25 +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
Chris Blanchard
46b0084e81 Add more efficient recent topics class method 2015-08-20 16:20:40 +01:00
Chris Blanchard
551520dc73 Add more efficient recent topics class method 2015-08-20 16:20:40 +01:00
Chris Blanchard
2665df6b71 Fix style 2015-08-17 19:16:32 +01:00
Chris Blanchard
25479aa4a4 Fix style 2015-08-17 19:16:32 +01:00
Chris Blanchard
a3d9f5bc06 Invalid steam ids on the users API now returns null for steam attributes 2015-08-17 19:06:47 +01:00
Chris Blanchard
c7a81d8e75 Invalid steam ids on the users API now returns null for steam attributes 2015-08-17 19:06:47 +01:00
Chris Blanchard
e6f05374d3 Added id to users API index method 2015-08-17 18:55:03 +01:00
Chris Blanchard
80c733143b Added id to users API index method 2015-08-17 18:55:03 +01:00
Luke Barratt
929ab276a0 Update steam-condenser gem to use the latest published version from rubgems 2015-08-15 23:37:45 +01:00
Luke Barratt
453874b630 Read country code from I18n gem 2015-08-15 23:30:34 +01:00
Luke Barratt
ed95f1b3c7 Use i18n_country_select instead of country_code_select 2015-08-15 20:34:50 +01:00
Luke Barratt
320fc67e4c Removes outdated acts_as_versioned plugin in favour of an updated version extracted from Redmine 2015-08-15 20:28:21 +01:00
Luke Barratt
54e4c6a4bb Removed potentially dangerous regex warning 2015-08-15 20:26:57 +01:00
Chris Blanchard
6dfcc0114f Remove IP address data from users plugin 2015-08-15 13:30:39 +01:00
Chris Blanchard
a6c7e5e592 Remove IP address data from users plugin 2015-08-15 13:30:39 +01:00
Chris Blanchard
d6e317b6f0 Added team information to usre 2015-08-01 17:05:17 +01:00
Chris Blanchard
4a3634601b Added team information to usre 2015-08-01 17:05:17 +01:00
Chris Blanchard
3f1077dff8 Added ban information to user api 2015-08-01 16:44:39 +01:00
Chris Blanchard
beb3470bb9 Added ban information to user api 2015-08-01 16:44:39 +01:00
Chris Blanchard
3ec284b925 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
cdfea24a87 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
fc98dd3b65 Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
5fae2c46ed Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
b0db658ef6 Added server api 2015-08-01 16:20:49 +01:00
Chris Blanchard
9736ca4d10 Added server api 2015-08-01 16:20:49 +01:00
Chris Blanchard
b4cedd9dc7 Return 404 if user not found 2015-07-22 17:22:38 +01:00
Chris Blanchard
7a18fd2ec2 Return 404 if user not found 2015-07-22 17:22:38 +01:00
Chris Blanchard
a351b03754 Added additional data to users json api 2015-07-21 14:27:33 +01:00
Chris Blanchard
17dc8854fd Added additional data to users json api 2015-07-21 14:27:33 +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
7b9bb64b8b Fix access check bug 2015-06-22 00:43:16 +03:00
Ari Timonen
c56ff6fff5 Fix access check bug 2015-06-22 00:43:16 +03: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
Chris Blanchard
6c0d20df50 Restore render out method 2015-06-15 23:44:24 +01:00
Chris Blanchard
dda68059dc Restore render out method 2015-06-15 23:44:24 +01:00
Chris Blanchard
ddf55aae4e Bring back user plugin 2015-06-15 23:16:59 +01:00
Chris Blanchard
a42547d227 Bring back user plugin 2015-06-15 23:16:59 +01: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
Christopher Blanchard
ad50f26497 Fix for can_create? weirdness 2015-06-07 10:20:23 +01:00
Christopher Blanchard
9cd652c3bf Fix for can_create? weirdness 2015-06-07 10:20:23 +01:00
Christopher Blanchard
a1ce779cae Added initial issue specs 2015-06-07 00:26:09 +01:00
Christopher Blanchard
b919600663 Added initial issue specs 2015-06-07 00:26:09 +01: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
e933324369 Merge pull request #21 from cblanc/remove_plugins 
Revoke banhammers
 2015-05-26 18:58:49 +02:00
simplefl
055f896c3f Merge pull request #21 from cblanc/remove_plugins 
Revoke banhammers
 2015-05-26 18:58:49 +02: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
Christopher Blanchard
153d081843 Remove plugins all hush like 2015-05-22 14:17:28 +01:00
Christopher Blanchard
cd2c421f0f Remove plugins all hush like 2015-05-22 14:17:28 +01:00
Christopher Blanchard
50c12b828f Rerun annotate on server spec 2015-05-22 14:17:07 +01:00
Christopher Blanchard
3aa865e1c9 Rerun annotate on server spec 2015-05-22 14:17:07 +01:00
Christopher Blanchard
062c9df682 Remove unrouted controller method 2015-05-22 14:04:15 +01:00
Christopher Blanchard
60e5279d2a Remove unrouted controller method 2015-05-22 14:04:15 +01:00
Christopher Blanchard
85f4baab3c Remove unusued 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
829c96709b Removed unused accessors and validation 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
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
cblanc
4606762389 Remove rcon from log model 2015-05-18 17:24:18 +01:00
cblanc
032b21874a Remove rcon from log model 2015-05-18 17:24:18 +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
5a39c3cd07 Create new annotations for models 2015-05-14 17:29:16 +01:00
cblanc
fdfd582846 Create new annotations for models 2015-05-14 17:29:16 +01:00
cblanc
b4273b5149 Indentation 2015-05-14 17:29:05 +01:00
cblanc
dd29d92af0 Indentation 2015-05-14 17:29:05 +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
5ee2f66442 hltvs not used in index template 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
c9f0b51f54 save never invoked 2015-05-14 14:25:27 +01:00
cblanc
3ccca2fda0 save never invoked 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
cblanc
4a9a19e8e6 Remove methods which are never invoked 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
efde67c19d Remove methods not defined on routes 2015-05-14 14:25:26 +01:00
cblanc
bb507623fd Remove methods not defined on routes 2015-05-14 14:25:26 +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
2d8bf792f7 Listen on both keyup and change events 2015-05-09 16:36:50 +01:00
cblanc
a97e310528 Listen on both keyup and change events 2015-05-09 16:36:50 +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
d6eba921f6 Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:05:03 +01:00
cblanc
5f06775a26 Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:05:03 +01:00
cblanc
1a0100db20 Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:04:41 +01:00
cblanc
44109675ae Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:04:41 +01:00
cblanc
3bd72b6ddf render_shoutmsgs never invoked 2015-05-05 20:35:54 +01:00
cblanc
0485cbaf8a render_shoutmsgs never invoked 2015-05-05 20:35:54 +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
cblanc
3a95dd53e3 Cleanup 2015-04-26 11:36:18 +01:00
cblanc
699b5c612f Cleanup 2015-04-26 11:36:18 +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
4284366680 Add staff? to user model. 2015-04-11 15:37:47 +02:00
simplefl
77d59cb2af Add staff? to user model. 2015-04-11 15:37:47 +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
onyxserpent
332084334d Added .sticky class 2015-04-09 10:52:14 -07:00
onyxserpent
899502c8c1 Added .sticky class 2015-04-09 10:52:14 -07: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
20276bb710 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
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
89f0cdedaf Fix up/down moving. 2015-04-09 15:49:35 +02:00
simplefl
0c00697ed0 Fix up/down moving. 2015-04-09 15:49:35 +02:00
simplefl
17efc2ec80 Fix forum access rules. 2015-04-09 13:44:30 +02:00
simplefl
5330f10a12 Fix forum access rules. 2015-04-09 13:44:30 +02:00
onyxserpent
75a34b2ba4 Fixed too bold links by avatar 2015-04-08 10:14:15 -07:00
onyxserpent
1560d569f7 Fixed too bold links by avatar 2015-04-08 10:14:15 -07:00
onyxserpent
6e92b65872 Fixed wrapping issue 2015-04-08 09:57:42 -07:00
onyxserpent
a28d43f384 Fixed wrapping issue 2015-04-08 09:57:42 -07:00
onyxserpent
11e72701cf Fixed broken new topic buttons, unread boldness 2015-04-08 09:56:33 -07:00
onyxserpent
63c04655a8 Fixed broken new topic buttons, unread boldness 2015-04-08 09:56:33 -07:00
onyxserpent
ea36fd1a76 Fixed h# a being too bold 2015-04-08 09:44:31 -07:00
onyxserpent
0457986ec0 Fixed h# a being too bold 2015-04-08 09:44:31 -07:00
Luke Barratt
9f9676e7af Hotfix: Added clear: both to headings to fix side effects of opacity: 0.99 2015-04-08 09:49:06 +01: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
ac8e8174e9 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
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
7d26a92a08 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
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
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
simplefl
57d2b4931d Use base-font in sidebar as default. 2015-04-06 22:30:36 +02:00
simplefl
8832030034 Use base-font in sidebar as default. 2015-04-06 22:30:36 +02:00
simple
cd89af7885 Merge branch 'master' of https://github.com/ENSL/ensl.org 2015-04-06 17:21:40 +02:00
simple
e97e72cf59 Merge branch 'master' of https://github.com/ENSL/ensl.org 2015-04-06 17:21:40 +02:00
simple
61e06ea89b Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +02:00
simple
248e06b1a2 Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +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
Ari Timonen
0379c0bbcc Merge fixes 2015-04-03 23:55:22 +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
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
eee227cef5 Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
fb7d36146e Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
06f11232da Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
jamal
756da67058 Catch RecordNotFound exception 2014-10-11 19:39:14 -04: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
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
onyxserpent
f3805a5d56 Font changes 2014-08-10 16:39:53 -07:00
onyxserpent
2362961d76 Fixes wrapping issues with small screens/mobile 2014-08-10 16:34:26 -07:00
onyxserpent
45e4a092d4 Font changes 2014-08-10 16:30:21 -07:00
onyxserpent
3b19c18b0f Update _forums.scss 
Font face changes
 2014-08-10 16:28:52 -07:00
onyxserpent
cb02b292e8 Update _news.scss 
Font face changes
 2014-08-10 16:28:14 -07:00
onyxserpent
48bb0a7986 Update _variables.scss 
Font face changes
 2014-08-10 16:25:22 -07:00
onyxserpent
129296c059 Update _typography.scss 
Font face changes
 2014-08-10 16:20:50 -07:00
Luke Barratt
aa18af9e6f Check for upcoming matches before showing the calendar 2014-08-11 00:10:40 +01:00
Luke Barratt
3f92e6e39a Added site layout configuration for users 2014-08-10 23:56:18 +01:00
Luke Barratt
ff740787b5 Remove TS3 Password 2014-08-10 23:52:01 +01:00
Luke Barratt
7f1fa1d154 Fixes forum topic ordering by latest post 2014-08-10 20:41:05 +01:00
Luke Barratt
fe230399e7 Fixes error when viewing team pages when not logged in 2014-08-10 18:33:48 +01:00
Ari Timonen
f7d846b469 Fix rules 2014-08-10 17:50:45 +01:00
Luke Barratt
86a278319a 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-10 17:42:51 +01:00
Ari Timonen
4f98a0ae04 Fix rules 2014-07-01 14:39:40 +03:00
Luke Barratt
e60cdb2039 Fixes body background 2014-06-20 10:35:29 +01:00
Ari Timonen
1a02abbf5b Make versions private for privacy reasons 2014-06-10 13:34:43 +03: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
df07a5d8ba Fixes menu appearing behind forums z-index 2014-05-11 10:11:23 +01:00
Luke Barratt
caeb9be494 Fixes forums z-index appearing under logo 
Fixes view count cache
 2014-05-10 15:07:54 +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
b25de09997 Wrap long messages in the shoutbox 2014-05-10 14:12:22 +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
c9922409ad Fixed impact font weightings in Windows 2014-05-06 23:59:31 +01:00
Luke Barratt
d671946c3b Improve text legibility in sidebar and forums table headers 2014-05-06 22:45:15 +01:00
Luke Barratt
644ffb41ef Added forum styling 
Improvements to sizing/spacing
 2014-05-04 12:53:47 +01:00
Luke Barratt
bc711fbdb0 Reduce schedule event spacing 2014-05-04 00:36:02 +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