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
Nick Winter
9f62532ae9
Merge branch 'master' into production
2015-03-22 08:11:44 -07: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
806d997135
Merge branch 'master' into production
2015-03-21 14:27:52 -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
2824ea5f9d
Merge branch 'master' into production
2015-03-20 16:18:52 -07: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
6cde6c00b6
Merge branch 'master' into production
2015-03-20 15:38:33 -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
da75015f46
Merge branch 'master' into production
2015-03-20 11:10:00 -07: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
7714354447
Merge branch 'master' into production
2015-03-20 07:17:41 -07:00
Nick Winter
8b06de9613
Requests without users can't save poll votes.
2015-03-20 07:10:47 -07:00
Nick Winter
927363fd6f
Merge branch 'master' into production
2015-03-19 21:38:06 -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
Vlevo
49b32a8ff1
Update ControlBarView.coffee
...
added a clause for the "older campaigns"
2015-03-19 16:02:53 -06:00
Imperadeiro98
aee68e899a
Merge pull request #2543 from nixel2007/master
...
First eo lines
2015-03-19 19:53:33 +00:00
nixel2007
5169dc789f
Update eo.coffee. Slogan; nav, modal, not_found
2015-03-19 22:49:29 +03:00
Michael Schmatz
cfa09a3239
Added redirection to Chinese servers based on location and language
2015-03-19 15:25:24 -04:00
nixel2007
34a01a22e5
Update eo.coffee. Diplomat block
2015-03-19 22:16:17 +03:00
Michael Schmatz
7f9301e8c6
Setting up read preferences and china specific configuration
2015-03-19 14:18:38 -04:00
Nick Winter
e1d713746f
Merge branch 'master' into production
2015-03-19 10:19:05 -07:00
Nick Winter
aae44c2064
Further fix for DiplomatView including Esperanto.
2015-03-19 10:18:53 -07:00
Nick Winter
902bee1f91
Merge branch 'master' into production
2015-03-19 10:02:52 -07:00
Imperadeiro98
e1a6156345
Requiring Esperanto in Diplomat page...
...
... so that it doesn't break. It would be nice if the languages could be loaded from locale/locale.
2015-03-19 16:26:00 +00:00
Nick Winter
7a9158c2e7
Merge branch 'master' into production
2015-03-19 08:37:44 -07:00
Nick Winter
6b372ec82e
Adding Esperanto stub.
2015-03-19 08:36:35 -07:00