Commit graph

220 commits

Author SHA1 Message Date
cblanc
d50e4d0f5c Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
simplefl
a7c0a443ee Display channel password on gather page. 2015-04-28 17:46:47 +02:00
cblanc
865ba6c477 Move shoutmsg polling invocation to instances where shoutbox is available 2015-04-27 23:36:27 +01:00
cblanc
466d180328 Cleanup 2015-04-26 11:36:18 +01:00
simplefl
db53efadec Add gather spreadsheet links to gather page. 2015-04-19 12:04:27 +02:00
simplefl
7a8baa83c7 Remove unloading hook from gather because its triggered to often. 2015-04-16 19:38:26 +02:00
simplefl
2cc522230c Add twitter and steam to nav bar. 2015-04-11 18:35:25 +02:00
simplefl
1b88c9f149 Add staff? to user model. 2015-04-11 15:37:47 +02:00
simplefl
17e421235b Staff is more important then ref and caster on posts. 2015-04-11 15:31:11 +02:00
simplefl
f909212c45 Add group name and task to posts. 2015-04-11 12:34:52 +02:00
onyxserpent
5bf3832c82 Added .sticky class 2015-04-09 10:52:14 -07:00
simplefl
d7e95509c1 Add sticky class to topic links. 2015-04-09 19:23:29 +02:00
simplefl
adfaabdf3d 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
d9c7e05e41 Fix up/down moving. 2015-04-09 15:49:35 +02:00
simplefl
35502d97d5 Fix forum access rules. 2015-04-09 13:44:30 +02:00
onyxserpent
b3542ecd6f Fixed too bold links by avatar 2015-04-08 10:14:15 -07:00
onyxserpent
668c0d2409 Fixed wrapping issue 2015-04-08 09:57:42 -07:00
onyxserpent
ba7c2de699 Fixed broken new topic buttons, unread boldness 2015-04-08 09:56:33 -07:00
onyxserpent
8449d40998 Fixed h# a being too bold 2015-04-08 09:44:31 -07:00
Luke Barratt
e8ae79a5fd Hotfix: Added clear: both to headings to fix side effects of opacity: 0.99 2015-04-08 09:49:06 +01:00
onyxserpent
5576d65d15 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
5dd7303b94 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
20bcc82586 More charackters from map are shown in gather. 2015-04-06 23:28:35 +02:00
simplefl
68039ffc2e Use base-font in sidebar as default. 2015-04-06 22:30:36 +02:00
simple
9c3bf79f05 Merge branch 'master' of https://github.com/ENSL/ensl.org 2015-04-06 17:21:40 +02:00
simple
fbc032677c Fix calender. Events that are to old are filtered now. 2015-04-06 17:19:53 +02:00
Ari Timonen
af36d3a685 Fix gather music to old one 2015-04-06 01:09:36 +03:00
Ari Timonen
75658ea983 Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
9f921d60e9 Merge fixes 2015-04-03 23:55:22 +03:00
Ari Timonen
52e840a041 Fix timezone parsing for google calendar 2015-04-02 04:01:41 +03:00
jamal
9642c478bb 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
09669fb7c7 Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
jamal
e1b27ba247 Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
jamal
3ef9c72a4c Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
Luke Barratt
0895072845 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
aa0d0673b6 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
450f821232 Disable leave confirm when voting for map or server 2014-10-11 10:04:16 -04:00
jamal
3589e226d3 Fix double confirm when you click the 'Leave Gather' button 2014-10-11 09:13:07 -04:00
jamal
6c2348bcb6 Add state to gatherers and track when a gatherer has left or is away 2014-10-10 20:50:17 -04:00
Luke Barratt
eba5ec0baa Update rules article constant 2014-09-27 19:21:25 +01:00
Luke Barratt
2535d5bc7a Update rules article constant 2014-09-27 19:11:19 +01:00
Luke Barratt
fa4cf67322 Hotfix: Rollback rules url helper 2014-08-29 00:21:23 +01:00
Luke Barratt
127b5f6308 Hotfix: Rollback rules url helper 2014-08-28 23:43:15 +01:00
Luke Barratt
eeab976147 Tweak font weights 2014-08-28 23:33:35 +01:00
Luke Barratt
8c9452dba9 Fixes invalid CSS syntax 2014-08-28 23:13:07 +01:00
Luke Barratt
4b9f2e6d84 Added steam profile lookup API endpoint 2014-08-28 23:04:18 +01:00
Luke Barratt
b97b3173bc Check for upcoming matches before showing the calendar 2014-08-28 23:04:18 +01:00
Luke Barratt
a83b5bc0f8 Added site layout configuration for users 2014-08-28 23:04:18 +01:00
Luke Barratt
3d0bda0a92 Remove TS3 Password 2014-08-28 23:04:18 +01:00
Luke Barratt
230c6fe847 Fixes forum topic ordering by latest post 2014-08-28 23:04:18 +01:00
Luke Barratt
29dc3e0e29 Fixes error when viewing team pages when not logged in 2014-08-28 23:04:17 +01:00
Luke Barratt
4c79ac4a75 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
f287de542b Fixes body background 2014-08-28 23:04:17 +01:00
Luke Barratt
a676d4c423 Added steam profile lookup API endpoint 2014-08-28 22:42:00 +01:00
onyxserpent
2be656bcd1 Font changes to forum thread list (theoretically) 2014-08-12 23:30:21 -07:00
onyxserpent
d28749605b Shoutbox rearrangement 2014-08-10 17:07:12 -07:00
onyxserpent
f3e0e0e71b Shoutbox rearrangement 2014-08-10 17:07:06 -07:00
onyxserpent
62f1a2b11f Fixed naming conventions 2014-08-10 16:41:32 -07:00
onyxserpent
c25ef8aea0 Font changes 2014-08-10 16:39:53 -07:00
onyxserpent
5ff88d1e7b Fixes wrapping issues with small screens/mobile 2014-08-10 16:34:26 -07:00
onyxserpent
ae042996dc Font changes 2014-08-10 16:30:21 -07:00
onyxserpent
640142a4d8 Update _forums.scss
Font face changes
2014-08-10 16:28:52 -07:00
onyxserpent
1218cb9692 Update _news.scss
Font face changes
2014-08-10 16:28:14 -07:00
onyxserpent
d23d8351ca Update _variables.scss
Font face changes
2014-08-10 16:25:22 -07:00
onyxserpent
d881e8afac Update _typography.scss
Font face changes
2014-08-10 16:20:50 -07:00
Luke Barratt
68b6c15b4f Check for upcoming matches before showing the calendar 2014-08-11 00:10:40 +01:00
Luke Barratt
eee3c1c905 Added site layout configuration for users 2014-08-10 23:56:18 +01:00
Luke Barratt
7d21773546 Remove TS3 Password 2014-08-10 23:52:01 +01:00
Luke Barratt
d40e0e4c46 Fixes forum topic ordering by latest post 2014-08-10 20:41:05 +01:00
Luke Barratt
8b3850acf8 Fixes error when viewing team pages when not logged in 2014-08-10 18:33:48 +01:00
Ari Timonen
73bb575982 Fix rules 2014-08-10 17:50:45 +01:00
Luke Barratt
f2ab3482fd 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
23bc4b4186 Fix rules 2014-07-01 14:39:40 +03:00
Luke Barratt
e2cb0fe8aa Fixes body background 2014-06-20 10:35:29 +01:00
Ari Timonen
bca05d166b Make versions private for privacy reasons 2014-06-10 13:34:43 +03:00
Luke Barratt
b2804bc941 Fixes linking to latest posts in forums 2014-06-06 22:37:43 +01:00
Luke Barratt
ad41e91c19 Fixes word wrapping issues 2014-06-06 21:10:37 +01:00
Luke Barratt
73c395e570 Prefer 1.9 hash syntax
Remove unused log entries?
2014-05-19 21:44:47 +01:00
Room5-Joey
9adf362f6b 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
062d00c072 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
028fe33941 Fixes updating contests 2014-05-19 20:51:32 +01:00
Luke Barratt
f41e6e0d5a 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
1a4a0f4d83 Update favicon and titles 2014-05-16 22:25:40 +01:00
Luke Barratt
7bd375b667 Merge in alternate CSS 2014-05-16 22:10:24 +01:00
Luke Barratt
8852813d23 Isolate design CSS 2014-05-11 11:27:59 +01:00
Luke Barratt
7dbf81696d Fixes menu appearing behind forums z-index 2014-05-11 10:11:23 +01:00
Luke Barratt
138fae1c63 Fixes forums z-index appearing under logo
Fixes view count cache
2014-05-10 15:07:54 +01:00
Luke Barratt
7877b20ecc Fixes gather captains not able to pick players
Added missing gather translation
Cleanup JS
2014-05-10 14:52:45 +01:00
Luke Barratt
896014404c Wrap long messages in the shoutbox 2014-05-10 14:12:22 +01:00
Luke Barratt
9156865068 Fixes shoutbox styling 2014-05-10 13:55:40 +01:00
Ari Timonen
314d47b7bf Fix match admin page 2014-05-10 13:02:57 +03:00
Ari Timonen
1577d83fca Add match admin page and casting 2014-05-10 11:52:00 +03:00
Luke Barratt
20c4f4cfc4 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
91f3161eff Fixes firefox rendering issues:
Header z-index
Gather page columns
2014-05-10 01:22:11 +01:00
Luke Barratt
6a1241ac9d Added gather player count
Improved content spacing
Colour tweaks
2014-05-09 22:38:14 +01:00
Luke Barratt
75f3a0d32e Fixed impact font weightings in Windows 2014-05-06 23:59:31 +01:00
Luke Barratt
fc6e36d074 Improve text legibility in sidebar and forums table headers 2014-05-06 22:45:15 +01:00
Luke Barratt
bdb1c9e47f Added forum styling
Improvements to sizing/spacing
2014-05-04 12:53:47 +01:00
Luke Barratt
2912ff0bf3 Reduce schedule event spacing 2014-05-04 00:36:02 +01:00
Luke Barratt
a9139f6080 Added flash notification and header styling 2014-05-04 00:01:36 +01:00