Commit graph

1199 commits

Author SHA1 Message Date
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