Commit graph

6745 commits

Author SHA1 Message Date
Nick Winter
98ab756835 Merge branch 'master' into production 2014-12-18 22:22:54 -08:00
Nick Winter
0635d1dccf Fixed typo in contract emails. 2014-12-18 22:22:44 -08:00
Nick Winter
5492e0b62a Merge branch 'master' into production 2014-12-18 20:39:29 -08:00
Nick Winter
59b433d863 Upgrading contact form context a bit. 2014-12-18 20:39:15 -08:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
Matt Lott
ffa3366b8a Help videos A/B results - sub followed?
Shows which level/style combo was followed by a sub purchase.
2014-12-18 17:18:48 -08:00
George Saines
31fb5fe80e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -08:00
Matt Lott
368e5e24ee Help videos A/B results - watched more videos?
Shows which style per-level yielded more additional videos watched.
2014-12-18 16:21:04 -08:00
Matt Lott
e381c2934c Merge branch 'master' into production 2014-12-18 14:05:36 -08:00
Matt Lott
f853259304 Updating help videos
Moving dungeons-of-kithgard to Vimeo
Adding original style for haunted-kithmaze
2014-12-18 14:04:48 -08:00
Matt Lott
77a4ec1aa0 Help videos A/B test results script 2014-12-18 13:59:01 -08:00
Matt Lott
f2835a998a Add second kith maze help video 2014-12-18 12:05:10 -08:00
Matt Lott
e573f0344c Merge branch 'master' into production 2014-12-18 00:21:28 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Matt Lott
70cd8aa20d Update Vimeo embed player params 2014-12-17 23:59:59 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Matt Lott
d494dc9c79 Add video tutorials to game guide 2014-12-17 22:26:36 -08:00
Nick Winter
fe0c89e433 Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler. 2014-12-17 21:54:56 -08:00
Nick Winter
2ea47cf83b Fixed #1952 (unsubscribing from specific ladder update emails). 2014-12-17 19:38:36 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
Nick Winter
8f04e47b6c Merge pull request #1951 from nemoyatpeace/patch-4
Update SpellView.coffee
2014-12-17 19:06:06 -08:00
Michael Schmatz
f5d9550d60 Merge branch 'master' into production 2014-12-17 21:59:43 -05:00
Michael Schmatz
a9265bce42 Disabled achievements plugin 2014-12-17 21:58:32 -05:00
nemoyatpeace
0496c9338d Update SpellView.coffee
Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy
2014-12-18 09:10:07 +08:00
Matt Lott
8ec583109a Merge branch 'master' into production 2014-12-17 14:29:17 -08:00
Matt Lott
6ab74f9dab Disable analytics.users.active 2014-12-17 14:17:50 -08:00
Nick Winter
6a9d7ca7ec Merge branch 'master' into production 2014-12-17 13:26:58 -08:00
Nick Winter
da72991260 A few misc tweaks for the new desert level options. 2014-12-17 12:42:42 -08:00
Matt Lott
71e66c4d61 No hipchat for analytics.log.event post errors 2014-12-17 10:57:19 -08:00
Matt Lott
18f44e1600 Merge branch 'master' into production 2014-12-17 10:09:26 -08:00
Matt Lott
30ed0a0ead Disable analytics.log.event server handler 2014-12-17 09:53:43 -08:00
Imperadeiro98
d1e4a98981 Merge pull request #1947 from Martin005/patch-4
Update cs.coffee
2014-12-17 15:42:48 +00:00
Imperadeiro98
ff30d8c936 Merge pull request #1946 from fcrozetta/patch-3
Update pt-BR.coffee
2014-12-17 15:40:50 +00:00
Martin005
821f31f02e Update cs.coffee 2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493 Update pt-BR.coffee 2014-12-17 08:56:31 -02:00
Matt Lott
3c96569e87 Merge branch 'master' into production 2014-12-16 21:47:25 -08:00
Matt Lott
9baef64dd0 Fix double 403 in Handler.get 2014-12-16 21:45:30 -08:00
Nick Winter
a98deb1ff8 Making item requiring smarter about which slots can be required for non-warriors. 2014-12-16 18:57:54 -08:00
Nick Winter
86bcaab10a Merge branch 'master' into production 2014-12-16 16:40:49 -08:00
Nick Winter
6e6ce6cd27 Added Minesweeper original. 2014-12-16 16:40:14 -08:00
Matt Lott
345e793d35 Mixpanel script for A/B subscribe copy test 2014-12-16 16:38:54 -08:00
Matt Lott
1167655faf Disable internal event tracking
Tracking down a server CPU issue.
2014-12-16 16:38:17 -08:00
Matt Lott
d68746a922 Update gem counting script 2014-12-16 14:16:23 -08:00
Matt Lott
426424103a Levels & Subs queries 2014-12-16 14:16:23 -08:00
Nick Winter
688a8dc624 Thangs can now respect custom Component colorization. 2014-12-16 12:59:39 -08:00
Imperadeiro98
31953660f4 Fixed some commented translations 2014-12-16 20:16:42 +00:00
Imperadeiro98
0df8c39596 Merge pull request #1944 from Martin005/patch-3
Update cs.coffee
2014-12-16 20:11:09 +00:00
Martin005
50058147ed Update cs.coffee
Adding some translations again, hopefully will do them all.
2014-12-16 21:05:50 +01:00
George Saines
9d72c37876 removing gradient 2014-12-16 11:41:07 -08:00