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

265 commits

This branch
This branch
All branches
Author SHA1 Message Date
cblanc
1a0100db20 Cleanup: move out js, require_self shouldnt be necessary 2015-05-06 00:04:41 +01:00
cblanc
46e30e8a4c Updated test for expected ban behaviour 2015-05-05 22:51:26 +01:00
cblanc
79375b4474 Bundle installed 2015-05-05 22:51:10 +01:00
cblanc
165267c571 Added test to find out how banning works 2015-05-05 22:43:54 +01:00
cblanc
3bd72b6ddf render_shoutmsgs never invoked 2015-05-05 20:35:54 +01:00
Luke Barratt
b1d8d65ccf Merge pull request #14 from ENSL/feature/pretty-test-output 
Added colour and documentaton style formatting to RSpec output to improve readability
 2015-05-02 23:51:49 +01:00
Luke Barratt
25143d21f9 Addec colour and documentaton style formatting to RSpec output to improve readability 2015-05-02 23:46:16 +01:00
simplefl
49606e2159 Merge pull request #13 from cblanc/error_page_fix 
Fix error page for when the 404 is user not found
 2015-05-02 20:35:03 +02:00
cblanc
05b02a3d31 Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
simplefl
fabcbf5900 Pump rmagick to 2.13.4. 2015-04-28 17:51:22 +02:00
simplefl
6082103a17 Display channel password on gather page. 2015-04-28 17:46:47 +02:00
simplefl
9caf75862e Merge pull request #11 from cblanc/shoutbox_quick_fix 
Shoutbox quick fix
 2015-04-28 17:46:09 +02:00
cblanc
f9ca91b6cf Move shoutmsg polling invocation to instances where shoutbox is available 2015-04-27 23:36:27 +01:00
cblanc
ad3bab8820 Added some simple integration tests for shout messages 2015-04-27 23:32:27 +01:00
cblanc
3a95dd53e3 Cleanup 2015-04-26 11:36:18 +01:00
cblanc
d910e65602 Update poltergeist (current version uses out of date phantomjs) 2015-04-26 11:35:02 +01:00
cblanc
5b9047341c Ignore gemsets and directory env variables 2015-04-26 11:34:37 +01:00
Luke Barratt
aef219dfc6 Merge branch 'feature/ci-improvements' into develop 
Conflicts:
	.travis.yml
 2015-04-25 23:31:33 +01:00
Luke Barratt
8f73a18500 Stub Google Calendar's JSON response globally for each spec 2015-04-25 23:15:10 +01:00
Luke Barratt
ee0f92262d Show CircleCI's status badge in README.md 2015-04-25 22:40:09 +01:00
Luke Barratt
e61c9fbf76 Fixes Google Calendar feed test. Use the current timezone when checking for DST. 2015-04-25 22:35:01 +01:00
simplefl
ee40ff53e5 Merge pull request #8 from cblanc/master 
Bumping ruby version to fix travis build error
 2015-04-25 21:07:37 +02:00
cblanc
f363c29260 Bumping ruby version to fix travis build error 2015-04-25 19:55:56 +01:00
simplefl
79a32c5095 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
Luke Barratt
faefc55457 Remove travis config. Added CircleCI config. 2015-04-12 10:42:34 +01:00
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