ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-27 21:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
258 commits 19 branches 0 tags 55 MiB
Commit graph

258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
dbc8845aa0 Addec colour and documentaton style formatting to RSpec output to improve readability 2015-05-13 23:30:29 +02:00
cblanc
1c81af28ba Fix error page for when the 404 is user not found 2015-05-13 23:30:29 +02:00
simplefl
4879e2fd24 Pump rmagick to 2.13.4. 2015-05-13 23:30:29 +02:00
cblanc
34f2fc98c9 Move shoutmsg polling invocation to instances where shoutbox is available 2015-05-13 23:30:29 +02:00
cblanc
4527fb0612 Added some simple integration tests for shout messages 2015-05-13 23:30:29 +02:00
cblanc
37986b665f Cleanup 2015-05-13 23:30:29 +02:00
cblanc
cf31410877 Update poltergeist (current version uses out of date phantomjs) 2015-05-13 23:30:29 +02:00
cblanc
2dd573b4b6 Ignore gemsets and directory env variables 2015-05-13 23:30:29 +02:00
simplefl
d3f45f2934 Add steam group link to gather page. 2015-05-01 00:48:51 +02:00
simplefl
1ca9446bb0 Display channel password on gather page. 2015-04-27 20:56:50 +02:00
Luke Barratt
ac6ca8bb01 Merge branch 'feature/ci-improvements' into develop 
Conflicts:
	.travis.yml
 2015-04-25 23:31:33 +01:00
Luke Barratt
51e04ce055 Stub Google Calendar's JSON response globally for each spec 2015-04-25 23:15:10 +01:00
Luke Barratt
403750ac46 Show CircleCI's status badge in README.md 2015-04-25 22:40:09 +01:00
Luke Barratt
35293eedc7 Fixes Google Calendar feed test. Use the current timezone when checking for DST. 2015-04-25 22:35:01 +01:00
simplefl
f7b813cbd5 Merge pull request #8 from cblanc/master 
Bumping ruby version to fix travis build error
 2015-04-25 21:07:37 +02:00
cblanc
389ce2c2af Bumping ruby version to fix travis build error 2015-04-25 19:55:56 +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
Luke Barratt
570e9e267f Remove travis config. Added CircleCI config. 2015-04-12 10:42:34 +01: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
aa15fbda84 Merge branch 'hotfix/header-opacity' 2015-04-08 09:49:30 +01: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
Luke Barratt
f4f99eea2d Merge branch 'feature/ui-improvements' into develop 2015-04-08 09:22:55 +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
0ca3b487ad Merge branch 'onyxserpent' into feature/ui-improvements 2015-04-07 23:04:53 +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
Luke Barratt
841f346aa4 Update rbenv_ruby to 2.1.5 for deployments. Bump puma webserver version. 2015-04-07 21:19:25 +01:00
Luke Barratt
6e7fa9ced7 Bump Ruby version to 2.1.5 2015-04-07 20:46:19 +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
onyxserpent
075da49bdf Redoing that stupid fix mobile/small screen thing 2015-04-04 09:10:05 -07:00
Ari Timonen
3c68f3f064 Downgrade ruby for compatibility 2015-04-04 16:44:12 +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