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

430 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fd579cac40 Merge branch 'hotfix/header-opacity' 2015-04-08 09:49:30 +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
Luke Barratt
0ce692951a Merge branch 'feature/ui-improvements' into develop 2015-04-08 09:22:55 +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
16b2e9c8ff Merge branch 'onyxserpent' into feature/ui-improvements 2015-04-07 23:04:53 +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
Luke Barratt
7f7fdd38d3 Update rbenv_ruby to 2.1.5 for deployments. Bump puma webserver version. 2015-04-07 21:19:25 +01:00
Luke Barratt
91072a22cf Bump Ruby version to 2.1.5 2015-04-07 20:46:19 +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
onyxserpent
752ddcdc5f Redoing that stupid fix mobile/small screen thing 2015-04-04 09:10:05 -07:00
Ari Timonen
0d4820be2e Downgrade ruby for compatibility 2015-04-04 16:44:12 +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
Luke Barratt
66fe0b6e03 Please please work travis :( 2014-10-12 12:02:13 +01:00
Luke Barratt
c9c32335a8 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
d3219d160e 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
8326c81dc5 Fixes weird inconsistency causing a failed test using poltergeist on timecop 2014-10-12 10:58:52 +01:00
Jamal Fanaian
e69f55b409 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
756da67058 Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
Luke Barratt
7852b616d6 Merge remote-tracking branch 'jamal/fix-comm-confirm' into develop 2014-10-11 23:33:04 +01: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
Luke Barratt
d2b70f4261 Merge remote-tracking branch 'jamal/develop' into develop 2014-10-11 23:11:06 +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
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
onyxserpent
b57c982779 Moving the bold hack 2014-10-11 01:12:32 -07:00
Luke Barratt
d0029b118f TravisCI: bundle all gems. Use poltergeist/phantomjs 2014-10-11 08:44:02 +01:00
Luke Barratt
a6566e4e29 Merge remote-tracking branch 'jamal/develop' into develop 2014-10-11 08:26:04 +01:00
Luke Barratt
50da98f12e Update travis: use parallel bundle install and cache dependencies 2014-10-11 08:25:06 +01:00
Luke Barratt
52e2ac4e1c Update travis config 2014-10-11 08:15:39 +01: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
onyxserpent
26cee800f6 Possibly fixing font weight issues in OSX Firefox 2014-10-09 20:28:33 -07:00
onyxserpent
6afa73dc91 Reverting font weight changes 2014-10-09 20:25:35 -07:00
onyxserpent
2269fcbb8a Reverting font weight changes 2014-10-09 20:25:00 -07:00