ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-30 14:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
1148 commits 19 branches 0 tags 55 MiB
Commit graph

1148 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
6b6de118e1 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
Luke Barratt
a8cdbb932e Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
fbf82b6948 Replace crazy NewRelic config template with a simple one 2015-08-31 16:21:16 +01:00
Luke Barratt
da28408cb8 Bumped NewRelic gem version 2015-08-31 16:21:15 +01:00
Luke Barratt
7c05a9dfea Bumped NewRelic gem version 2015-08-31 16:21:15 +01:00
Luke Barratt
eaf20e298f Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
b7ff6b037b Removed legacy NewRelic initializer since we're no longer using Unicorn 2015-08-31 16:21:15 +01:00
Luke Barratt
70418b3f0b Merge pull request #52 from cblanc/remove_salt 
Remove salt
 2015-08-31 16:19:58 +01:00
Luke Barratt
ddd180fe05 Merge pull request #52 from cblanc/remove_salt 
Remove salt
 2015-08-31 16:19:58 +01:00
Luke Barratt
b71f055276 Merge pull request #51 from cblanc/return_steamid 
Return steamid to users api
 2015-08-31 16:19:50 +01:00
Luke Barratt
2d7ba6cf9c Merge pull request #51 from cblanc/return_steamid 
Return steamid to users api
 2015-08-31 16:19:50 +01:00
Chris Blanchard
9ee0de5406 Remove salt 2015-08-31 16:18:14 +01:00
Chris Blanchard
074add9487 Remove salt 2015-08-31 16:18:14 +01:00
Chris Blanchard
66fc2c3220 Return steamid to users api 2015-08-30 15:58:06 +01:00
Chris Blanchard
22df398bae Return steamid to users api 2015-08-30 15:58:06 +01:00
simplefl
19b8cf877c Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
simplefl
c81c38ec27 Merge pull request #50 from cblanc/show_stream 
Show stream information on user page
 2015-08-27 20:00:50 +02:00
Chris Blanchard
fc0d62d110 Fix style 2015-08-27 18:49:47 +01:00
Chris Blanchard
9c7917ef10 Fix style 2015-08-27 18:49:47 +01:00
Chris Blanchard
3694832277 Show stream information on user page 2015-08-27 18:47:26 +01:00
Chris Blanchard
7c6b66a43d Show stream information on user page 2015-08-27 18:47:26 +01:00
simplefl
1a3ca51138 Merge pull request #49 from cblanc/add_server_name 
Add server name
 2015-08-27 19:44:40 +02:00
simplefl
f3d5b09dd6 Merge pull request #49 from cblanc/add_server_name 
Add server name
 2015-08-27 19:44:40 +02:00
Chris Blanchard
f05f072f1c Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
0d090f78c3 Return server name 2015-08-27 11:58:30 +01:00
Chris Blanchard
8032c8e93e Account goes to user profile 2015-08-27 11:58:16 +01:00
Chris Blanchard
14eebf985e Account goes to user profile 2015-08-27 11:58:16 +01:00
simplefl
16896bf6f0 Merge pull request #48 from ENSL/develop 
Develop
 2015-08-24 17:19:49 +02:00
simplefl
f9447547b6 Merge pull request #48 from ENSL/develop 
Develop
 2015-08-24 17:19:49 +02:00
simplefl
6fa2e5e10b Merge pull request #47 from cblanc/lambo 
Account goes to user profile
 2015-08-24 17:10:08 +02:00
simplefl
c29e3c0c29 Merge pull request #47 from cblanc/lambo 
Account goes to user profile
 2015-08-24 17:10:08 +02:00
Chris Blanchard
83dc747a51 Account goes to user profile 2015-08-24 16:02:55 +01:00
Chris Blanchard
3616b90e3d Account goes to user profile 2015-08-24 16:02:55 +01:00
simplefl
c7015e1540 Merge pull request #46 from ENSL/develop 
Develop
 2015-08-23 21:50:30 +02:00
simplefl
22eb30890a Merge pull request #46 from ENSL/develop 
Develop
 2015-08-23 21:50:30 +02:00
simplefl
fcc1b96662 Merge pull request #43 from cblanc/update_production_cookie_policy 
Share production ensl session store with subdomains
 2015-08-23 21:34:42 +02:00
simplefl
8e2faed5ec Merge pull request #43 from cblanc/update_production_cookie_policy 
Share production ensl session store with subdomains
 2015-08-23 21:34:42 +02:00
simplefl
e6a8f00c30 Merge pull request #44 from cblanc/robots 
Prevent crawls of large data files
 2015-08-23 21:34:23 +02:00
simplefl
d2f483eb48 Merge pull request #44 from cblanc/robots 
Prevent crawls of large data files
 2015-08-23 21:34:23 +02:00
simplefl
817f32ce90 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
simplefl
f652536307 Merge pull request #42 from cblanc/fix_users_api 
Fix users api
 2015-08-23 21:33:57 +02:00
Luke Barratt
f6f8962073 Fixes removal of find_or_create_by_x in acts_as_rateable plugin 2015-08-23 15:57:37 +01:00
Luke Barratt
7738c2b845 Fold legacy has_view_count plugin into lib 2015-08-23 15:43:40 +01:00
Luke Barratt
c1466c262a Cleanup spec_helper and remove use of deprecated RSpec syntax 2015-08-23 15:29:09 +01:00
Luke Barratt
44834ddd0e Updated selenium-webdriver to resolve issues using the latest versions of Firefox 2015-08-23 15:21:56 +01:00
Luke Barratt
e3f0a79479 Fold acts_as_rateable plugin into lib 2015-08-23 13:25:41 +01:00
Luke Barratt
865a0cae5a Restore POST routes to /users/login and /users/logout 2015-08-23 13:24:19 +01:00
Luke Barratt
4d04c47251 Fold in acts_as_readable plugin into lib so that it's loaded properly 2015-08-23 12:06:27 +01:00
Luke Barratt
f8fd66e152 Use steam-condenser from GitHub source again to avoid issues with Constant collisions 2015-08-23 11:25:35 +01:00
Luke Barratt
48dc948fc0 Merge branch 'develop' into feature/rails-4 2015-08-23 11:00:14 +01:00