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
472 commits 19 branches 0 tags 55 MiB
Commit graph

472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Blanchard
1dfda71e59 Invalid steam ids on the users API now returns null for steam attributes 2015-08-17 19:06:47 +01:00
Chris Blanchard
ea3fa388a4 Added id to users API index method 2015-08-17 18:55:03 +01:00
Luke Barratt
8285f15587 Merge pull request #41 from ENSL/task/upgrade-ruby 
Task/upgrade ruby
 2015-08-15 19:35:49 +01:00
Luke Barratt
f11da8f7b3 Style guide updates to specs 2015-08-15 19:34:25 +01:00
simplefl
85026b9a7c 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
aa49c56483 Set new session store name and domain for staging 2015-08-15 18:42:44 +01:00
Luke Barratt
326630384c Moved test-unit to the Gemfile to fix issues with activesupport 2015-08-15 17:44:33 +01:00
Luke Barratt
ffc5b071dd Merge branch 'develop' into task/upgrade-ruby 2015-08-15 17:32:35 +01:00
simplefl
46d0756036 Merge pull request #39 from cblanc/remove_ips 
Remove IP data from plugin endpoint
 2015-08-15 14:47:30 +02:00
Chris Blanchard
b6cb2f25b2 Remove IP address data from users plugin 2015-08-15 13:30:39 +01:00
Chris Blanchard
a95dfc25ef Add missing groups 2015-08-15 13:25:44 +01:00
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
c65b3223d9 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
cc0f15b115 Revert session cookie changes in production 2015-08-15 11:48:55 +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
7b76f4fe36 Merge pull request #34 from ENSL/develop 
Develop
 2015-07-21 16:34:27 +02: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