Commit graph

408 commits

Author SHA1 Message Date
Luke Barratt
cef4b0009c Upgrade ruby to 2.2.2. Bump rails to 3.2.22
- Upgrade RSpec to 3.3
- Auto formatted existing specs
- Fixes broken test assertions
- Update capistrano rbenv_ruby to target 2.2.2
- Added test-unit as test dependency as it has been removed form ruby 2.2
2015-08-15 12:50:28 +01:00
simplefl
07df9a8db6 Merge pull request #37 from cblanc/enable_session_store_on_gathers
Enable session store across gather domains
2015-08-12 09:43:31 +02:00
Chris Blanchard
47bfc8d06e Enable session store across gather domains 2015-08-12 01:54:41 +01:00
simplefl
cf2fcd6e89 Merge pull request #36 from cblanc/expand_api
Expand api
2015-08-01 19:02:48 +02:00
Chris Blanchard
cdcf9fedf8 Added team information to usre 2015-08-01 17:05:17 +01:00
Chris Blanchard
f9f4485c95 Added ban information to user api 2015-08-01 16:44:39 +01:00
Chris Blanchard
a3356e57d3 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
a3479a6fb2 Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
03ef45225c Added server api 2015-08-01 16:20:49 +01:00
simplefl
ed3bf229c0 Merge pull request #35 from cblanc/handle_missing_user
Return 404 if user not found
2015-07-22 18:34:47 +02:00
Chris Blanchard
0d3d367dd6 Return 404 if user not found 2015-07-22 17:22:38 +01:00
simplefl
5e82ec72da Merge pull request #33 from cblanc/enrich_api
Added additional data to users json api
2015-07-21 16:33:52 +02:00
Chris Blanchard
519f59a9dc Added additional data to users json api 2015-07-21 14:27:33 +01:00
simplefl
b24f808c48 Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
f943b18c12 Merge 2015-07-18 12:47:57 +02:00
simplefl
7240068463 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
Ari Timonen
c0d66eb7cf Remove tweets, continued 2015-07-02 02:34:58 +03:00
Ari Timonen
fecd0742aa Remove tweets 2015-07-02 02:34:39 +03:00
simplefl
b78056e17a Only admins can change usernames. 2015-06-27 14:25:08 +02:00
Ari Timonen
02d416bcf0 Fix access check bug 2015-06-27 14:25:08 +02:00
Ari Timonen
e2348ec63f Remove logging functionality as legacy 2015-06-27 14:25:08 +02:00
simplefl
94ba3414eb Only admins can change usernames. 2015-06-27 14:23:37 +02:00
Ari Timonen
04e572bb55 Fix access check bug 2015-06-22 00:43:16 +03:00
Ari Timonen
1526aba255 Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
simplefl
fef69bf8a2 Merge pull request #32 from ENSL/develop
Develop
2015-06-16 11:01:17 +02:00
simplefl
1ced323ec3 Merge pull request #31 from cblanc/bring_back_render_out
Restore render out method
2015-06-16 09:26:28 +02:00
Chris Blanchard
2089b86cdf Restore render out method 2015-06-15 23:44:24 +01:00
simplefl
f30f45963c Merge pull request #30 from cblanc/bring_back_verify
Bring back verify
2015-06-16 00:38:38 +02:00
Chris Blanchard
5772badd0e Bring back verify 2015-06-15 23:36:03 +01:00
simplefl
cd2d87d8e9 Merge pull request #29 from cblanc/bring_back_user_plugin
Bring back user plugin
2015-06-16 00:22:46 +02:00
Chris Blanchard
52a8717726 Bring back user plugin 2015-06-15 23:16:59 +01:00
simplefl
9cef500034 Merge pull request #28 from ENSL/develop
Up shoutbox timeout.
2015-06-13 18:05:30 +02:00
simplefl
7b479d9411 Up shoutbox timeout. 2015-06-13 17:53:41 +02:00
simplefl
f419c6ddd9 Merge pull request #27 from ENSL/develop
Develop
2015-06-12 10:29:21 +02:00
simplefl
cabbaf1621 Merge pull request #26 from cblanc/fix_develop
Fix develop
2015-06-12 10:28:28 +02:00
simplefl
72408ce05b Up wait_timeout to 90. 2015-06-12 00:11:04 +01:00
Christopher Blanchard
86f10be085 Fix for can_create? weirdness 2015-06-12 00:11:04 +01:00
Christopher Blanchard
2a993b5148 Added issue feature spec 2015-06-12 00:11:04 +01:00
Christopher Blanchard
27fb08383b Added initial issue specs 2015-06-12 00:11:04 +01:00
Chris Blanchard
e5ec1d5244 Add recipient to messages 2015-06-12 00:11:04 +01:00
Chris Blanchard
47c48b14ef Remove rcon from annotate and added message model specs 2015-06-12 00:11:04 +01:00
simplefl
6b1f3d5999 Add wait_timeout and reconnect to database.ym. 2015-06-12 00:11:04 +01:00
Christopher Blanchard
0bf9d7fc7c Remove unusued methods 2015-06-12 00:11:04 +01:00
Christopher Blanchard
c2d9600c1d Removed for githubs sake 2015-06-12 00:11:04 +01:00
Christopher Blanchard
3147e34968 Remove plugins all hush like 2015-06-12 00:11:04 +01:00
Christopher Blanchard
e622ae1ee1 Added tests for bans 2015-06-12 00:11:03 +01:00
Christopher Blanchard
f82fa31a37 Remove unrouted controller method 2015-06-12 00:11:03 +01:00
Christopher Blanchard
3e4cbdd2f2 Remove unusued method 2015-06-12 00:11:03 +01:00
Christopher Blanchard
087cef15f2 Removed unused accessors and validation 2015-06-12 00:11:03 +01:00
cblanc
98c69b6e9a Remove rcon from test 2015-06-12 00:11:03 +01:00