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
239 commits 19 branches 0 tags 55 MiB
Commit graph

239 commits

This branch
This branch
All branches
Author SHA1 Message Date
simplefl
68f24bef9f 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
adbd4554d2 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
onyxserpent
332084334d 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
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
89f0cdedaf 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
onyxserpent
75a34b2ba4 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
11e72701cf 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
Luke Barratt
24aa48f21b Merge branch 'hotfix/header-opacity' 2015-04-08 09:49:30 +01: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
40b4359b41 Merge branch 'feature/ui-improvements' into develop 2015-04-08 09:22:55 +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
Luke Barratt
6b47c1e06f Merge branch 'onyxserpent' into feature/ui-improvements 2015-04-07 23:04:53 +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
7ec4af9d1b Update rbenv_ruby to 2.1.5 for deployments. Bump puma webserver version. 2015-04-07 21:19:25 +01:00
Luke Barratt
654eb07f38 Bump Ruby version to 2.1.5 2015-04-07 20:46:19 +01:00
simplefl
f4774fa22f 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
simple
cd89af7885 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
Ari Timonen
eb3f260f01 Fix gather music to old one 2015-04-06 01:09:36 +03:00
onyxserpent
752ddcdc5f Redoing that stupid fix mobile/small screen thing 2015-04-04 09:10:05 -07:00
Ari Timonen
cec4b1b732 Downgrade ruby for compatibility 2015-04-04 16:44:12 +03:00
Ari Timonen
3f9ca0a4da 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
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
eee227cef5 Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
Luke Barratt
cd6dcf7d26 Please please work travis :( 2014-10-12 12:02:13 +01:00
Luke Barratt
5664dd7081 Remove hacky before hook. Specify js: :true for javascript driver tests explicitly. Attempt to cache bundler on travis again. 2014-10-12 11:46:58 +01:00
Luke Barratt
4d3ba9e4d1 More travis guesswork :( 
http://stackoverflow.com/questions/20713471/capybaraelementnotfound-on-all-specs-only-on-travis
 2014-10-12 11:29:37 +01:00
Luke Barratt
b798c5b117 Fixes weird inconsistency causing a failed test using poltergeist on timecop 2014-10-12 10:58:52 +01:00
Jamal Fanaian
15763ae538 Merge pull request #7 from jamal/develop 
Catch RecordNotFound exception
 2014-10-11 20:22:06 -04:00
onyxserpent
b5d003855d Kludge fix for boldness 2014-10-11 16:55:09 -07:00
jamal
06f11232da Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
Luke Barratt
748df2c0a4 Merge remote-tracking branch 'jamal/fix-comm-confirm' into develop 2014-10-11 23:33:04 +01: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
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
d2b70f4261 Merge remote-tracking branch 'jamal/develop' into develop 2014-10-11 23:11:06 +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
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
onyxserpent
31cb2ba6a0 Put the bold hack thing here. 2014-10-11 01:26:08 -07:00
onyxserpent
888062726e Actually didn't want the hack here. 2014-10-11 01:25:36 -07:00
onyxserpent
8c8c5b8819 Moved the bold hack to here 2014-10-11 01:15:12 -07:00