Nick Winter
d101a427ba
Merge branch 'master' into production
2015-08-08 12:26:33 -07:00
Nick Winter
cd0c252b14
Disabled some logging now that chinaVersion appears to be working.
2015-08-08 12:26:20 -07:00
Matt Lott
122fcc6e71
Merge branch 'master' into production
2015-07-31 16:20:28 -07:00
Matt Lott
0768b533e2
Subs dashboard perf
...
Caching older (at least 16 days) Stripe invoices in analytics
collection, which will be updated once a day via the analytics server
cron job.
2015-07-31 16:19:40 -07:00
Nick Winter
721ae833e9
Merge branch 'master' into production
2015-07-31 14:42:08 -07:00
Nick Winter
fc0a6513f3
Fixing some bugs in the geoip and language detection stuff.
2015-07-31 14:32:32 -07:00
Matt Lott
0e272b8d86
Merge branch 'master' into production
2015-07-30 16:07:32 -07:00
Matt Lott
822d25984f
Merge pull request #2910 from trotod/fix-clan-details-style
...
Fix clan details style
2015-07-29 10:22:36 -07:00
Matt Lott
f89bb8ac0f
Subs dashboard perf
...
Update sub sponsors API to use payments collection before users
collection to whittle down potential sponsors.
2015-07-28 09:11:55 -07:00
Nick Winter
d07b087c7b
Merge branch 'master' into production
2015-07-27 11:35:35 -07:00
Nick Winter
e43addf55b
Debugging chinaVersion inconsistencies.
2015-07-27 11:35:20 -07:00
David Liu
b5d7791e84
Custom hero portraits
...
Though missing the raider and necromancer from the spritesheet
2015-07-26 12:40:55 -07:00
Nick Winter
85db686e74
Merge branch 'master' into production
2015-07-24 17:38:39 -07:00
Nick Winter
899aae5798
Consolidated extra resources.
2015-07-10 14:20:25 -07:00
Matt Lott
1688000770
Merge branch 'master' into production
2015-07-09 13:52:54 -07:00
Matt Lott
7620ba00ad
🐛 Remove stripe_invoices API caching
2015-07-09 13:28:55 -07:00
Matt Lott
c25c5e8f97
Improve sub_sponsors API perf
2015-07-09 13:16:57 -07:00
Matt Lott
591c891b18
Merge branch 'master' into production
2015-07-09 12:21:58 -07:00
Matt Lott
b6724b9d8d
bug:Fix subscriptions API variable naming collision
2015-07-09 12:21:32 -07:00
Matt Lott
e5f451e906
Merge branch 'master' into production
2015-07-09 10:41:51 -07:00
Matt Lott
6831355649
🐛 Fix subs dashboard monthly churn and perf
...
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
Nick Winter
40e1e6b2ac
Merge branch 'master' into production
2015-06-30 11:28:11 -07:00
Nick Winter
b0c7b50761
Added programming concept tags to campaign and level editor.
2015-06-30 11:27:58 -07:00
Nick Winter
270340a79f
Removed Learnable.
2015-06-24 09:18:13 -07:00
Matt Lott
35e9c60b8b
Merge branch 'master' into production
2015-06-18 15:35:19 -07:00
Matt Lott
b12b7e8ca4
Add user deletion date
...
Fixes #2734
2015-06-18 15:17:56 -07:00
Matt Lott
72e458cc80
Unsubscribe deleted users
...
Fixes #2733
2015-06-18 15:02:19 -07:00
Matt Lott
d4d4d7bb25
🐛 Fix sub handler error typo
2015-06-18 15:02:19 -07:00
Nick Winter
bc8e0945a1
Merge branch 'master' into production
2015-06-17 18:17:22 -07:00
Matt Lott
5c240d89cd
Cancel recipient subscriptions immediately
2015-06-17 16:35:30 -07:00
Nick Winter
f7eaf91bae
Hopefully making Systems editable by Artisans.
2015-06-14 12:49:45 -07:00
Matt Lott
251fcf05fd
Merge branch 'master' into production
2015-06-05 15:12:36 -07:00
Matt Lott
32b10b33e4
Update gem charge statement descriptors
...
Shown on bank statements and credit bills.
2015-06-05 14:58:44 -07:00
Matt Lott
e46613bf7f
Update trial request hipchat msg
...
Link to trial-requests approval page.
2015-06-05 11:27:53 -07:00
Matt Lott
b27a4539f1
Merge branch 'master' into production
2015-06-05 10:38:20 -07:00
Matt Lott
d7cddcb136
Teacher trial subscription form
...
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
2015-06-05 06:48:19 -07:00
Imperadeiro98
a85e6fb695
Removed unnecessary full stop
2015-06-02 21:34:01 +01:00
Matt Lott
9828bd5d1d
Sponsored sub cleanup on unsubscribe
...
Sponsored subscriptions can be partially set up when the incremental
subscription charge fails. This cleans up the sponsored subscriptions
when one of the recipient subscriptions is cancelled.
Related to #2786
2015-05-28 16:56:13 -07:00
Nick Winter
5c70321741
Merge branch 'master' into production
2015-05-25 14:05:19 -07:00
Nick Winter
bb17621b47
Don't let the server die when a sponsored subscription's sponsor can't be found.
2015-05-25 14:03:07 -07:00
Nick Winter
28b44f9535
Merge branch 'master' into production
2015-05-25 09:58:39 -07:00
Nick Winter
bebe2dde21
Adding a log to check out what's going on with updating of sponsored subscriptions.
2015-05-25 09:58:25 -07:00
Matt Lott
26f4b97eeb
Merge branch 'master' into production
2015-05-20 17:25:52 -07:00
Matt Lott
a8a55021b9
🐛 Fix unpaid charges yield payments
...
Unpaid charges should not be recorded as successful payments in our
database. Was happening when opening the buy gems modal again.
2015-05-19 11:41:11 -07:00
Nick Winter
f38bbb7d3d
Merge branch 'master' into production
2015-05-19 10:56:22 -07:00
Nick Winter
6e8ff798a1
Fixed missing paren in c40b8b1e.
2015-05-19 10:56:12 -07:00
Nick Winter
ef9e647e94
Merge branch 'master' into production
2015-05-18 14:30:39 -07:00
Nick Winter
c40b8b1e5d
Not sending patch created emails to Nick/George/Scott.
2015-05-17 12:17:53 -07:00
Matt Lott
08eff2b489
🐛 Fix admin dashboard invoice sorting
...
Bug was introduced by recent perf work.
2015-05-13 16:25:28 -07:00
Matt Lott
627884a608
Merge branch 'master' into production
2015-05-12 15:25:34 -07:00
Matt Lott
50f340ffbe
Update admin dashboard
...
Caching invoices again, but using a different method.
2015-05-12 10:09:08 -07:00
Nick Winter
b7d1ab2b01
Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session.
2015-05-11 18:53:42 -07:00
Matt Lott
31fda7e22b
Merge branch 'master' into production
2015-05-11 17:29:06 -07:00
Matt Lott
6dc51e27e4
🐛 Admin dashboard deleted users
...
Also disabling invoice caching to see if that is what causes invalid
sub end counts.
2015-05-11 10:37:44 -07:00
Matt Lott
dae2acbd5d
Merge branch 'master' into production
2015-05-09 10:24:58 -07:00
Matt Lott
dd35a1eb76
Include sponsored cancels in dashboard
...
Also includes free teacher sub cancels, which should be an
insignificant number.
2015-05-08 11:34:59 -07:00
Matt Lott
d96a69d602
Merge branch 'master' into production
2015-05-06 15:28:12 -07:00
Matt Lott
0353be4fc4
Add recent cancellations table to dashboard
2015-05-06 15:23:46 -07:00
Matt Lott
67ee4e99a7
Remove subscription API debugging code
...
This was being used to debug analytics event logging problems in
production. Turned out to be a too many open files problem, unrelated
to this code.
2015-05-06 11:34:20 -07:00
Matt Lott
340713e721
Add subscription API debugging
...
Investigating elevated sub end counts in production over time from the
subscriptions API.
2015-05-06 11:34:20 -07:00
Matt Lott
2edacb8cbc
Merge branch 'master' into production
2015-05-05 20:34:07 -07:00
Matt Lott
a652b70728
Update admin dashboard conversion types
2015-05-04 17:38:34 -07:00
Matt Lott
1f7178bac7
Update analytics log collection index
...
Indexes already updated on live analytics database.
2015-05-02 18:28:47 -07:00
Matt Lott
1e0363b0c5
Merge branch 'master' into production
2015-05-01 16:09:32 -07:00
Matt Lott
afc3689dcc
Optimize recent subs api
2015-05-01 16:08:12 -07:00
Matt Lott
db911a04b7
Merge branch 'master' into production
2015-05-01 11:08:48 -07:00
Matt Lott
1ac249565a
Add debug logging to recent subs API
...
Unclear why this isn’t working in production.
2015-05-01 11:08:17 -07:00
Matt Lott
d4aa27f172
Merge branch 'master' into production
2015-05-01 09:57:18 -07:00
Matt Lott
5305d80887
Add conversion info to admin dashboard
2015-05-01 09:37:47 -07:00
Nick Winter
d2cb4528e5
Merge branch 'master' into production
2015-04-30 13:37:18 -07:00
Nick Winter
35726bf41c
Trying to handle when earned achievements aren't created via POST.
2015-04-30 09:06:41 -07:00
Matt Lott
d016f7d791
Merge branch 'master' into production
2015-04-28 10:32:50 -07:00
Nick Winter
a4964ea36e
Reduced transactional email sends a bit.
2015-04-27 15:06:26 -07:00
Nick Winter
9d0d07df06
Merge branch 'master' into production
2015-04-25 17:38:16 -07:00
Nick Winter
80af32180c
Fixed #1638 : detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.
2015-04-25 17:29:02 -07:00
Matt Lott
f41b0bd4dd
Sort clan members list alphabetically
2015-04-24 14:22:00 -07:00
Matt Lott
8d6819e970
Merge branch 'master' into production
2015-04-23 18:07:48 -07:00
Matt Lott
1e688f1d61
Clan details view solution
...
Click on a level progression cell to observe the level session in a new
tab.
2015-04-23 14:31:21 -07:00
Matt Lott
59de47069a
Add sponsored subs to admin dashboard
2015-04-23 13:34:43 -07:00
Matt Lott
2945bd7e3a
Merge branch 'master' into production
2015-04-21 16:09:14 -07:00
Matt Lott
502a47e912
Admin dashboard perf
...
Find subscription cancellations via events API instead of walking each
customer and their subscriptions.
2015-04-21 15:58:45 -07:00
Matt Lott
559b9533c4
🐛 Fix clan name and description editing
...
#Fixes 2693
2015-04-21 14:12:01 -07:00
Matt Lott
065b91a678
Merge branch 'master' into production
2015-04-21 11:44:42 -07:00
Matt Lott
4515c8f765
🐛 Add user getClans undefined check
2015-04-21 11:22:17 -07:00
Matt Lott
0b10954018
🐛 Fix clans details member levels
2015-04-21 10:08:51 -07:00
Matt Lott
a1afabe6a7
Merge branch 'master' into production
2015-04-21 09:20:16 -07:00
Matt Lott
474986f3cb
Admin dashboard perf work
...
Cache invoices on app server, assume they are always fetched most
recent to least.
2015-04-20 17:10:41 -07:00
Matt Lott
c9a7f6773d
Speed up clan details page
...
Only fetch level sessions and achievements for 200 members.
Display members with more data first.
Show average clan achievements instead of total achievements.
General css cleanup.
2015-04-20 16:20:52 -07:00
Matt Lott
a6fbaba469
Update clan query selectors
2015-04-20 15:18:05 -07:00
Matt Lott
c900310c8e
Merge branch 'clans'
2015-04-20 14:42:48 -07:00
Matt Lott
f80a73ae9b
Decouple clan type from dashboard details
...
Adding dashboardType field, private clans automatically set this to
‘premium’.
2015-04-20 14:04:22 -07:00
Nick Winter
c8c11df64e
Merge branch 'master' into production
2015-04-20 11:20:58 -07:00
Nick Winter
cea5798b10
Fixed Clans DatabaseError without error giving the server heart attacks.
2015-04-20 09:09:42 -07:00
Nick Winter
f58d51d4a9
Fixed anonymous requests to get simulator leaderboards to not assume that you have a user.
2015-04-19 14:52:10 -07:00
Nick Winter
dc90481a5c
Fixed #2458 , I think.
2015-04-18 19:57:37 -07:00
Matt Lott
45c070209b
Update private clans dashboard
2015-04-16 15:26:14 -07:00
Nick Winter
41ed231940
Merge branch 'master' into production
2015-04-16 08:03:30 -07:00
Nick Winter
4de9071f1a
Added a projection to Clans getMemberSessions to help with the gargantuan fetch running us out of memory.
2015-04-16 08:03:19 -07:00
Matt Lott
2b29e755fe
Make clan name and description editable
2015-04-15 11:09:43 -07:00
Nick Winter
9cbea647bf
Merge branch 'master' into production
2015-04-13 17:08:25 -07:00
