7685 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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	c1f3e80586	Merge branch 'joseasousa-patch-1'	2015-03-10 14:40:35 -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