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
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
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
aae44c2064
Further fix for DiplomatView including Esperanto.
2015-03-19 10:18:53 -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
6b372ec82e
Adding Esperanto stub.
2015-03-19 08:36:35 -07:00
Nick Winter
c6cd7b032d
Fixed Alipay auto locale detection.
2015-03-18 17:17:30 -07:00
Nick Winter
f9d9b0985b
Merge pull request #2540 from nixel2007/master
...
Add "Translated Name" to /i18n
2015-03-18 16:21:34 -07:00
Nick Winter
585fa40a8c
Added first draft of campaign info to campaign selector screen.
2015-03-18 16:20:30 -07:00
nixel2007
9b509fa83e
Add "Translated Name" to /i18n
2015-03-19 01:44:23 +03:00
Imperadeiro98
a004c8376c
Merge pull request #2539 from ChaosCat/patch-4
...
Update he.coffee
2015-03-18 20:57:03 +00:00
Shady Kamal
216579d95b
Update he.coffee
...
finished the essentials and I took my time to check the translation, I wasn't active since I worked onmy projects now the steps remaining are
1) finishing the miscellenious translations (teachers, community, editors etc...)
2) fixing the right to left problem (probably by just using the mechanics of the text editor differently[reorganizing brackets, dots, commas, language mixed sentences and so on...])
3) altering other files to support sending the subscription message according to user's gender since there is no way to representboth gender in the same form (Could you please direct me to the files that I need to edit to send the message?)
2015-03-18 22:08:54 +02:00
Imperadeiro98
d6043d4572
Uncommented an header from last merge
2015-03-18 18:06:45 +00:00
Imperadeiro98
1ddbbdfbcd
Merge pull request #2538 from pettevi/patch-1
...
Update fi.coffee
2015-03-18 18:01:44 +00:00
Imperadeiro98
4b7f9366dc
Removed "Experimental" from Lua...
...
... and added to CoffeeScript
2015-03-18 17:58:29 +00:00
petteri
b98b621eb3
Update fi.coffee
...
Removed few # from category-tags and fixed typos
2015-03-18 13:20:56 +02:00
petteri
d36e2863c9
Update fi.coffee
...
Added more translations
2015-03-18 09:18:23 +02:00
petteri
1cfaf76bd1
Update fi.coffee
...
Added more translations here and there
2015-03-18 09:06:03 +02:00
Nick Winter
792e65767d
I could try to compile it first, I guess.
2015-03-17 22:04:30 -07:00
Nick Winter
8af94209b4
Lua is not experimental any more. (But CoffeeScript is.)
2015-03-17 22:02:15 -07:00
Nick Winter
3236abc5da
Added emphasis for Apocalypse.
2015-03-17 21:20:26 -07:00
Nick Winter
5e80bb60d0
Fixed scrolling issue on background on i18n edit pages.
2015-03-17 16:30:59 -07:00
Nick Winter
d0cb6d1c0c
Merge pull request #2537 from nixel2007/patch-1
...
Removing invoices from /account
2015-03-17 16:07:24 -07:00
Nikita Gryzlov
2c4be8bdda
Removing invoices from /account
...
As said at https://github.com/codecombat/codecombat/pull/2527#issuecomment-82609513
2015-03-18 01:23:40 +03:00
Imperadeiro98
9913a155c7
Some styling updates to account-settings-view.sass
2015-03-17 18:57:16 +00:00
Imperadeiro98
1a039ff3cc
Uncommented some strings from last merge
2015-03-17 18:42:39 +00:00
Imperadeiro98
0ceebbf4e5
Merge pull request #2536 from pettevi/patch-1
...
Update fi.coffee
2015-03-17 18:37:51 +00:00
petteri
7aa355c320
Update fi.coffee
...
Removed # that I forgot in my last commit
2015-03-17 20:25:36 +02:00
Imperadeiro98
44eef21f36
Merge pull request #2535 from Coderaulic/patch-2
...
Update ja.coffee
2015-03-17 18:05:11 +00:00
petteri
b8d92c1027
Update fi.coffee
...
Added more general translations
2015-03-17 18:43:22 +02:00
Nick Winter
c5942c65f3
Merge pull request #2534 from Elegy/master
...
Added more names for #53
2015-03-17 09:09:14 -07:00
petteri
962635b6bd
Update fi.coffee
...
Started Finnish translation
2015-03-17 13:08:06 +02:00
