Commit graph

7697 commits

Author SHA1 Message Date
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
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
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
Popey Gilbert
87fc5abdf7 Update headless_client.coffee 2015-03-11 18:48:44 +00:00
Popey Gilbert
bc1b5cae50 Update headless_client.coffee 2015-03-11 17:24:39 +00:00
Popey Gilbert
aa5d3de06d Update headless_client.coffee 2015-03-11 17:23:23 +00:00
Popey Gilbert
8389a64644 Update headless_client.coffee 2015-03-11 17:23:02 +00:00
Popey Gilbert
a114112964 Limited line length 2015-03-11 17:21:03 +00:00
Popey Gilbert
a6adaacdf3 Update headless_client.coffee 2015-03-11 17:19:39 +00:00
Nick Winter
2a2a187467 Merge pull request #2506 from popey456963/master
Update worker_world.coffee
2015-03-11 10:18:11 -07:00
Popey Gilbert
4fd5f4fac1 Update worker_world.coffee 2015-03-11 17:14:33 +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
Nick Winter
1b3fa1b5f0 Merge pull request #2503 from nixel2007/master
Fix Issue #2501
2015-03-11 08:14:40 -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
Nick Winter
8739f6c409 Merge pull request #2502 from laituan245/master
Fixed issues #2497 and #2501 (Text-fit bugs)
2015-03-10 21:07:56 -07: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
Nick Winter
12b1d336d9 Merge pull request #2499 from mchlnix/patch-1
fixes typos in de-DE.coffee
2015-03-10 16:12:00 -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