Commit graph

8214 commits

Author SHA1 Message Date
Nick Winter
62e8ee624c Made chinaVersion detection fire only when the language is Chinese. 2015-03-23 17:00:29 -07:00
Nick Winter
5502deb9f6 Merge pull request #2548 from nixel2007/ForkModal
Clean i18n when forking an object
2015-03-23 16:52:00 -07:00
Nikita Gryzlov
20884f8b5d Update ForkModal.coffee. Unset i18nCoverage on Fork 2015-03-24 02:39:03 +03:00
Nick Winter
eda57e366a Fix for anonymous user signups. 2015-03-23 16:38:12 -07:00
Nick Winter
d34577dd38 Propagated i18n. 2015-03-23 15:54:26 -07:00
Nick Winter
0b601ea695 Merge pull request #2558 from nixel2007/scocode
Add npm&bower update to SCOCODE.bat. Update ver #
2015-03-23 15:46:25 -07:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -07:00
Imperadeiro98
26b7c65855 Merge pull request #2562 from nixel2007/ru
Update ru.coffee. "Subscribe", "teachers", orfografic.
2015-03-23 13:35:27 +00:00
Imperadeiro98
02bee04662 Uncommented a string from last merge...
... so that it doesn't get lost
2015-03-23 13:34:44 +00:00
Imperadeiro98
bcc8bf66c5 Merge pull request #2559 from AtaZh/master
Update uk.coffee
2015-03-23 13:30:57 +00:00
nixel2007
126b64e9f5 Update ru.coffee. New "Teachers" block 2015-03-23 16:28:02 +03:00
nixel2007
1329098cac Update ru.coffee. Fix orfografic 2015-03-23 13:17:12 +03:00
nixel2007
844d4cec88 Update ru.coffee. Subscribe and small fixes. 2015-03-23 01:26:37 +03:00
AtaZh
03df2416f1 Update uk.coffee 2015-03-22 23:15:52 +02:00
Michael Schmatz
d2d7bdcd4e Changed dump URL 2015-03-22 16:53:48 -04:00
Michael Schmatz
3c9f9738ce Changed the public dump URL 2015-03-22 16:53:03 -04:00
AtaZh
13629d8650 Update uk.coffee 2015-03-22 21:33:41 +02:00
Imperadeiro98
06eb95a446 Merge pull request #2557 from jhoon/translations-es-419
Finished translations and added some corrections.
2015-03-22 17:19:46 +00:00
nixel2007
13e2d97c46 Update scocode.bat sample 2015-03-22 20:12:31 +03:00
nixel2007
028c50a450 Add npm&bower update to SCOCODE.bat. Update ver # 2015-03-22 20:02:54 +03:00
Jhoon Saravia
dc835f74e4 Finished translations and added some corrections. 2015-03-22 10:23:37 -05:00
Imperadeiro98
8c138d5d36 Merge pull request #2555 from e-jigsaw/community-translate-japanese
Translated community page in Japanese
2015-03-22 10:33:23 +00:00
Imperadeiro98
44fd85b3a4 Merge pull request #2554 from e-jigsaw/classes-translate-japanese
Translated classes summary in Japanese
2015-03-22 10:33:02 +00:00
Imperadeiro98
bfda4bbe58 Merge pull request #2552 from e-jigsaw/improve-japanese-about-page
Improve Japanese in about page
2015-03-22 10:32:39 +00:00
Michael Schmatz
a16ae2b5bc Changed read prefs and enabled middleware 2015-03-21 21:49:32 -04:00
Michael Schmatz
c25d36ee76 Temporarily disable redirection middleware 2015-03-21 14:27:35 -04:00
jigsaw
3bbbf6583c Translated community page in Japanese 2015-03-21 23:00:13 +09:00
jigsaw
4a27bbd0ea Translated classes summary in Japanese 2015-03-21 22:39:07 +09:00
Imperadeiro98
bf6a96b60b Merge pull request #2551 from nixel2007/patch-2
Fix Issue #2550
2015-03-21 11:52:54 +00:00
jigsaw
9df6ade953 Improve Japanese in about page 2015-03-21 19:43:15 +09:00
Nikita Gryzlov
3c2e8a7fa5 Update es-ES 2015-03-21 11:43:04 +03:00
Matt Lott
2561bc4caf 🐛Fix Stripe web hook sub deleted for deleted user
Add check for deleted user in subscription deleted Stripe web hook
event handler, and equivalent test case.
Add logging for web hook 500 errors to aid future debugging.
2015-03-20 16:14:32 -07:00
Nick Winter
9a8da859df Merge pull request #2549 from codecombat/china
China
2015-03-20 15:37:43 -07:00
Nick Winter
19e68f7c05 Improvements to spectate for big screens, allowing spectating of chosen top matches. 2015-03-20 15:32:35 -07:00
Michael Schmatz
fcf52cfbf7 Added undefined checking to accepted language 2015-03-20 17:47:17 -04:00
Michael Schmatz
a9a3689e15 Merge branch 'master' into china 2015-03-20 16:51:12 -04:00
Nick Winter
e288b95543 Fixed #1961 (castDrainLife -> cast('drain-life') in the docs). 2015-03-20 13:43:00 -07:00
Michael Schmatz
5a7666fca3 More read nearests and changed redirection 2015-03-20 16:33:03 -04:00
nixel2007
7cda4e65e3 Update ForkModal. Clean i18n on fork 2015-03-20 23:19:38 +03:00
Imperadeiro98
579e530c26 Merge pull request #2547 from nixel2007/patch-1
Update en.coffee. Add {change}
2015-03-20 20:19:02 +00:00
Nikita Gryzlov
da47e2cefb Update en.coffee. Add {change} 2015-03-20 23:08:26 +03:00
Michael Schmatz
d8c21771fc Merge branch 'master' into china 2015-03-20 16:08:18 -04:00
Nick Winter
8760725b8d Unholy Tome III instead of IV for Zero Sum. 2015-03-20 11:07:41 -07:00
Nick Winter
e6f53d437a Adding zero-sum to simulated ladder levels. 2015-03-20 10:16:19 -07:00
Matt Lott
fb8e184819 Update teachers page 2015-03-20 09:18:34 -07:00
Nick Winter
bae7612703 Disabled pinned docs clicks for now, since their CSS is wonky. 2015-03-20 09:03:36 -07:00
Nick Winter
8b06de9613 Requests without users can't save poll votes. 2015-03-20 07:10:47 -07:00
Nick Winter
0e0d2830be Zero Sum mirror match using Golden Wand and Unholy Tome IV now. 2015-03-19 21:37:47 -07:00
Nick Winter
d5b69cb811 Merge pull request #2545 from Vlevo/patch-1
Update ControlBarView.coffee
2015-03-19 15:15:18 -07:00
Matt Lott
fec3ac38e9 Prepaid subscriptions
Admins can generate a prepaid code, which a user can use to subscribe
for free via the account/subscription page.
The subscription will be identical to the normal monthly subscription
(e.g. 3500 gems per month), except they won’t be charged.
Does not require the recipient to enter billing information.
Can be applied to an existing subscription, which will be converted to
free.
Prepaid code can only be used once.
Prepaid subscription cannot be unsubscribed via the UI.
2015-03-19 15:04:15 -07:00