Commit graph

1098 commits

Author SHA1 Message Date
simplefl
b3d599a096 Merge pull request #57 from ENSL/master
Merge from Master
2015-09-18 17:06:13 +02:00
simplefl
e20aa53537 Merge pull request #57 from ENSL/master
Merge from Master
2015-09-18 17:06:13 +02:00
simplefl
c128833f8f Merge pull request #56 from cblanc/expose_new_gathers
Expose new gathers
2015-09-18 17:05:01 +02:00
simplefl
e63bd866b6 Merge pull request #56 from cblanc/expose_new_gathers
Expose new gathers
2015-09-18 17:05:01 +02:00
Chris Blanchard
f28d1e2f84 Fix topic spec 2015-09-18 14:42:57 +01:00
Chris Blanchard
1c35ed5ef2 Fix topic spec 2015-09-18 14:42:57 +01:00
Chris Blanchard
6fe08003b2 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
Chris Blanchard
d70075de84 Add helper method for new gathers url 2015-09-18 13:35:17 +01:00
simplefl
e774f38bf5 Merge pull request #55 from ENSL/develop
Develop
2015-09-06 11:58:31 +02:00
simplefl
94bbece2d6 Merge pull request #55 from ENSL/develop
Develop
2015-09-06 11:58:31 +02:00
simplefl
4df3198021 Merge pull request #54 from cblanc/recent_topic_fix
Rewrite recent_topic sql to return unique topics on subquery
2015-09-05 22:56:15 +02:00
simplefl
14d044bd26 Merge pull request #54 from cblanc/recent_topic_fix
Rewrite recent_topic sql to return unique topics on subquery
2015-09-05 22:56:15 +02:00
Chris Blanchard
d4db1aafdf Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
c51ec2447c Limit by 200 2015-09-05 19:16:14 +01:00
Chris Blanchard
fc7dd7286e Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
a5cfa4df74 Return distinct topics 2015-09-05 17:09:20 +01:00
Chris Blanchard
bafb67f702 Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Chris Blanchard
e0eaa89fbf Rewrite recent_topic sql to return unique topics on subquery 2015-09-05 16:23:50 +01:00
Luke Barratt
2901f815e4 Merge branch 'develop' 2015-08-31 16:33:11 +01:00
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