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

516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
b11db192d7 Moved test-unit to the Gemfile to fix issues with activesupport 2015-08-15 17:44:33 +01:00
Luke Barratt
96167b55e4 Merge branch 'develop' into task/upgrade-ruby 2015-08-15 17:32:35 +01:00
simplefl
ff48c80dbf Merge pull request #39 from cblanc/remove_ips 
Remove IP data from plugin endpoint
 2015-08-15 14:47:30 +02:00
Chris Blanchard
6dfcc0114f Remove IP address data from users plugin 2015-08-15 13:30:39 +01:00
Chris Blanchard
5a3be391f3 Add missing groups 2015-08-15 13:25:44 +01:00
Luke Barratt
04c66e1bea 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
9c1d52c564 Merge pull request #38 from cblanc/revert_production_store 
Revert session cookie changes in production
 2015-08-15 12:58:33 +02:00
Chris Blanchard
b87a77405e Revert session cookie changes in production 2015-08-15 11:48:55 +01:00
simplefl
b800164cac 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
43514b358e Enable session store across gather domains 2015-08-12 01:54:41 +01:00
simplefl
6923dd8a11 Merge pull request #36 from cblanc/expand_api 
Expand api
 2015-08-01 19:02:48 +02:00
Chris Blanchard
d6e317b6f0 Added team information to usre 2015-08-01 17:05:17 +01:00
Chris Blanchard
3f1077dff8 Added ban information to user api 2015-08-01 16:44:39 +01:00
Chris Blanchard
3ec284b925 Added maps api 2015-08-01 16:34:01 +01:00
Chris Blanchard
fc98dd3b65 Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
b0db658ef6 Added server api 2015-08-01 16:20:49 +01:00
simplefl
0e4ffd5027 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
b4cedd9dc7 Return 404 if user not found 2015-07-22 17:22:38 +01:00
simplefl
bc52992845 Merge pull request #34 from ENSL/develop 
Develop
 2015-07-21 16:34:27 +02:00
simplefl
e5990dea32 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
a351b03754 Added additional data to users json api 2015-07-21 14:27:33 +01:00
simplefl
8301064e3b Bug fix and clean up with nsltv tag. 2015-07-19 12:33:49 +02:00
simplefl
38edef1bb9 Merge 2015-07-18 12:47:57 +02:00
simplefl
6b1f4d1a79 Display nsltv seperated in calender widget. 2015-07-18 12:35:52 +02:00
Ari Timonen
f39ab459f6 Remove tweets, continued 2015-07-02 02:34:58 +03:00
Ari Timonen
d6baebc3bc Remove tweets 2015-07-02 02:34:39 +03:00
simplefl
7cb5142e27 Only admins can change usernames. 2015-06-27 14:25:08 +02:00
Ari Timonen
748fbdb151 Fix access check bug 2015-06-27 14:25:08 +02:00
Ari Timonen
75dfb48026 Remove logging functionality as legacy 2015-06-27 14:25:08 +02:00
simplefl
b742be7982 Only admins can change usernames. 2015-06-27 14:23:37 +02:00
Ari Timonen
7b9bb64b8b Fix access check bug 2015-06-22 00:43:16 +03:00
Ari Timonen
7041c0bbe5 Remove logging functionality as legacy 2015-06-22 00:32:27 +03:00
simplefl
d3d3f5f079 Merge pull request #32 from ENSL/develop 
Develop
 2015-06-16 11:01:17 +02:00
simplefl
a2b7781589 Merge pull request #31 from cblanc/bring_back_render_out 
Restore render out method
 2015-06-16 09:26:28 +02:00
Chris Blanchard
6c0d20df50 Restore render out method 2015-06-15 23:44:24 +01:00
simplefl
eca398c45d Merge pull request #30 from cblanc/bring_back_verify 
Bring back verify
 2015-06-16 00:38:38 +02:00
Chris Blanchard
1c6079ca73 Bring back verify 2015-06-15 23:36:03 +01:00
simplefl
f47d469a7d Merge pull request #29 from cblanc/bring_back_user_plugin 
Bring back user plugin
 2015-06-16 00:22:46 +02:00
Chris Blanchard
ddf55aae4e Bring back user plugin 2015-06-15 23:16:59 +01:00
simplefl
09b110e674 Merge pull request #28 from ENSL/develop 
Up shoutbox timeout.
 2015-06-13 18:05:30 +02:00
simplefl
9112c5c52f Up shoutbox timeout. 2015-06-13 17:53:41 +02:00
simplefl
fd9b62de95 Merge pull request #27 from ENSL/develop 
Develop
 2015-06-12 10:29:21 +02:00
simplefl
6784680ab0 Merge pull request #26 from cblanc/fix_develop 
Fix develop
 2015-06-12 10:28:28 +02:00
simplefl
eee9238259 Up wait_timeout to 90. 2015-06-12 00:11:04 +01:00
Christopher Blanchard
ca21258646 Fix for can_create? weirdness 2015-06-12 00:11:04 +01:00
Christopher Blanchard
c8117b78eb Added issue feature spec 2015-06-12 00:11:04 +01:00
Christopher Blanchard
af94f14fef Added initial issue specs 2015-06-12 00:11:04 +01:00
Chris Blanchard
9fdd2cca44 Add recipient to messages 2015-06-12 00:11:04 +01:00
Chris Blanchard
15ed4e70a9 Remove rcon from annotate and added message model specs 2015-06-12 00:11:04 +01:00
simplefl
bdd7e4336a Add wait_timeout and reconnect to database.ym. 2015-06-12 00:11:04 +01:00