ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-29 05:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
1276 commits 19 branches 0 tags 55 MiB
Commit graph

1276 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
1583988984 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
Luke Barratt
dc88b78739 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
simplefl
d1986abeca 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
cblanc
932652a726 Fix error page for when the 404 is user not found 2015-05-02 18:07:10 +01:00
simplefl
8088286691 Add steam group link to gather page. 2015-05-01 00:48:51 +02:00
simplefl
150416730d Add steam group link to gather page. 2015-05-01 00:48:51 +02:00
simplefl
fabcbf5900 Pump rmagick to 2.13.4. 2015-04-28 17:51:22 +02:00
simplefl
b6d932310f 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
da6024f162 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
simplefl
fbf55f27ae 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
d268eedc60 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
f87fc9ae58 Added some simple integration tests for shout messages 2015-04-27 23:32:27 +01:00
simplefl
41287a4571 Display channel password on gather page. 2015-04-27 20:56:50 +02:00
simplefl
42e8456fac Display channel password on gather page. 2015-04-27 20:56:50 +02:00
cblanc
3a95dd53e3 Cleanup 2015-04-26 11:36:18 +01:00
cblanc
699b5c612f 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
4b30970dde 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
cblanc
6e14348d16 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
e6545e74dc 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
2719fe499d 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
2fd9266a62 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
Luke Barratt
f55a1f8401 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
simplefl
93a712b4d1 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
cblanc
65c027cddd 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
2d7d8b7e4b 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
simplefl
d2841680b0 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
Luke Barratt
e364deaa52 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
cd20fe63d1 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
77d59cb2af Add staff? to user model. 2015-04-11 15:37:47 +02:00