Commit graph

10929 commits

Author SHA1 Message Date
Matt Lott
674ad9e730 Merge branch 'master' into production 2015-05-12 20:51:27 -07:00
Matt Lott
ee2540dcf2 🐛Fix choose hero icon widths
Fixes #2753
2015-05-12 20:49:08 -07:00
Nick Winter
213a66b2ab Implemented Arryn. 2015-05-12 16:59:30 -07:00
Matt Lott
627884a608 Merge branch 'master' into production 2015-05-12 15:25:34 -07:00
Matt Lott
81ec591b50 Swap teachers and blog menu links 2015-05-12 15:24:03 -07:00
Matt Lott
959fe434ea Update /teachers site license copy
We don’t support site licenses yet, but can do one-time bulk purchases.
2015-05-12 15:18:42 -07:00
Matt Lott
865ceac91a 🐛Travis CI failures
Disabling some more subscription tests and adding spec durations so we
can narrow down the Travis CI timeout failures.
2015-05-12 15:08:55 -07:00
Matt Lott
50f340ffbe Update admin dashboard
Caching invoices again, but using a different method.
2015-05-12 10:09:08 -07:00
Matt Lott
896205bdf9 Use live version of Stripe checkout
Fixes #2639
2015-05-11 21:26:06 -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
3072e5f198 Merge pull request #2745 from stephenfloydwallace/patch-2
"Added more names for #53"
2015-05-11 11:13:59 -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
Imperadeiro98
5a50e36a10 Merge pull request #2747 from Lego3/swedish_updates_2
Added a bunch of Swedish translations
2015-05-09 22:28:28 +01:00
Edvin Linge
de59c56ec8 Added a bunch of Swedish translations 2015-05-09 22:29:04 +02:00
Matt Lott
dae2acbd5d Merge branch 'master' into production 2015-05-09 10:24:58 -07:00
Matt Lott
2231b70c19 Update Stripe checkout.js 2015-05-09 10:24:20 -07:00
stephenfloydwallace
06e678b930 "Added more names for #53"
This time in alphabetical order and without comma's
2015-05-09 17:52:51 +02: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
4f54b4432f Limit subscription tests under Travis CI
They are killing our Travis CI test runs due to timeouts and Stripe API
rate limits.
2015-05-06 13:49:47 -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
Imperadeiro98
27b2b53943 Added a spr to replace a spl 2015-05-06 18:07:17 +01:00
Imperadeiro98
9eddd114e2 Merge pull request #2736 from Vic020/patch-1
improved Chinese localization
2015-05-06 17:39:12 +01:00
VicYu
60fb8426c1 improved Chinese localization
1.Modify some wording error
2.Translated some items
2015-05-06 17:29:46 +08:00
Matt Lott
713f72f5e1 Merge pull request #2723 from Catsync/fixYellowArrow
Yellow arrow shouldn't point to replayable levels
2015-05-05 20:52:15 -07:00
Matt Lott
37804f07aa Merge pull request #2718 from motoko-11/patch-1
Added more names for #53
2015-05-05 20:47:58 -07:00
Matt Lott
2edacb8cbc Merge branch 'master' into production 2015-05-05 20:34:07 -07:00
Matt Lott
e2f18de220 Update /teachers page copy
Add blurb about one-time purchase site license option.
2015-05-05 20:33:37 -07:00
Matt Lott
103abdbfb0 Add teachers forum link to /teachers page 2015-05-05 15:35:22 -07:00
Matt Lott
901c0ed085 Update managed subscriptions copy
Add blurb about recipients needing to be existing CodeCombat users
2015-05-05 15:18:35 -07:00
Matt Lott
bf20d5f7be Add level to Inventory Play analytics event 2015-05-05 15:05:18 -07:00
Matt Lott
a652b70728 Update admin dashboard conversion types 2015-05-04 17:38:34 -07:00
Imperadeiro98
4f43139f9f Uncommented some headers 2015-05-03 21:21:21 +01:00
Imperadeiro98
4fc0ae37ba Merge pull request #2730 from Lego3/swedish_updates
Added some Swedish translation
2015-05-03 21:19:00 +01:00
Edvin Linge
707c098472 Added some Swedish translation 2015-05-03 18:55:34 +02:00
Matt Lott
1f7178bac7 Update analytics log collection index
Indexes already updated on live analytics database.
2015-05-02 18:28:47 -07:00
Cat Sync
42aaba6278 Yellow arrow shouldn't point to replayable levels 2015-05-02 00:15:42 -04:00
Matt Lott
dce8005169 Fix admin dashboard monthly churn
Monthly churn = cancelled during last month / total at beginning of
month
2015-05-01 17:26:22 -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
Lokendra Sharma
eb13de9f34 Added more names for #53
First contrib. Don't know where else to start.
2015-05-01 16:43:49 +05:30
Imperadeiro98
8b9c12e685 Merge pull request #2716 from ameer157/patch-1
translated "weapons" into arabic
2015-04-30 22:02:17 +01:00
Nick Winter
d2cb4528e5 Merge branch 'master' into production 2015-04-30 13:37:18 -07:00