Imperadeiro98
85ba433857
Merge pull request #2637 from cundamic/patch-12
...
Update sk.coffee
2015-04-07 17:59:33 +01:00
Imperadeiro98
6f867702ba
Merge pull request #2634 from cundamic/patch-10
...
Update sk.coffee
2015-04-07 17:57:26 +01:00
Nick Winter
7f41ad6c52
Added OSTraining and Breakout Mentors resources.
2015-04-07 09:25:42 -07:00
Nick Winter
8673cca96c
Added Viking Helmet reward icon and removed Master Sword reward icon. Not showing Apocalypse particles after you have beaten it. Fixed #2580 .
2015-04-07 09:05:13 -07:00
Nick Winter
c1ec1611ad
Fixed style reversion for page loading bar showing over code area.
2015-04-07 08:55:33 -07:00
Barney
69ac9974b6
Update zh-HANT.coffee
2015-04-07 23:17:09 +08:00
cundamic
1fe85e8a5c
Update sk.coffee
...
translation: ladder
2015-04-07 16:19:03 +02:00
cundamic
3d7f73a773
Update sk.coffee
...
translation: about
2015-04-07 14:48:32 +02:00
cundamic
d0cc29899f
Update sk.coffee
...
translation community,classes I
2015-04-07 10:14:32 +02:00
Nick Winter
f1d14d5bcb
Updated Zero Sum tournament blurb now that it has ended.
2015-04-06 17:05:39 -07:00
Matt Lott
51e077215e
Add monthly growth to admin dashboard
2015-04-06 16:58:36 -07:00
Matt Lott
7cd71b6146
Add clans blurb to /teachers
2015-04-06 16:11:54 -07:00
cundamic
a8d17843e0
Update sk.coffee
...
translation: teachers
2015-04-07 00:19:40 +02:00
Imperadeiro98
8fb6de0d62
Restored some translations
2015-04-06 22:09:35 +01:00
Imperadeiro98
b9ce416f46
Merge pull request #2631 from cundamic/patch-9
...
Update sk.coffee
2015-04-06 22:02:11 +01:00
Matt Lott
a77e9cafe9
Merge branch 'clans'
2015-04-06 11:18:08 -07:00
Matt Lott
43fb8ed462
Add clans link everywhere
...
Top-level menu, world view, user profiles.
Will add to /teachers later.
2015-04-06 11:17:13 -07:00
cundamic
2d3b84ccd0
Update sk.coffee
...
translation: options
2015-04-06 20:14:45 +02:00
Nick Winter
08ea51d1d9
Updated default hero costs for the bug where it didn't load them properly. Probably fixed typo in Polish teachers blurb thing.
2015-04-06 10:52:55 -07:00
Matt Lott
7f0e9e73a8
Add latest achievements to clan details page
2015-04-06 10:19:35 -07:00
Matt Lott
d4aa9882a9
Update clan buttons UI
...
And remove temporary test logging.
2015-04-06 10:07:16 -07:00
Nick Winter
de48934016
Merge pull request #2629 from cundamic/patch-8
...
Update sk.coffee
2015-04-06 08:00:39 -07:00
Nick Winter
61165df41b
Merge pull request #2627 from lazydogP/master
...
Update zh-HANS.coffee
2015-04-06 08:00:05 -07:00
Nick Winter
4ed4c5a07c
Merged sk.coffee.
2015-04-06 07:59:22 -07:00
Nick Winter
1982d8d5f1
Merge pull request #2595 from nemoyatpeace/patch-5
...
Update the shift-click insertion
2015-04-06 07:53:01 -07:00
cundamic
43f4a2c76e
Update sk.coffee
...
Translation account_settings
2015-04-06 10:17:56 +02:00
cundamic
8e97b05af7
Update sk.coffee
...
line 341 deleted
2015-04-06 03:03:28 +02:00
Imperadeiro98
e1afa33b82
Small fix for last commit
2015-04-05 21:38:37 +01:00
cundamic
5f533abf5d
Update sk.coffee
...
translation : suscribe II, choose hero
2015-04-05 21:11:38 +02:00
lazydogP
bd7703d4fe
Update zh-HANS.coffee
2015-04-06 00:02:17 +08:00
cundamic
3d842b56b5
Update sk.coffee
...
Translation : share progress, signup, subscribe
2015-04-05 17:00:33 +02:00
Imperadeiro98
19b1cf7f77
Merge pull request #2623 from cundamic/patch-4
...
Update sk.coffee
2015-04-05 11:39:53 +01:00
Imperadeiro98
20b3c8dfc2
Merge pull request #2622 from cundamic/patch-3
...
Update sk.coffee
2015-04-05 11:39:28 +01:00
Imperadeiro98
82f314bd97
Merge pull request #2620 from javatlacati/patch-5
...
Update es-ES.coffee
2015-04-05 11:38:09 +01:00
Imperadeiro98
b97eff7386
Merge pull request #2616 from cundamic/patch-2
...
Update sk.coffee
2015-04-05 11:35:57 +01:00
cundamic
a13d0e713e
Update sk.coffee
...
Translation of tips II
2015-04-04 20:07:57 +02:00
Nick Winter
04ccb2273f
Raising hard execution limit from one million to three million statements.
2015-04-04 09:34:31 -07:00
cundamic
38f71010ae
Update sk.coffee
...
Translated: Leaderboard
2015-04-04 12:22:01 +02:00
cundamic
e05fe0103f
Update sk.coffee
...
Translation : choose_hero
2015-04-04 08:32:05 +02:00
javatlacati
7f527360f7
Update es-ES.coffee
...
Addeded some translations.
2015-04-03 20:58:20 -06:00
Nick Winter
383e64d6dc
Updating possible user gender choices.
2015-04-03 19:12:48 -07:00
Matt Lott
cc7bb406ec
Add language icon to clan details page
2015-04-03 17:21:30 -07:00
Matt Lott
b7fd2a89ee
Add hero icons to clan details page
2015-04-03 16:44:35 -07:00
Nick Winter
a426f34b55
A couple tweaks to the Polish blurb.
2015-04-03 16:22:45 -07:00
Nick Winter
1d5b1f1c6c
Added Polish IT Leader Club blurb.
2015-04-03 16:21:31 -07:00
Matt Lott
b808fa5276
Add favorite language to clan details page
2015-04-03 15:52:16 -07:00
cundamic
04037114bf
Update sk.coffee
...
Translaltion of tips
2015-04-04 00:26:14 +02:00
Matt Lott
565cd9cf50
Add clan invite link on details page
2015-04-03 14:48:00 -07:00
Matt Lott
5ae93cd6ab
Add clan description field
2015-04-03 14:09:43 -07:00
Matt Lott
db1e8f0cb4
Update clan copy to chieftain and heroes
2015-04-03 13:22:07 -07:00
Matt Lott
39990ee151
Sort and limit clan lists
...
Clan lists sorted by member count, then created date.
Public clans lists limited to 100.
Member lists sorted by slug.
2015-04-03 12:22:44 -07:00
Nick Winter
3913ae9909
Wizard Dude gets his own avatar from winning the Greed tournament.
2015-04-03 12:19:06 -07:00
Imperadeiro98
80fe6c283a
Reverted a mistake I did
2015-04-03 19:27:12 +01:00
Matt Lott
dfff871c58
Add achievements to clan details view
2015-04-03 11:05:37 -07:00
Matt Lott
f0bee3fd98
Normalize clan owner data
2015-04-03 09:52:25 -07:00
Nick Winter
4f962c3120
Switched fourth level group to the good-converting level instead of the bad one (oops).
2015-04-03 09:08:02 -07:00
Matt Lott
56342ad993
Normalize clan members data
2015-04-02 17:00:28 -07:00
Imperadeiro98
6f3f6d66ab
Uncommented a string from last merge...
...
... so that it doesn't get lost
2015-04-02 19:58:16 +01:00
Imperadeiro98
a0e01c78fe
Merge pull request #2610 from javatlacati/patch-4
...
Update es-419.coffee
2015-04-02 19:56:47 +01:00
Matt Lott
df120bdea3
Delete clan
2015-04-02 11:44:18 -07:00
Matt Lott
d91a7d8d1a
Clans remove member
2015-04-02 11:01:37 -07:00
Matt Lott
6c1e7b9560
Add 7 day net to admin subs count page
2015-04-01 20:23:05 -07:00
Matt Lott
bf38327578
Leave clan
...
And add join clan plumbing to clan details page.
2015-04-01 16:00:39 -07:00
Matt Lott
b48de3d74d
Join clan
2015-04-01 15:24:45 -07:00
Matt Lott
482b66b8a4
Create and list clans
...
Replace mock data with some real functionality.
2015-04-01 11:56:48 -07:00
javatlacati
6e83de564d
Update es-419.coffee
...
translated some phrases
2015-03-31 17:06:11 -06:00
Matt Lott
32b48a3c4c
Clans v1 UI with mock data
...
Main clans view shows public list, user’s clans, and create clan form.
Clan details view shows clan details and members list.
2015-03-31 13:28:57 -07:00
Imperadeiro98
049ad631e3
Uncommented headers from last merge
2015-03-30 22:01:58 +01:00
Imperadeiro98
6be1acdad0
Merge pull request #2601 from Moschti/patch-1
...
Update de-CH.coffee
2015-03-30 21:58:19 +01:00
Matt Lott
14a6ad8564
🐛 Fix doubling data in admin sub counts page
...
Better data resetting to handle weird event firings.
2015-03-30 11:59:14 -07:00
FedericoTomas
cd86c836b6
Update es-419.coffee
...
Up,
2015-03-30 01:07:28 -03:00
Imperadeiro98
352b6d6d45
Uncommented some headers from last merge
2015-03-29 23:11:55 +01:00
javatlacati
a5c94a6277
Update es-ES.coffee
...
Addeded some translations.
2015-03-29 15:23:17 -06:00
Moschti
680da7ee79
Update de-CH.coffee
2015-03-29 13:57:27 +02:00
Nick Winter
0b1bb6a4aa
Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490 . Fixed #2515 . Fixed #2304 .
2015-03-28 13:54:44 -07:00
nemoyatpeace
b50c3fbc89
Update the shift-click insertion
...
Insertion is now language specific.
2015-03-29 01:14:13 +08:00
Nick Winter
37d7b4661c
Possible fix for #2589 , but need to test in production.
2015-03-27 16:24:40 -07:00
Matt Lott
532e8133c6
Add graph to sub counts admin page
2015-03-27 15:27:34 -07:00
Matt Lott
1dbb382318
Add auto-refresh to sub counts admin page
2015-03-27 15:27:34 -07:00
Matt Lott
53de6c6134
Add current subscription counts view under the admin page
2015-03-27 15:27:34 -07:00
Nick Winter
155eb4a4a8
Fixed missing disabled success button illustrated image reference.
2015-03-27 14:47:59 -07:00
Nick Winter
3137eb05f0
Fix for extra-wide Zero Sum graphic in level info popover.
2015-03-27 11:50:08 -07:00
nixel2007
b2c8f3c1f6
Update ru.coffee. Zero_sum.
2015-03-27 17:23:11 +03:00
Imperadeiro98
a7198d5456
Update pt-PT.coffee
2015-03-27 13:57:53 +00:00
jigsaw
57fb8588b6
Translate Archmage page in Japanese
2015-03-27 16:02:04 +09:00
Nick Winter
0e56117642
Fixed adding custom programmableProperties to heroes for specific levels.
2015-03-26 22:29:21 -07:00
Nick Winter
4d1babb95e
Propagated i18n for Zero Sum tournament.
2015-03-26 22:06:33 -07:00
Nick Winter
3bfc1a88ce
Slight copy update.
2015-03-26 22:05:52 -07:00
Nick Winter
ceb81494a0
Preparing for Zero Sum tournament starting tomorrow morning.
2015-03-26 21:05:46 -07:00
Imperadeiro98
7fa46fac34
Uncommented a translation from last merge
2015-03-26 10:30:19 +00:00
Imperadeiro98
ec00301892
Merge pull request #2578 from matheod/patch-3
...
Add french translation for "teacher" page and polls related content
2015-03-26 10:28:21 +00:00
matheod
07a6273c4b
teachers french translation
2015-03-26 01:17:34 +01:00
Nick Winter
7dff105cdf
Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs.
2015-03-25 16:47:31 -07:00
matheod
713afaf567
add Poll french translation
2015-03-26 00:34:02 +01:00
matheod
1054f2d293
Add plural at Dégât (damage)
2015-03-26 00:30:56 +01:00
matheod
25cacdd842
Even better translation
2015-03-25 23:22:26 +01:00
matheod
a768846e69
Correct action_cooldown translation.
2015-03-25 23:17:43 +01:00
matheod
b069927983
Add missing space on account page
2015-03-25 21:51:45 +01:00
matheod
1b17836845
Add missing space on diplomat page
2015-03-25 21:29:18 +01:00
Imperadeiro98
a238b8b6db
Fixed indentation in sk.coffee
2015-03-25 12:08:26 +00:00
cundamic
7732e01b3f
Update sk.coffee
...
Why is red default in choose_hero ?
2015-03-25 07:51:08 +01:00
Nick Winter
7ebb2d0200
Actually committing my Super Important Fixes. I must have been crazy yesterday. Also, populate i18n may work in the level editor now.
2015-03-24 15:39:35 -07:00
Matt Lott
4f3fcf385c
🐛 Fix subscribe prevented by no preferredLanguage
2015-03-24 15:19:20 -07:00
Matt Lott
7e340fcd41
Update purchase tracking to work with GA goals
...
Need an integer value field.
2015-03-24 15:02:57 -07:00
Imperadeiro98
ac7b573b06
Update pt-PT.coffee
2015-03-24 12:33:39 +00:00
Imperadeiro98
5d52f08c07
Merge pull request #2568 from e-jigsaw/teachers-ja
...
Add teachers page translation in Japanese, Improve Japanese
2015-03-24 12:10:03 +00:00
Imperadeiro98
a90516ee32
Merge pull request #2567 from pettevi/patch-1
...
Update fi.coffee
2015-03-24 12:09:02 +00:00
Imperadeiro98
c24f399a37
Merge pull request #2566 from nixel2007/ru
...
Update ru.coffee
2015-03-24 12:07:36 +00:00
petteri
0bd02499cf
Update fi.coffee
...
Plenty more translations and a few typo fixes
2015-03-24 12:29:53 +02:00
jigsaw
2b6484c539
Add teachers page translation in Japanese, Improve Japanese
2015-03-24 19:27:37 +09:00
nixel2007
fff60c717b
Update ru,coffee
2015-03-24 10:52:16 +03:00
Nick Winter
3af8fb6218
Suppress selection sounds in the level editor.
2015-03-23 17:37:49 -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
d34577dd38
Propagated i18n.
2015-03-23 15:54:26 -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
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
AtaZh
13629d8650
Update uk.coffee
2015-03-22 21:33:41 +02: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
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
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
Nick Winter
19e68f7c05
Improvements to spectate for big screens, allowing spectating of chosen top matches.
2015-03-20 15:32:35 -07:00
Nick Winter
e288b95543
Fixed #1961 (castDrainLife -> cast('drain-life') in the docs).
2015-03-20 13:43:00 -07:00
nixel2007
7cda4e65e3
Update ForkModal. Clean i18n on fork
2015-03-20 23:19:38 +03:00
Nikita Gryzlov
da47e2cefb
Update en.coffee. Add {change}
2015-03-20 23:08:26 +03:00
Nick Winter
8760725b8d
Unholy Tome III instead of IV for Zero Sum.
2015-03-20 11:07:41 -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
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
nixel2007
5169dc789f
Update eo.coffee. Slogan; nav, modal, not_found
2015-03-19 22:49:29 +03:00
nixel2007
34a01a22e5
Update eo.coffee. Diplomat block
2015-03-19 22:16:17 +03: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
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
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
petteri
962635b6bd
Update fi.coffee
...
Started Finnish translation
2015-03-17 13:08:06 +02:00
Coderaulic
a101c0a6d6
Update ja.coffee
...
Finished translation for Settings:
Minor fixes from previous. One off translations here and there.
2015-03-16 23:31:55 -07:00
Nathan Smith
8f67835d41
Added more names for #53
2015-03-16 20:51:29 -07:00
Nick Winter
0916f1dd61
Style tweaks for #2533 . Fixed #1403 .
2015-03-16 19:50:05 -07:00
Nick Winter
084c01c5b7
Merge pull request #2533 from basicer/patch-1
...
Update vector.coffee
2015-03-16 19:48:43 -07:00
Nick Winter
7e97c5dd58
Merge pull request #2532 from nixel2007/patch-1
...
Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show
2015-03-16 19:24:57 -07:00
Rob Blanckaert
82c2d4d4b5
Update vector.coffee
...
Fix indents.
2015-03-16 21:02:07 -04:00
Rob Blanckaert
0a06022b8f
Update vector.coffee
...
Make Vector do the right thing if you forget new,
2015-03-16 20:56:28 -04:00
Nick Winter
2d89de8183
Using new Aether optimization options for minimal flow tracking (big performance gains). Trying again to handle random no-window avatar creation error.
2015-03-16 17:36:38 -07:00
nixel2007
38275dd2a9
Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show
2015-03-17 01:15:13 +03:00
Nick Winter
8c28247906
Merge pull request #2509 from Imperadeiro98/master
...
Some cleanup to play-items-modal.sass file
2015-03-16 13:55:02 -07:00
Nick Winter
4f8b81903b
Propagated i18n.
2015-03-16 13:51:51 -07:00
Nick Winter
116cf24060
Merged el.coffee.
2015-03-16 13:49:45 -07:00
Imperadeiro98
746ea0689d
Merge pull request #2529 from swoeste/patch-1
...
Update de-DE.coffee
2015-03-16 19:36:29 +00:00
Imperadeiro98
a6a0096549
Merge pull request #2530 from Coderaulic/patch-2
...
Update ja.coffee
2015-03-16 19:35:15 +00:00
Nick Winter
d6cba0de67
Enabled Alipay support. Updated to latest version of Stripe checkout.js.
2015-03-16 10:50:15 -07:00
Nick Winter
bb7c232455
Not using Mixpanel any more.
2015-03-16 08:48:52 -07:00
Coderaulic
da5f5da4e0
Update ja.coffee
...
Finished translations for "Contact Us".
Assuming no translation is wanted for deprecated lines.
Added one off translations here and there.
Not sure how to translate line 340. Any insight into meaning is appreciated.
2015-03-16 02:29:43 -07:00
swoeste
a36e8962d5
Update de-DE.coffee
...
Added translations for "Accounts Subscription View" and some other parts.
2015-03-15 22:09:20 +01:00
Imperadeiro98
7ec870386c
Uncommented an header to activate translations
2015-03-15 11:58:23 +00:00
Imperadeiro98
06b1767725
Merge pull request #2525 from tianz/master
...
Added translations to some untranslated items (Simplified Chinese)
2015-03-15 11:57:05 +00:00
Imperadeiro98
cd8316c61f
Merge pull request #2520 from Zikanda13/patch-1
...
Update de-DE.coffee
2015-03-15 11:50:53 +00:00
Tian Zhou
a2aeadf1ae
Added translations to some untranslated items
2015-03-14 22:11:48 -04:00
Nick Winter
404afd7f3d
Merge pull request #2379 from coder0xff/patch-1
...
Update ellipse.coffee
2015-03-14 11:33:31 -07:00
nixel2007
980ef9b769
Update ru.coffee. Fix accretion.
2015-03-14 20:22:43 +03:00
Nick Winter
89bdb3b790
Fixed #2518 .
2015-03-14 09:57:31 -07:00
Nick Winter
57e77a0cd7
Upcoming ladder level Zero Sum equalizes all players' heroes and equipment.
2015-03-14 09:39:43 -07:00
nixel2007
87b1f8628f
Update ru.coffee. personal_sub block
2015-03-14 19:24:17 +03:00
Imperadeiro98
f970213283
Merge pull request #2510 from JCesar91/patch-1
...
Update es-419.coffee
2015-03-14 13:33:45 +00:00
coder0xff
9dbecd213b
Update ellipse.coffee
...
Fix to pass unit tests
2015-03-14 01:26:13 -04:00
Zikanda13
cc12333eba
Update de-DE.coffee
...
Changed several formulation issues to a more common form of German language.
Corrected some grammar mistakes.
Added some translations for the "teachers" part.
2015-03-14 01:37:01 +01:00
Matt Lott
b696c916c0
🐛 Fix subscription view personal sub next payment date
2015-03-13 16:08:30 -07:00
Matt Lott
5264fc6181
🐛 Fix subscription view just subscribed alert message
2015-03-13 15:51:47 -07:00
Matt Lott
af89452b93
Merge branch 'sponsored-subs'
2015-03-13 15:19:20 -07:00
Nick Winter
3ff41f5619
Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues.
2015-03-12 11:08:58 -07:00
Nick Winter
83a72d3030
Merge pull request #2514 from Catsync/mountain-generator
...
Added mountain terrain generator
2015-03-12 10:42:48 -07:00
Cat Sync
90d7159501
Added mountain terrain generator
2015-03-12 13:31:21 -04:00
Jorge Klemm
b26f9f1f6a
Correcting translate word Items to Itens on pt-BR translation
2015-03-12 13:14:38 -03:00
Jorge Klemm
571f69b2de
Translate and adjust some words.
2015-03-12 10:57:00 -03:00
Jorge Klemm
a6c39714aa
Adding me as a Diplomat.
2015-03-12 10:52:09 -03:00
Nick Winter
3458f2069b
Temporary workaround for #2512 . Identifying ageRange. Made poll header slightly smaller.
2015-03-11 20:21:54 -07:00
JCesar91
661d94bf33
Update es-419.coffee
2015-03-11 19:42:28 -05:00
Imperadeiro98
9fedd1f838
Some cleanup to play-items-modal.sass file
2015-03-11 22:13:16 +00:00
Nick Winter
a697b35920
Fixed poll fetching for first poll.
2015-03-11 09:01:40 -07:00
Nick Winter
7b20bf469a
Merge pull request #2504 from nixel2007/patch-2
...
More humane view of i18n-editor
2015-03-11 08:16:12 -07:00
nixel2007
e5c8fc4a1c
More humane view of i18n-editor
...
Change the layout to
Description
en
non-en
2015-03-11 16:45:35 +03:00
nixel2007
01c2cfce7c
Update play-heroes-modal.sass for ru
2015-03-11 15:41:39 +03:00
laituan245
ae07a69bd7
Fixed issue #2497
2015-03-11 13:01:15 +09:00
laituan245
599f18344e
Fixed issue #2497 for 'ru', 'pt-PT', and 'pt-BR'
2015-03-11 12:16:03 +09:00
Nick Winter
4ff4306366
Added latest i18n keys to de-DE.coffee again. Added some bottom margin on Component configuration screen for dropdowns.
2015-03-10 16:13:34 -07:00
Michael Nix
4cf4ae6ad7
fixes typos in de-DE.coffee
...
Email is actually E-Mail. Email is a different word altogether. Maybe next commit.
2015-03-10 23:36:35 +01:00
Imperadeiro98
68c317d4a2
Update pt-PT.coffee
2015-03-10 22:01:53 +00:00
Imperadeiro98
a2665258da
Better styling for pt-PT in subscribe modal
2015-03-10 22:00:09 +00:00
Nick Winter
b0dc743126
Tweaks to #2418 .
2015-03-10 14:49:50 -07:00
Nick Winter
f2ab176fd6
Merge pull request #2418 from divyanshu013/master
...
A small fix for confusing Hero Modal weaopons list for #1774
2015-03-10 14:42:31 -07:00
Nick Winter
0992b7bdea
Propagated i18n.
2015-03-10 14:41:53 -07:00
Nick Winter
439e6f7b4e
Merged pt-BR.coffee.
2015-03-10 14:40:22 -07:00
Nick Winter
8fc893dd6f
Fixed a couple issues with errors during incompletely loaded levels or weird child window global situations using level editor.
2015-03-10 14:37:12 -07:00
Nick Winter
1be0852872
Merge pull request #2496 from nixel2007/patch-1
...
Update DiplomatView.coffee
2015-03-10 14:28:58 -07:00
Imperadeiro98
f202276917
Some fixes to last merge
2015-03-10 21:18:00 +00:00
Imperadeiro98
beea14697a
Merge pull request #2498 from philosomatiker/patch-1
...
Update de-DE.coffee
2015-03-10 21:12:55 +00:00
Markus Plößer
bec8dca9bc
Update de-DE.coffee
2015-03-10 22:00:49 +01:00
Imperadeiro98
74f266f44b
Uncommented some translations
2015-03-10 20:55:44 +00:00
Markus Plößer
bd565f9682
Update de-DE.coffee
...
- some spell checkings corrected;
- translated a few more lines of "teachers" category
2015-03-10 21:14:06 +01:00
Nikita Gryzlov
321ca1eb2b
Fix Issue #2495
2015-03-10 20:16:43 +03:00
Nick Winter
9c99fc455a
A few poll fixes.
2015-03-10 09:45:21 -07:00
Nick Winter
dc5fb0af14
Sending a couple more offers in the next-steps emails.
2015-03-09 16:32:29 -07:00
Matt Lott
031337e472
Remove GA main.html default code pageview
...
Pageviews are covered by Backbone plumbing instead.
2015-03-09 12:57:10 -07:00
Matt Lott
5a0a4d1446
No auto-fullscreen for admins
2015-03-09 12:57:10 -07:00
Matt Lott
6db4d72dc4
Track pageviews for manual calls to navigate
2015-03-09 12:57:10 -07:00
Nick Winter
652fb3cd3f
Poll doesn't need to saveBackups except in the poll editor.
2015-03-09 11:52:22 -07:00
Nick Winter
54f55b1f9d
Adding polls as patchable.
2015-03-09 11:48:13 -07:00
Nick Winter
e58734894a
Tweaked style on space-disabling and default-locking by player level.
2015-03-09 10:50:00 -07:00
Nick Winter
f5633f05dc
Merge pull request #2414 from h3yduck/lock_issue
...
Only lock spacebar and default code when the player is lower level (issue 2406)
2015-03-09 10:37:40 -07:00
Nick Winter
18e6907284
Merge pull request #2488 from nixel2007/master
...
Update ru.coffee. Polls
2015-03-09 10:34:45 -07:00
Nick Winter
57b8c06dc4
Merge pull request #2483 from javatlacati/patch-2
...
Update es-419.coffee
2015-03-09 10:33:16 -07:00
Nick Winter
76b6ccad30
Merge pull request #2482 from jklemm/master
...
Translate to pt-br
2015-03-09 10:29:52 -07:00
Nick Winter
efe1b77e9e
First poll should be askable.
2015-03-09 09:51:15 -07:00
Nick Winter
495845a633
Storing certain poll results in User object. Showing a poll once per day.
2015-03-09 09:30:51 -07:00
nixel2007
aa98001d36
Update ru.coffee. Polls
2015-03-09 17:11:13 +03:00
jose alves sousa neto
7001bc5b38
Update pt-BR.coffee
2015-03-08 23:08:40 -04:00
