ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-01 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
1041 commits 19 branches 0 tags 55 MiB
Commit graph

1041 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
4d07d8ddc6 Merge pull request #41 from ENSL/task/upgrade-ruby 
Task/upgrade ruby
 2015-08-15 19:35:49 +01:00
Luke Barratt
f778ab6d5d Style guide updates to specs 2015-08-15 19:34:25 +01:00
Luke Barratt
de5d548e50 Style guide updates to specs 2015-08-15 19:34:25 +01:00
simplefl
7a6bd18d1a Merge pull request #40 from cblanc/staging_session 
Set new session store name and domain for staging
 2015-08-15 19:49:26 +02:00
simplefl
5ea4193e29 Merge pull request #40 from cblanc/staging_session 
Set new session store name and domain for staging
 2015-08-15 19:49:26 +02:00
Chris Blanchard
8544e46380 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Chris Blanchard
c1430343a9 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Luke Barratt
b11db192d7 Moved test-unit to the Gemfile to fix issues with activesupport 2015-08-15 17:44:33 +01:00
Luke Barratt
d819a1cc9e 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
Luke Barratt
3020c98f57 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
simplefl
ec7e42a722 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
a6c7e5e592 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
Chris Blanchard
4b038406f6 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
Luke Barratt
944c55a869 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
simplefl
14c7b9dfcf 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
Chris Blanchard
159388b060 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
simplefl
ec7b259360 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
Chris Blanchard
c16903213d 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
simplefl
2259791752 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
4a3634601b 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
beb3470bb9 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
cdfea24a87 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
5fae2c46ed Ooops 2015-08-01 16:33:40 +01:00
Chris Blanchard
b0db658ef6 Added server api 2015-08-01 16:20:49 +01:00
Chris Blanchard
9736ca4d10 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
simplefl
af59591333 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
Chris Blanchard
7a18fd2ec2 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
c3fccd221f 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
simplefl
91c969a2ec 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
Chris Blanchard
17dc8854fd 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