Commit graph

8127 commits

Author SHA1 Message Date
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
709c2fc4f1 Added more Artisan permissions for Articles. 2015-03-16 13:54:20 -07:00
Nick Winter
4f8b81903b Propagated i18n. 2015-03-16 13:51:51 -07:00
Nick Winter
e28e3a163e Merge branch 'pougounias-master' 2015-03-16 13:49:55 -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
Matt Lott
d8f2406ba7 Find Stripe subscribers script 2015-03-16 12:10:46 -07: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
Nick Winter
58d9618849 Merge pull request #2523 from nixel2007/master
Update ru.coffee. Fix accretion.
2015-03-14 11:31:16 -07:00
Nick Winter
ab64a335e4 Another fix for poll handler getting next poll if there are no poll records yet. 2015-03-14 11:30:54 -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
Nick Winter
8b75da0040 Merge pull request #2521 from nixel2007/master
Update ru.coffee. personal_sub block
2015-03-14 09:35:25 -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
fde8904fd8 Add backwards compatibility check for Stripe sub search 2015-03-13 15:39:19 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
c32dd6d284 Merge pull request #2507 from popey456963/master
Setup guide for headless_client.coffee
2015-03-13 07:52:55 -07:00
Popey456963
5310238366 Revert "Update jQlone to use HTTPS"
This reverts commit 099cb69c64.
2015-03-12 18:16:32 +00:00
Popey456963
db27066a3f Revert "Connect to code combat over HTTPS"
This reverts commit aa321bb3af.
2015-03-12 18:16:16 +00:00
Nick Winter
be84517010 Enabling another offer. 2015-03-12 11:08:58 -07:00
Nick Winter
3ff41f5619 Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues. 2015-03-12 11:08:58 -07:00
Popey Gilbert
099cb69c64 Update jQlone to use HTTPS 2015-03-12 17:55:02 +00:00
Popey Gilbert
aa321bb3af Connect to code combat over HTTPS 2015-03-12 17:54:01 +00: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
Imperadeiro98
eaaae58259 Merge pull request #2513 from jklemm/master
Adding me as Diplomat, and more pt-BR translations.
2015-03-12 17:28:33 +00: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