7300 commits

Author	SHA1	Message	Date
Matt Lott	b9622d54a3	Merge pull request #2835 from Mihbo/patch-3 ... Update names.coffee	2015-06-18 18:05:35 -07:00
Matt Lott	b12b7e8ca4	Add user deletion date ... Fixes #2734	2015-06-18 15:17:56 -07:00
flowabuse	5facc41f82	Update ro.coffee ... Forgot a " on line 10.	2015-06-18 18:38:31 +03:00
Nick Winter	6a4efa9a21	Switching to Boom and Bust as first level of the forest.	2015-06-17 18:17:14 -07:00
Matt Lott	5fb8b18a31	🐛Fix managed subs next payment UI	2015-06-17 16:35:30 -07:00
flowabuse	1b1482f118	Update ro.coffee ... It had to be done! Sorry it took so long... Life happend...	2015-06-17 03:27:34 +03:00
Nick Winter	593f7a9dd7	Some improvements for handling new art.	2015-06-16 13:50:33 -07:00
Imperadeiro98	a8c06652ec	Merge pull request #2839 from Mihbo/patch-4 ... Update uk.coffee	2015-06-16 10:01:50 +01:00
Mihbo	ce73d87f92	Update uk.coffee ... some more strings translated	2015-06-16 10:27:32 +03:00
Ikuyadeu	e8a862b2ce	Update ja.coffee	2015-06-16 11:05:18 +09:00
Matt Lott	8df49b036b	Merge pull request #2831 from trotod/fix-achievement-dates ... Show correct achievement earned dates on user page - fixes #2524	2015-06-15 13:21:23 -07:00
Matt Lott	535ca8d2ac	Merge pull request #2834 from laituan245/master ... Add Contact section to About page #2822	2015-06-15 11:11:58 -07:00
Mihbo	50bcbd97be	Update names.coffee ... added some more names	2015-06-15 16:57:31 +03:00
Imperadeiro98	c35c9eadf1	Merge pull request #2833 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-15 11:30:57 +01:00
Lai Tuan	aabae7082e	Add Contact section to About page #2822	2015-06-15 19:11:48 +09:00
Ikuyadeu	fa8d317745	Update ja.coffee	2015-06-15 18:48:04 +09:00
Mihbo	fd5a99b9d0	Update uk.coffee ... translated some more strings	2015-06-15 10:02:24 +03:00
David Liu	1c633a8ee4	Show correct achievement earned dates on user page ... fixes #2524	2015-06-14 15:40:14 -07:00
Arthur Neves	6cb673e228	i18N press enter on spell view	2015-06-14 23:20:49 +02:00
Nick Winter	7d637a0a27	Added a couple levels' next-campaign links.	2015-06-14 11:07:21 -07:00
Nick Winter	b1680f500b	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-06-14 11:06:48 -07:00
Nick Winter	ac2039c81a	Merged fr.coffee.	2015-06-14 11:06:15 -07:00
Ikuyadeu	3f3f44038e	Update ja.coffee	2015-06-14 17:11:26 +09:00
Kevin Avignon	e263866a3a	Made some update within the spanish file	2015-06-13 23:33:48 -04:00
Kevin Avignon	c806b8865e	Made some changes into the french file	2015-06-13 11:39:25 -04:00
Imperadeiro98	2f9e9b1b67	Merge pull request #2818 from Zleep-Dogg/da-translation ... A bit of Danish translation pt. 2	2015-06-11 11:24:26 +01:00
Esben Madsen	db25007765	A bit of Danish translation pt. 2	2015-06-11 00:35:56 +02:00
Nick Winter	a85d52ebe2	Made a tabbed interface for Programmaticon V's Vector and standard library documentation.	2015-06-10 15:18:37 -07:00
Esben Madsen	8293c717a1	A bit of Danish translation	2015-06-10 01:05:12 +02:00
Imperadeiro98	1383d4c9b7	Merge pull request #2813 from Danylo-Dubinin/patch-3 ... translate few strings	2015-06-09 19:44:56 +01:00
Nick Winter	bb417e9a97	Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812.	2015-06-09 11:23:05 -07:00
Danylo Dubinin	c0f05e7c86	translate few strings	2015-06-09 18:42:20 +03:00
nemoyatpeace	e0e62271b4	Added Ice Level to terrain generator	2015-06-09 18:30:40 +08:00
Imperadeiro98	66c126a8df	Update pt-PT.coffee	2015-06-08 23:39:34 +01:00
Imperadeiro98	c1d8022f35	Merge pull request #2811 from Danylo-Dubinin/patch-2 ... Improve translation, add infinite loop	2015-06-08 22:35:17 +01:00
Nick Winter	4e08d453b7	Added some code for the glacier world.	2015-06-08 13:20:54 -07:00
Danylo Dubinin	fe8c680fb1	Improve translation, add infinite loop ... Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".	2015-06-08 21:45:51 +03:00
Imperadeiro98	fa273d7535	Update pt-PT.coffee	2015-06-08 18:19:27 +01:00
Matt Lott	021ff541e4	Add separate school field for teacher survey	2015-06-08 06:39:30 -07:00
Imperadeiro98	a9f8a7b1be	Fixed some typos	2015-06-08 14:32:55 +01:00
Matt Lott	78004a0a94	Trial requests localization typo ... Adding missing period at end of approved sentence.	2015-06-08 06:27:40 -07:00
Matt Lott	9b37c9f18a	🐛Fix trial request onclick	2015-06-08 06:27:40 -07:00
Imperadeiro98	198806bfc9	Removed hard-coded strings... ... ... from teachers-free-trial.jade	2015-06-08 14:16:24 +01:00
Imperadeiro98	6960358850	Update pt-PT.coffee	2015-06-07 22:58:54 +01:00
Imperadeiro98	b9b36d5fea	Update en.coffee	2015-06-07 22:54:39 +01:00
Nikita Gryzlov	730a0f5e36	Propageted i18n	2015-06-07 23:09:03 +03:00
Danylo Dubinin	dd5ac2eda6	'viking' translation, 'fight' mistake fix ... Правильніше "У бій!" за правилами вживання прийменників у/в.	2015-06-07 19:21:15 +03:00
Nick Winter	0d99b07bc3	Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar.	2015-06-05 17:02:37 -07:00
Imperadeiro98	3f23598c60	Update teacher trial copy	2015-06-05 23:44:31 +01:00
Matt Lott	12b28234a7	Update teacher trial copy	2015-06-05 15:18:47 -07:00
Nick Winter	ccd96122e1	Tweaked Nalfar's hero modal positioning.	2015-06-05 15:13:22 -07:00
Imperadeiro98	7b92bf8c84	Updated i18n in en.coffee	2015-06-05 20:49:08 +01:00
Imperadeiro98	df9a115eb0	Added i18n to teachers-free-trial.jade	2015-06-05 20:49:03 +01:00
Imperadeiro98	10937bfaf8	Minor changes to teachers.jade	2015-06-05 20:46:32 +01:00
Matt Lott	02095a8ddd	Update teacher survey email validation ... Removing restrictive regex matching.	2015-06-05 11:47:12 -07:00
Imperadeiro98	b0c6b50062	Indentation fixes to last merge	2015-06-05 15:03:05 +01:00
Imperadeiro98	445a3f736e	Merge pull request #2805 from lucasangelon/master ... Updated pt-BR.coffee	2015-06-05 15:00:21 +01:00
Matt Lott	d7cddcb136	Teacher trial subscription form ... Add a teacher survey form for applying for a free trial subscription for evaluation purposes. Add an admin trial requests review page, where admins can approve/deny requests.	2015-06-05 06:48:19 -07:00
Matt Lott	d0f9456024	Admin dashboard width 100%	2015-06-05 06:48:19 -07:00
LucasAngelon	920aed7910	Updated pt-BR.coffee ... Uncommented the remaining translations =].	2015-06-05 12:19:27 +08:00
LucasAngelon	7940857dc6	Updated pt-BR.coffee ... Translated a few things on the file~ I saw the clans and account_invoices section titles commented out and was unsure about what to do with them. Translated the items related to them but left them commented out.	2015-06-04 23:39:04 +08:00
Imperadeiro98	b1e1a1d13c	Some fixes to last merge	2015-06-03 19:56:26 +01:00
Imperadeiro98	b6bcc41a31	Merge pull request #2804 from Kavignon/Translator ... Updated the french file	2015-06-03 19:52:52 +01:00
Kevin Avignon	2d20ae987a	Commited changes in the fr coffee script file	2015-06-03 14:48:01 -04:00
Imperadeiro98	0e7314cf4e	Merge pull request #2799 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-02 20:14:38 +01:00
Matt Lott	ad1cf1cd15	Update /teachers copy	2015-06-02 07:25:55 -07:00
Matt Lott	54623f5e30	🐛Fix admin dashboard target line	2015-06-02 07:06:31 -07:00
Ikuyadeu	336cdc2c7a	Update ja.coffee	2015-06-02 17:50:39 +09:00
Imperadeiro98	273b3156e0	Merge pull request #2797 from nixel2007/master ... Propaganation + ru.coffee	2015-06-01 22:42:41 +01:00
Cat Sync	a3588b2801	Yellow arrow shouldn't point to disabled levels	2015-06-01 17:39:55 -04:00
Nikita Gryzlov	f590333d77	Update ru.coffee ... tip_scrub_shortcut	2015-05-31 13:45:24 +03:00
Nikita Gryzlov	43e514950e	Propagated i18n	2015-05-31 13:44:43 +03:00
Nikita Gryzlov	8d25d2cba2	Update en.coffee ... Add {change} to last commit	2015-05-31 13:43:25 +03:00
Max Lyashuk	05c1ecd13d	Translate some new strings in uk.coffee	2015-05-30 22:04:28 +03:00
Imperadeiro98	aea4ac9d19	Merge pull request #2794 from aliceinwire/patch-2 ... Update ja.coffee	2015-05-29 14:52:52 +01:00
Imperadeiro98	bc29f7303b	Fixed sv.coffee	2015-05-29 14:48:19 +01:00
Alice Ferrazzi	179af18478	Update ja.coffee	2015-05-29 16:39:31 +09:00
Imperadeiro98	5a272f8bed	Fixed last merge	2015-05-28 21:54:27 +01:00
Imperadeiro98	b9de6dbc9d	Merge pull request #2792 from Lego3/swedish_updates_3 ... Fixes and additions to the Swedish localization	2015-05-28 21:49:24 +01:00
Edvin Linge	ef5bd0368a	Fixes and additions to the Swedish localization	2015-05-28 22:03:29 +02:00
Marco Fras	02c9080838	Translated "contribute" page	2015-05-28 21:55:15 +02:00
Alice Ferrazzi	c8f5871b90	Update ja.coffee	2015-05-28 13:01:43 +09:00
rohmunhoz	332cf728d1	Update pt-BR.coffee ... Translated many strings	2015-05-27 16:21:46 -03:00
Imperadeiro98	f2fb8610b7	Uncommented headers	2015-05-27 17:23:29 +01:00
Imperadeiro98	35efc6c640	Merge pull request #2787 from KisgadoB/patch-3 ... Update hu.coffee	2015-05-27 17:22:07 +01:00
Imperadeiro98	d175085626	Merge pull request #2781 from KisgadoB/patch-2 ... Update hu.coffee	2015-05-27 17:20:43 +01:00
Nick Winter	9e2c29403b	Re-fixed #2753.	2015-05-26 17:02:59 -07:00
Nick Winter	c915ff1d94	Merged zh-HANS.coffee. Fixed tab indentations.	2015-05-26 16:59:19 -07:00
KisgadoB	600216aa9e	Update hu.coffee	2015-05-26 09:14:30 +02:00
Nick Winter	9dedf04f56	Added Uzbek (uz) language stub.	2015-05-25 16:01:12 -07:00
Nick Winter	86d7b6c625	Added Uzbek (uz) language stub.	2015-05-25 16:00:32 -07:00
Imperadeiro98	1af308424f	Merge pull request #2774 from Atomk/patch-2 ... Added my username in Italian translators	2015-05-24 12:18:02 +01:00
Imperadeiro98	e320bbbed5	Merge pull request #2783 from Atomk/patch-9 ... Update it.coffee	2015-05-23 20:19:46 +01:00
Marco Fras	cfc8147b31	Update it.coffee ... Added a few translations regarding patches.	2015-05-23 10:57:06 +02:00
Marco Fras	536c422185	Small fix in a translated string	2015-05-23 10:42:27 +02:00
Marco Fras	5995f7d6a2	Update it.coffee	2015-05-23 10:38:49 +02:00
KisgadoB	7eeaf3385c	Update hu.coffee	2015-05-22 21:01:45 +02:00
Marco Fras	355efdd78d	Update it.coffee	2015-05-21 23:07:10 +02:00
Imperadeiro98	7f09e8f1f1	Merge pull request #2778 from Atomk/patch-5 ... Fixed a missing "to" in a string	2015-05-21 21:13:29 +01:00
Marco Fras	0f0143925d	Update en.coffee ... I added "use" because it seems more suitable than "click".	2015-05-21 21:38:15 +02:00
Imperadeiro98	8d1fc92f4a	Uncommented translations	2015-05-21 16:56:22 +01:00
Imperadeiro98	506801cdda	Merge pull request #2777 from lynxlynxlynx/patch-1 ... sl.coffee: minor translations	2015-05-21 16:54:59 +01:00
Cat Sync	b38c7b4978	Next Level arrow shouldn't point to Kithgard Mastery	2015-05-21 11:30:37 -04:00
Imperadeiro98	3c203f13ff	Fixed indentation	2015-05-21 14:50:57 +01:00
Marco Fras	0cfb4f5c6b	Update it.coffee	2015-05-21 11:39:27 +02:00
Marco Fras	a3e3bdc125	Fixed a missing "to" in a string	2015-05-21 10:36:25 +02:00
Jaka Kranjc	f8293670b3	sl.coffee: minor translations	2015-05-21 09:19:49 +02:00
Imperadeiro98	8cc13e0829	Fixed indentation	2015-05-20 19:24:26 +01:00
Marco Fras	1f2df9f971	Update it.coffee	2015-05-20 19:51:28 +02:00
Imperadeiro98	bafef886cb	Merge pull request #2773 from Atomk/patch-1 ... Update it.coffee	2015-05-20 15:41:09 +01:00
Imperadeiro98	4721143346	Update pt-PT.coffee	2015-05-20 15:34:06 +01:00
Marco Fras	6db448b6c6	Added my username in Italian translators ... Just red on the diplomat forum to do this..	2015-05-20 15:15:34 +02:00
Marco Fras	e9c3b68eb8	Update it.coffee ... Just fixed tons of typos and bad translations, more fixes to come (this file is huge)	2015-05-20 01:25:11 +02:00
Imperadeiro98	21ce4eb8e1	Uncommented an header	2015-05-18 22:59:02 +01:00
Imperadeiro98	e64435e409	Merge pull request #2771 from dedalcom/patch-1 ... Update bg.coffee	2015-05-18 22:58:08 +01:00
Nick Winter	4c2c896496	Hacky fix for Kithgard Mastery walls not updating properly after dynamically being spawned.	2015-05-18 14:30:17 -07:00
dedalcom	724d76ac84	Update bg.coffee	2015-05-18 13:39:28 +03:00
bignova	59b15fcf82	Update zh-HANS.coffee	2015-05-17 23:22:12 -04:00
Nikita Gryzlov	6e62e3deb9	Propagated i18n	2015-05-18 00:05:23 +03:00
Imperadeiro98	ef7281a9bd	Merge pull request #2768 from nixel2007/master ... Update ru.coffee	2015-05-17 20:29:09 +01:00
Nikita Gryzlov	6a66a03998	Update ru.coffee. Clans, misc.	2015-05-17 21:36:17 +03:00
Nikita Gryzlov	b29391b188	ru.coffee. Tips	2015-05-17 21:07:38 +03:00
FedericoTomas	976df82f5e	Update es-419.coffee ... Updated my friends!.	2015-05-17 06:54:53 -03:00
Imperadeiro98	461a7c9c49	Merge pull request #2762 from Imperadeiro98/master ... Updated i18n for clans	2015-05-16 19:36:56 +01:00
Imperadeiro98	a56807bcac	Updated i18n (part 3)	2015-05-16 19:32:00 +01:00
Imperadeiro98	32b4a7d76f	Updated i18n (part 3)	2015-05-16 19:31:40 +01:00
Imperadeiro98	323d5c5c2d	Updated i18n (part 2)	2015-05-16 19:25:07 +01:00
Imperadeiro98	bfd18471a5	Updated i18n (part 2)	2015-05-16 19:24:49 +01:00
wgsu	81dd640a5c	Update zh-HANS.coffee	2015-05-16 11:52:04 -04:00
wgsu	0155bd02ba	few more translation ... Since I don't how the payment for the server in China work， I don't want to mess up your teacher section.	2015-05-16 11:35:48 -04:00
Imperadeiro98	e88aff1339	Updated i18n (part 1)	2015-05-16 14:46:00 +01:00
Imperadeiro98	a2b846e3fd	Updated i18n	2015-05-16 14:45:51 +01:00
Imperadeiro98	74380cc94a	Updated i18n (part 1)	2015-05-16 14:31:24 +01:00
Imperadeiro98	482d795146	Updated i18n	2015-05-16 14:16:13 +01:00
Imperadeiro98	ec9906c9ae	Updated i18n	2015-05-16 13:58:23 +01:00
Imperadeiro98	8a1bbec80e	Updated i18n	2015-05-16 13:57:46 +01:00
Imperadeiro98	6dbb9dd72b	Updated i18n	2015-05-16 13:55:41 +01:00
Nikita Gryzlov	ff8be31cb5	Propagated i18n.	2015-05-16 00:11:37 +03:00
Matt Lott	a881443bf2	🐛Fix admin dashboard typo	2015-05-15 09:56:06 -07:00
Imperadeiro98	7a87b59988	Removed blank line	2015-05-14 20:07:07 +01:00
Nick Winter	c7c27d3208	Added missing half of recent loading quotes addition.	2015-05-14 11:30:14 -07:00
Lokendra Sharma	4abfc088bf	added more quotes for #710	2015-05-14 15:56:59 +05:30
nixel2007	fd8e798034	Update ru.coffee	2015-05-13 17:46:45 +03:00
Matt Lott	ee2540dcf2	🐛Fix choose hero icon widths ... Fixes #2753	2015-05-12 20:49:08 -07:00
Nick Winter	213a66b2ab	Implemented Arryn.	2015-05-12 16:59:30 -07:00
Matt Lott	81ec591b50	Swap teachers and blog menu links	2015-05-12 15:24:03 -07:00
Matt Lott	959fe434ea	Update /teachers site license copy ... We don’t support site licenses yet, but can do one-time bulk purchases.	2015-05-12 15:18:42 -07:00
Matt Lott	896205bdf9	Use live version of Stripe checkout ... Fixes #2639	2015-05-11 21:26:06 -07:00
Nick Winter	b7d1ab2b01	Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session.	2015-05-11 18:53:42 -07:00
Matt Lott	3072e5f198	Merge pull request #2745 from stephenfloydwallace/patch-2 ... "Added more names for #53"	2015-05-11 11:13:59 -07:00
Matt Lott	6dc51e27e4	🐛Admin dashboard deleted users ... Also disabling invoice caching to see if that is what causes invalid sub end counts.	2015-05-11 10:37:44 -07:00
Edvin Linge	de59c56ec8	Added a bunch of Swedish translations	2015-05-09 22:29:04 +02:00
stephenfloydwallace	06e678b930	"Added more names for #53" ... This time in alphabetical order and without comma's	2015-05-09 17:52:51 +02:00
Matt Lott	dd35a1eb76	Include sponsored cancels in dashboard ... Also includes free teacher sub cancels, which should be an insignificant number.	2015-05-08 11:34:59 -07:00
Matt Lott	0353be4fc4	Add recent cancellations table to dashboard	2015-05-06 15:23:46 -07:00
Imperadeiro98	27b2b53943	Added a spr to replace a spl	2015-05-06 18:07:17 +01:00
VicYu	60fb8426c1	improved Chinese localization ... 1.Modify some wording error 2.Translated some items	2015-05-06 17:29:46 +08:00
Matt Lott	713f72f5e1	Merge pull request #2723 from Catsync/fixYellowArrow ... Yellow arrow shouldn't point to replayable levels	2015-05-05 20:52:15 -07:00
Matt Lott	37804f07aa	Merge pull request #2718 from motoko-11/patch-1 ... Added more names for #53	2015-05-05 20:47:58 -07:00
Matt Lott	e2f18de220	Update /teachers page copy ... Add blurb about one-time purchase site license option.	2015-05-05 20:33:37 -07:00
Matt Lott	103abdbfb0	Add teachers forum link to /teachers page	2015-05-05 15:35:22 -07:00
Matt Lott	901c0ed085	Update managed subscriptions copy ... Add blurb about recipients needing to be existing CodeCombat users	2015-05-05 15:18:35 -07:00
Matt Lott	bf20d5f7be	Add level to Inventory Play analytics event	2015-05-05 15:05:18 -07:00
Imperadeiro98	4f43139f9f	Uncommented some headers	2015-05-03 21:21:21 +01:00
Edvin Linge	707c098472	Added some Swedish translation	2015-05-03 18:55:34 +02:00
Cat Sync	42aaba6278	Yellow arrow shouldn't point to replayable levels	2015-05-02 00:15:42 -04:00
Matt Lott	dce8005169	Fix admin dashboard monthly churn ... Monthly churn = cancelled during last month / total at beginning of month	2015-05-01 17:26:22 -07:00
Matt Lott	5305d80887	Add conversion info to admin dashboard	2015-05-01 09:37:47 -07:00
Lokendra Sharma	eb13de9f34	Added more names for #53 ... First contrib. Don't know where else to start.	2015-05-01 16:43:49 +05:30
Imperadeiro98	8b9c12e685	Merge pull request #2716 from ameer157/patch-1 ... translated "weapons" into arabic	2015-04-30 22:02:17 +01:00
Nick Winter	def6709c52	Added /identify page.	2015-04-30 13:36:32 -07:00
Amir Off	d8955d3389	add epic paladin female name	2015-04-30 20:41:33 +03:00
Amir Off	dcb9df32bd	translated "weapons" into arabic	2015-04-30 20:30:54 +03:00
Matt Lott	e576557bba	Update private clans dashboard preview	2015-04-29 11:52:23 -07:00
Nick Winter	1a1da2924f	Noticed Chrome 30 wasn't working for Gems in the Deep, so recommending 31+ instead of 25+.	2015-04-28 14:49:10 -07:00
Imperadeiro98	e11e8a8966	Fixed last merge	2015-04-28 19:44:34 +01:00
Imperadeiro98	cf8240c400	Merge pull request #2713 from YukiUeda/patch-1 ... Translate ja.cofee on Achizan	2015-04-28 19:42:51 +01:00
Matt Lott	03bf357a84	Update /teachers copy	2015-04-28 11:35:24 -07:00
Matt Lott	f7503f5dba	Expanded progress private clans toggle ... Expand option for level bubbles in the private clan dashboard.	2015-04-28 10:31:35 -07:00
Matt Lott	a995fb938b	Update clans UI ... Update private clans dashboard to show level progression in order, and visually indicate which levels are not completed/started/completed. Update private clans blurb and screenshot. Subscribe prompt on make private clan checkbox.	2015-04-28 09:22:58 -07:00
YukiUeda	7b05fbf84e	Translate ja.cofee on Achizan	2015-04-28 20:29:40 +09:00
Nicolas Kaiser	2f5cb0c8cd	Fix typos in de-DE.coffee ... line 4: According to [1], "Leid tun" was actually an accepted spelling between 1996 and 2006. line 839: Imperative form [2] [1] http://www.korrekturen.de/wortliste/leidtun.shtml [2] http://www.duden.de/rechtschreibung/beitreten	2015-04-27 14:11:38 +02:00
Nicolas Kaiser	4416332938	Fix typos in en.coffee	2015-04-26 20:16:25 +02:00
Nick Winter	520a08a39c	Merge pull request #2699 from lewishenson/patch-1 ... Added more male knight names for #53	2015-04-26 09:55:40 -07:00
Imperadeiro98	5a3f368960	Uncommented some strings from last merge	2015-04-26 16:52:07 +01:00
YrlaCharlotta	ef71b22cab	Update sv.Coffee	2015-04-26 17:19:40 +02:00
Imperadeiro98	0498d125e6	Some fixes to last merge	2015-04-26 14:50:09 +01:00
Imperadeiro98	b6cb601973	Merge pull request #2705 from LikeMyGeek/master ... Traduction en cours	2015-04-26 14:47:26 +01:00
Imperadeiro98	85047ba2e8	Reordered a string	2015-04-26 14:27:12 +01:00
Imperadeiro98	4719123d00	Update pt-PT.coffee	2015-04-26 14:25:01 +01:00
Nick Winter	80af32180c	Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.	2015-04-25 17:29:02 -07:00
Nick Winter	aeadb83975	Merge pull request #2656 from robertbeuligmann/vectortoStringupdate ... Vector.toString precision parameter	2015-04-25 16:31:54 -07:00
Nick Winter	e07e46127c	Merge pull request #2691 from sirui-sun/master ... Added more names for #53	2015-04-25 16:28:11 -07:00
LikeMyGeek	bd342c1fef	Traduction en cours	2015-04-25 20:33:41 +02:00
Matt Lott	f41b0bd4dd	Sort clan members list alphabetically	2015-04-24 14:22:00 -07:00
Nick Winter	1c85759df8	Propagated i18n.	2015-04-24 13:50:30 -07:00
Nick Winter	cd837156d4	Now that we're at 146 levels, and each level is much longer, we're just going to do 'some' new levels every week instead of five.	2015-04-24 13:48:19 -07:00
Matt Lott	0a6e2be7dd	Update admin dashboard css ... Squish table columns.	2015-04-23 21:00:33 -07:00
Nick Winter	36245eb25c	Levels should default to saveThangs: ['Hero Placeholder'] instead of ['humans'].	2015-04-23 18:59:15 -07:00
Matt Lott	30d47621bf	Confirm Clan remove hero	2015-04-23 14:33:13 -07:00
Matt Lott	1e688f1d61	Clan details view solution ... Click on a level progression cell to observe the level session in a new tab.	2015-04-23 14:31:21 -07:00
Matt Lott	59de47069a	Add sponsored subs to admin dashboard	2015-04-23 13:34:43 -07:00
Matt Lott	92332c37f3	Update /teachers copy	2015-04-23 13:34:43 -07:00
Imperadeiro98	f4ecdfeb98	Changed some spr and spl... ... ... in add-thang-components-modal.jade	2015-04-23 20:58:57 +01:00
Imperadeiro98	fb63b0b240	Removed unnecessary spl's... ... ... from community page	2015-04-23 20:47:09 +01:00
Imperadeiro98	c350f457a2	Merge pull request #2682 from sauki8/patch-1 ... Update id.coffe	2015-04-23 19:21:33 +01:00
Imperadeiro98	894a49fce7	Fixed an issue from last merge	2015-04-23 19:20:20 +01:00
Imperadeiro98	fc10c34040	Merge pull request #2698 from YukiUeda/patch-1 ... Translated for artisan	2015-04-23 19:18:52 +01:00
Imperadeiro98	ac15e3d9da	Fixed some errors from last merge	2015-04-23 19:16:08 +01:00
Imperadeiro98	9b92fc1ebe	Merge pull request #2692 from kimaz/patch-1 ... Update de-CH.coffee	2015-04-23 19:10:05 +01:00
Nick Winter	155246173a	Only showing general i18n coverage for languages with more than one family.	2015-04-22 13:13:24 -07:00
Lewis Henson	af3ba72b85	Added more male knight names for #53	2015-04-22 11:24:36 +01:00
kimaz	01b6a1a657	Update de-CH.coffee ... Update 2 @04.22.2015 12:17AM	2015-04-22 12:17:53 +02:00
YukiUeda	3b303fc6f3	Translated for artisan	2015-04-22 18:34:45 +09:00
Matt Lott	502a47e912	Admin dashboard perf ... Find subscription cancellations via events API instead of walking each customer and their subscriptions.	2015-04-21 15:58:45 -07:00
Matt Lott	cfe3e280e5	Clan delete confirm dialog ... Fixes #2696	2015-04-21 13:41:31 -07:00
Matt Lott	5eb65e49fe	Add private clans to /teachers copy	2015-04-21 11:41:48 -07:00
Matt Lott	b918408061	Add private clans to subscribe modal	2015-04-21 11:14:49 -07:00
kimaz	3ab1b6d187	Update de-CH.coffee	2015-04-21 13:25:04 +02:00
Sirui Sun	70237f8b49	Added more names for #53	2015-04-20 23:54:00 -07:00
Matt Lott	c9a7f6773d	Speed up clan details page ... Only fetch level sessions and achievements for 200 members. Display members with more data first. Show average clan achievements instead of total achievements. General css cleanup.	2015-04-20 16:20:52 -07:00
Nick Winter	9466923013	Fixed #2519: boss star gold no longer counts in gold-collected leaderboards.	2015-04-20 16:02:06 -07:00
Nick Winter	e40ad5e1c7	Updating a couple logos. Opening item store to warrior tab when low level.	2015-04-20 16:02:06 -07:00
Matt Lott	c900310c8e	Merge branch 'clans'	2015-04-20 14:42:48 -07:00
Matt Lott	9fffb80b3f	Update clans private info blurb	2015-04-20 14:30:31 -07:00
Matt Lott	38cdb3d057	Update clan analytics	2015-04-20 14:16:44 -07:00
Matt Lott	f80a73ae9b	Decouple clan type from dashboard details ... Adding dashboardType field, private clans automatically set this to ‘premium’.	2015-04-20 14:04:22 -07:00
brokenelevator	46381cf1df	Update pl.coffee	2015-04-20 19:56:40 +02:00
Imperadeiro98	a859a71e6f	Merge pull request #2684 from nixel2007/ru ... Update ru.coffee	2015-04-19 21:17:53 +01:00
Nick Winter	cf07960e81	Merge pull request #2662 from dheerajdake/dheerajdake-patch-1 ... New female and male names added!	2015-04-19 08:46:01 -07:00
Nick Winter	17ce3fca6b	Merged zh-HANS.coffee.	2015-04-19 08:43:35 -07:00
Nikita Gryzlov	32190a4f0e	Update ru.coffee ... Missed translation	2015-04-19 13:09:24 +03:00
Nikita Gryzlov	c9d84a72c2	Update ru.coffee	2015-04-19 12:57:59 +03:00
Nick Winter	63596aa6b5	Fixed #2450: added i18n for new items in the victory modal.	2015-04-18 21:10:35 -07:00
Nick Winter	a0057910ac	Fixed #2597: press escape to abort simulation now, if your code is going to be slow.	2015-04-18 19:54:34 -07:00
Nick Winter	ea54c4a8e3	Keeping GPLUS_TOKEN_KEY in localStorage forever.	2015-04-18 19:41:34 -07:00
Nick Winter	a62288045f	Noticed Diplomat modal in sk.coffee wasn't translated.	2015-04-18 19:41:12 -07:00
Nick Winter	0d81f658ae	Fixed #2452: handling four and even five-digit gem/xp totals in victory screen.	2015-04-18 19:40:53 -07:00
Nick Winter	a1199a0121	Fixed #343. Fixed #2565. localStorage cache now only lasting a week for most items, using lscache (bower install, y'all).	2015-04-18 17:25:40 -07:00
Nick Winter	b358296120	Fixed #2420. Fixed #2605. Can now change programming language from LadderPlayModal.	2015-04-18 16:57:02 -07:00
Nick Winter	485718b6e3	Fixed #2581: triggering window resize event when loading view unveils, in case window was resized before then and messed up our initial spell view height.	2015-04-18 16:33:40 -07:00
Nick Winter	d4068cc879	Fixed #2218: adjusted some real-time playback speed factors.	2015-04-18 16:19:16 -07:00
Nick Winter	114b0f4937	Fixed typo in last commit.	2015-04-18 16:08:31 -07:00
Nick Winter	86ae0979c5	Working on #2505; do we have TLS for the analytics server yet?	2015-04-18 16:02:18 -07:00
Nick Winter	7471b14c4d	Fixed #2013: removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution.	2015-04-18 15:52:24 -07:00
Nick Winter	ea80e22dc6	Don't point out Lost Viking, since most players shouldn't attempt it. Adjust autocomplete default parameter from string to variable for Known Enemy.	2015-04-18 14:13:05 -07:00
wgsu	42c435a19e	Update zh-HANS.coffee	2015-04-18 11:35:32 -04:00
sauki8	fd68208bce	Update id.coffe	2015-04-18 12:38:31 +07:00
Nick Winter	1952a8ea23	Fixed #2305: removed CSS initial keyword usage.	2015-04-17 11:42:38 -07:00
Imperadeiro98	dd04dd88cf	Update pt-PT.coffee	2015-04-17 15:22:08 +01:00
Imperadeiro98	5cc32cb18a	Uncommented some translations	2015-04-17 15:08:13 +01:00
Imperadeiro98	e4391ca034	Merge pull request #2679 from noashess12/patch-5 ... Update ar.coffee	2015-04-17 15:06:09 +01:00
noashess12	83f2723628	Update ar.coffee	2015-04-17 14:30:32 +03:00
nixel2007	e96b1d3f78	Update ru.coffee	2015-04-17 12:37:29 +03:00
Nick Winter	2eb95c32df	Propagated i18n.	2015-04-16 18:35:40 -07:00
Matt Lott	45c070209b	Update private clans dashboard	2015-04-16 15:26:14 -07:00
Nick Winter	48ba17a34c	Merged hu.coffee.	2015-04-16 14:17:22 -07:00
Imperadeiro98	05e987283c	Fixed couple issues from last merge	2015-04-16 22:12:26 +01:00
brokenelevator	16d970940f	Update pl.coffee	2015-04-16 21:41:15 +02:00
Nick Winter	4de9071f1a	Added a projection to Clans getMemberSessions to help with the gargantuan fetch running us out of memory.	2015-04-16 08:03:19 -07:00
Imperadeiro98	7aff510f3e	Merge pull request #2674 from nixel2007/ru ... Update ru.coffee	2015-04-16 14:23:24 +01:00
nixel2007	2e8f1422da	Update ru.coffee	2015-04-16 11:50:30 +03:00
brokenelevator	8c4181c3e4	Update pl.coffee	2015-04-16 06:35:12 +02:00
brokenelevator	8a1f7a0d20	Update pl.coffee	2015-04-16 06:32:15 +02:00
brokenelevator	0820dd9041	Update pl.coffee	2015-04-16 05:05:33 +02:00
Imperadeiro98	3b9ee13378	Merge pull request #2671 from steog88/patch-1 ... Update it.coffee	2015-04-15 19:25:21 +01:00
Matt Lott	2f8831ea72	Show clan type in My Clans list	2015-04-15 11:12:35 -07:00
Matt Lott	2b29e755fe	Make clan name and description editable	2015-04-15 11:09:43 -07:00
steog88	007cddb9f1	Update it.coffee	2015-04-15 15:26:27 +02:00
LuiKang	4f61ebf30d	range translation too wide ... 'range' translation was too wide also	2015-04-15 10:27:54 +02:00
LuiKang	f1065053b2	Update hu.coffee ... 'blocks' translation was too wide so the shield block value was not readable.	2015-04-15 10:11:06 +02:00
Imperadeiro98	198536f592	Uncommented some strings and headers	2015-04-14 18:04:07 +01:00
Imperadeiro98	aa8a4cb010	Merge pull request #2667 from YukiUeda/patch-1 ... translated some sentences	2015-04-14 18:02:07 +01:00
Nick Winter	75b3361efe	Fixed #2390. Fixed #2391. Added hero-ladder and replayable particles to campaign level banners, plus replayable difficulty indicators.	2015-04-13 17:07:13 -07:00
Nick Winter	a7bb97e5f2	Fixed #2649: made leaderboard buttons more obvious.	2015-04-13 16:26:58 -07:00
Nick Winter	8649383a8c	Fixed #2416: LadderTabView now shows hero portraits.	2015-04-13 16:17:22 -07:00
Nick Winter	588b7c9834	Fixed #2564: level info underlapping too-large game control buttons on tiny screens.	2015-04-13 15:53:02 -07:00
Nick Winter	d781500321	Fixed #2577: added feedback to diplomat email subscribe, takes you to Diplomat page afterward.	2015-04-13 15:14:36 -07:00
Nick Winter	e7df703d36	Fixed #2651: indicate better that sample code is locked when it won't let them type in there.	2015-04-13 15:04:42 -07:00
Nick Winter	a6d1905580	Merged ar.coffee.	2015-04-13 12:46:33 -07:00
Imperadeiro98	e66522ec92	Uncommented some headers	2015-04-13 20:12:58 +01:00
Imperadeiro98	d0b8df797c	Merge pull request #2666 from LuiKang/patch-1 ... Update hu.coffee (magyar fordítás frissítés)	2015-04-13 20:08:01 +01:00
Imperadeiro98	8d035617aa	Uncommented some translations	2015-04-13 20:07:15 +01:00
Imperadeiro98	eb93586f0e	Merge pull request #2645 from noashess12/patch-2 ... Update ar.coffee	2015-04-13 20:00:26 +01:00
YukiUeda	3c55e53b36	translated some sentences	2015-04-13 14:08:01 +09:00
LuiKang	c54373a042	Update hu.coffee ... Pár helyen a meglévő szavakon is pontosítottam, amelyek akár szerepjátékos szemmel, akár programozói szemmel nem tűntek számomra pontosnak.	2015-04-12 23:36:15 +02:00
Popey Gilbert	03697ed34f	Added Gygram back	2015-04-12 21:09:46 +01:00
Popey Gilbert	1ce628ccc6	Sort alphabetically	2015-04-12 20:40:24 +01:00
Nick Winter	4c008e4686	Fixed #2406.	2015-04-12 12:20:33 -07:00
Gygram	e227e48e86	Update DiplomatView.coffee	2015-04-12 21:00:02 +02:00
Nick Winter	eb075b99a0	Fixed #2448 with better random session query distribution.	2015-04-12 11:34:19 -07:00
Dheeraj Dake	30ba84ca56	New female and male names added! ... Female = Anabel, Paulark Male = Eugen, Toremon	2015-04-11 15:16:32 -07:00
Matt Lott	4669d4cb0a	Update admin subs dashboard ... Break up lengthy server calls to reduce timeouts in production.	2015-04-11 10:36:03 -07:00
Robert Beuligmann	bcc7342198	Vector.toString precision parameter ... Vector.toString changed to accept precision parameter, defaulted to 2. Allows more natural display of small or normalized vectors. removed non-functional useZ parameter.	2015-04-11 00:44:28 -06:00
Nick Winter	e85c53ea42	Programming is good for your childrens's careerses, O dear parents.	2015-04-10 14:35:13 -07:00
Matt Lott	6d892359c7	Private clans UI ... Add private checkbox for clan creation. Add info popover for private clans. Subscribe prompt for create/join if necessary. Don’t list private clans in public list.	2015-04-10 14:33:16 -07:00
Nick Winter	7e2caddd02	Fixed #2579 by moving parent button popover content to jade.	2015-04-10 13:47:06 -07:00
noashess12	d925012571	Update ar.coffee	2015-04-10 23:08:59 +03:00
Matt Lott	5c40221ab2	Update admin subs dashboard ... Using invoices to aggregate totals which should provide a more accurate growth rate.	2015-04-10 11:27:59 -07:00
Nick Winter	05ac763eb8	Making '' requiredThangType entries more recoverable.	2015-04-10 11:27:13 -07:00
Nick Winter	6eeb29e8d4	Multiplayer levels go to ladder when you click Scores instead of to a blank single-player leaderboard.	2015-04-10 09:23:00 -07:00
Nick Winter	ebd0e7db84	Giving more simulation time before infinite loop timeout to headless simulation.	2015-04-10 08:24:19 -07:00
cundamic	64c7dec7a5	Update sk.coffee ... minor changes	2015-04-10 06:51:13 +02:00
noashess12	f03d279f8a	Update ar.coffee	2015-04-10 00:12:01 +03:00
Imperadeiro98	a4c1154fd8	Update pt-PT.coffee	2015-04-09 21:51:43 +01:00
Nick Winter	3b224db839	Propagated i18n.	2015-04-09 11:51:01 -07:00
Matt Lott	adea59054b	Remove bitcoins from sub payments blurb	2015-04-09 09:42:44 -07:00
Matt Lott	65e009330a	Remove invalid bitcoin comment	2015-04-09 09:42:44 -07:00
Imperadeiro98	c6b511749a	Some fixes to last merge	2015-04-09 14:36:12 +01:00
Imperadeiro98	702c3b611f	Merge pull request #2643 from JCesar91/patch-2 ... Update es-419.coffee	2015-04-09 14:34:40 +01:00
Imperadeiro98	3f1fc636c2	Merge pull request #2644 from ArthurLu/master ... Update zh-HANT.coffee	2015-04-09 14:33:12 +01:00
Nick Winter	9ee0400c18	Updated to just send out tell-a-parent emails, no tell-a-friend emails.	2015-04-08 21:48:21 -07:00
Barney	a48800bb84	Update zh-HANT.coffee	2015-04-09 11:09:14 +08:00
Barney	03e2ab6ee7	Merge remote-tracking branch 'upstream/master'	2015-04-09 10:15:17 +08:00
Nick Winter	2eec3e7831	Simplified share progress email to just share with parents, not friends.	2015-04-08 18:31:13 -07:00
JMan	b46283e18a	Update es-419.coffee ... Translated a few more lines, mostly about player subscription benefits.	2015-04-08 19:54:17 -04:00
Nick Winter	6d9c13b7e1	Promoting Favorable Odds as the cool thing to do that all the cool kids are doing 'cause it's so cool.	2015-04-08 16:23:51 -07:00
Nick Winter	d082aa3754	Fixed leaderboard level projection issue.	2015-04-08 15:11:35 -07:00
Nick Winter	98b749eb1b	Making simulator stuff more efficient by using less bandwidth.	2015-04-08 12:00:23 -07:00
Matt Lott	b500e5334a	Update admin subs dashboard	2015-04-08 11:53:26 -07:00
Imperadeiro98	ce56312120	Changed some spr and spl in contact form	2015-04-08 19:31:52 +01:00
Imperadeiro98	e923f7a4fc	Moved a string to its correct place	2015-04-08 19:25:59 +01:00
Nick Winter	d743bd3a4e	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-04-08 10:56:02 -07:00
Nick Winter	8bf42fff50	Added achievement, campaign, and poll patch properties to User schema.	2015-04-08 10:55:44 -07:00
Imperadeiro98	e1aaa9faee	Update pt-PT.coffee	2015-04-08 18:46:02 +01:00
Nick Winter	7fa782e7bd	Workaround for #2630: Programmable is weird.	2015-04-08 10:31:38 -07:00
Nick Winter	0f124bdddc	Fixed i18n editor not allowing translation of level guides.	2015-04-08 09:51:54 -07:00
Nick Winter	e6c200b64d	eye-open instead of eye-close for non-English leaderboard view buttons.	2015-04-08 09:46:55 -07:00
Nick Winter	817e382324	Updated VCS link/blurb for Lost Viking.	2015-04-08 09:44:15 -07:00
Matt Lott	51e25d8a9c	Update /teachers level counts	2015-04-08 09:42:39 -07:00
cundamic	e1f5a31734	Update sk.coffee ... translation: classes, contribute	2015-04-08 15:43:01 +02:00
Nick Winter	2103c6b4e0	Shared ranks in case of ties for Zero Sum.	2015-04-07 21:10:41 -07:00
Nick Winter	497978b27d	Preparing Zero Sum tournament results.	2015-04-07 20:56:24 -07:00
Nick Winter	f02a8b54f3	Fixed #2596. Stopped bless-brunch from using its cacheBuster feature. Set no-cache header for /db/model.type/slug so that we can use Cloudflare on /db/model.type/object-id. Fixed a coffeelint warning.	2015-04-07 19:03:35 -07:00
Matt Lott	f3c973b945	Add payment methods to subscribe dialog ... And update level counts in subscription breakdown.	2015-04-07 15:54:59 -07:00
Nick Winter	8e715560c2	Using a watch button instead of an eye icon for leaderboards in English.	2015-04-07 15:32:41 -07:00
Matt Lott	3c755d39e6	Add recent subscribers to admin dashboard	2015-04-07 15:00:53 -07:00
Nick Winter	bf86b2f9cd	Not including levels that are unlocked in later campaigns in level counts for earlier campaigns until they are started.	2015-04-07 14:32:51 -07:00
Nick Winter	eef33f2ed5	Community popovers now pop to the top instead of to the bottom.	2015-04-07 13:58:04 -07:00
Imperadeiro98	ef19612ab2	Changed some spr and spl in community page... ... ... so that links don't get over-underlined	2015-04-07 21:51:57 +01:00
Nick Winter	f60e8d1885	Don't need confusing nested comment about Backbone (see #2633).	2015-04-07 13:44:40 -07:00
Nick Winter	2dec5921e8	Merged sk.coffee.	2015-04-07 13:33:31 -07:00
Nick Winter	3ec2d776e6	Improved style for programming concept display in campaign view.	2015-04-07 13:32:18 -07:00
cundamic	16bb298250	Update sk.coffee ... translation : about II. ladder II	2015-04-07 21:03:53 +02:00
Nick Winter	b388d25435	Hooked up Viking Code School offer for players who beat Lost Viking.	2015-04-07 11:19:22 -07:00
Nick Winter	50adb7b982	Fixed previously started subscriber-only levels not being available to non-subscribers.	2015-04-07 10:18:04 -07:00
Imperadeiro98	a1dba5886c	Merge pull request #2638 from cundamic/patch-13 ... Update sk.coffee	2015-04-07 18:00:03 +01:00
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
Nick Winter	e21360127d	Polls!	2015-03-08 16:36:17 -07:00
javatlacati	3a3e445be5	Update es-419.coffee ... Some update on translation.	2015-03-08 03:53:37 -06:00
Jorge	dedb001bdd	Translate more lines to portuguese brasilian.	2015-03-08 00:49:29 -03:00
Jorge	398ac998ab	Merge branch 'master' of https://github.com/jklemm/codecombat	2015-03-07 23:21:35 -03:00
Nick Winter	6954175fa8	Fixed world.rand.shuffle for arrays of length 0 or 1.	2015-03-06 17:35:11 -08:00
Jorge Klemm	5842481387	Update pt-BR.coffee	2015-03-06 15:16:25 -03:00
Jorge Klemm	b9e2490108	Update pt-BR.coffee	2015-03-06 10:40:02 -03:00
Nick Winter	10f2df3480	Added extra lesson resource links to the Guide.	2015-03-05 08:58:11 -08:00
Imperadeiro98	cbbdd4f3ab	Uncommented some headers... ... ... and fixed errors from last merge.	2015-03-05 16:32:46 +00:00
Imperadeiro98	40318158c1	Merge pull request #2468 from cookiekrieger/cookiekrieger-patch-2 ... Cookiekrieger patch	2015-03-05 16:25:42 +00:00
Imperadeiro98	9aa445ef71	Uncommented some translations from last merge	2015-03-05 16:25:27 +00:00
Imperadeiro98	1b4ef93e25	Merge pull request #2471 from javatlacati/patch-2 ... Update it.coffee	2015-03-05 16:20:33 +00:00
javatlacati	edd86ac87b	Update it.coffee	2015-03-05 05:40:03 -06:00
nixel2007	6fafd51d89	Update ru.coffee. Invoice block	2015-03-05 13:11:57 +03:00
nixel2007	1d793fbdf4	Update ru.coffee	2015-03-05 12:17:24 +03:00
Matt Lott	cd59b90e37	Add custom payments ... Example: https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip tions	2015-03-04 15:40:53 -08:00
Nick Winter	942bab554a	Restored lost vi translations, with section headers this time, as caught in #2428.	2015-03-04 14:49:04 -08:00
Nick Winter	025f1c5afc	Fixed ellipse-ellipse intersection test.	2015-03-04 13:53:57 -08:00
cookiekrieger	77fb084d29	Update de-DE.coffee	2015-03-04 22:24:27 +01:00
cookiekrieger	3a4115d779	Update de-DE.coffee	2015-03-04 22:12:52 +01:00
Nick Winter	60db16b1c3	Making all code languages load for level editor to avoid busted level previews. Added CoffeeScript compiler to web worker so we can use Referee extraCode.	2015-03-04 11:29:03 -08:00
cookiekrieger	ce8ff52936	Update de-DE.coffee ... Sometimes I left the originalcode as a commentary behind the text. I hope this is allowed.	2015-03-04 18:32:41 +01:00
Imperadeiro98	e63f194fd1	Update pt-PT.coffee	2015-03-04 17:19:28 +00:00
Nick Winter	e6cf298ed3	Propagated i18n. A couple other misc tweaks.	2015-03-04 09:00:32 -08:00
Nick Winter	2d18bcf9f0	Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level.	2015-03-03 09:04:53 -08:00
Nick Winter	a082d2e05f	Merged hu.coffee.	2015-03-02 12:11:54 -08:00
Nick Winter	2fe4be4034	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-03-02 10:23:02 -08:00
Nick Winter	0f53605c21	Merged names. Added genders to all name categories. Reordered names so ones we need more are towards the top.	2015-03-02 10:22:04 -08:00
Matt Lott	57bfa86719	🐛Fix IE9 analytics logging CORS problem ... There’s limited CORS support on IE9.	2015-03-02 10:11:58 -08:00
Thejdeep	e6c60a8027	Added a quote	2015-03-02 20:54:30 +05:30
Nick Winter	bb80db9cd5	Server now thinks it's production whenever it's not localhost:3000, rather than whenever it is codecombat.com.	2015-03-01 22:19:01 -08:00
divyanshu013	ae5aafb24a	Added /account link to logged in username for #1635 ... Clicking on the username should point to /account page of the logged in user.	2015-03-02 01:38:47 +05:30
Nick Winter	dc56a50b75	Handling empty context objects in i18n edit view.	2015-03-01 09:40:14 -08:00
Nick Winter	26c5c17eab	Fixed #2427.	2015-03-01 07:51:24 -08:00
divyanshu013	e66d94c59f	Bug fix for layout problem in German subscribe for #2409 ... A small fix adjusting the font sizes.	2015-03-01 20:08:14 +05:30
divyanshu013	fac48752fa	A small fix for confusing Hero Modal weaopons list for #1774	2015-03-01 20:08:14 +05:30
nixel2007	e1cfd9763f	Update ru.coffee ... tip_open_source_contribute and clear_storage	2015-03-01 16:11:09 +03:00
Imperadeiro98	f3e7018c88	Re-ordered contributor classes... ... ... in community view according to contribute page order.	2015-03-01 11:25:23 +00:00
Imperadeiro98	81c234723b	Update pt-PT.coffee	2015-03-01 11:20:53 +00:00
Nick Winter	8e37505197	Merge pull request #2442 from DotTry/patch-3 ... Updated Translation	2015-02-28 16:12:25 -08:00
Nick Winter	c9be09474c	Merge pull request #2441 from Coderaulic/patch-1 ... Update ja.coffee	2015-02-28 16:11:35 -08:00
Nick Winter	f5668a1f09	Merge pull request #2440 from nixel2007/master ... Update ru.coffee	2015-02-28 16:11:06 -08:00
Nick Winter	b79458d819	Merged es-419.coffee.	2015-02-28 16:09:49 -08:00
Nick Winter	6de70308aa	Merged ar.coffee.	2015-02-28 16:07:34 -08:00
Nick Winter	62b6191862	Merge pull request #2435 from Khoffee/patch-1 ... Update names.coffee	2015-02-28 16:05:58 -08:00
Nick Winter	62a21acdd0	Merge pull request #2432 from DotTry/patch-1 ... Added 13 names.	2015-02-28 16:03:41 -08:00
Nick Winter	5bbe330136	Propagated i18n.	2015-02-28 16:00:55 -08:00
Nick Winter	6789a8d6bc	Rearranging tip_open_source_contribute link.	2015-02-28 16:00:04 -08:00
Nick Winter	2f9de1a9b2	Merge pull request #2438 from kojoidrissa/master ... New Loading messages/Tips	2015-02-28 15:55:23 -08:00
DotTry	914817abe9	Updated Translation ... A couple of lines.	2015-02-28 17:00:43 -06:00
Coderaulic	0c056769bb	Update ja.coffee ... Translated all of About Page. Some minor fix and one off translations here and there.	2015-02-28 14:43:18 -08:00
nixel2007	8f1ef498b5	Update ru.coffee ... Fix spelling	2015-03-01 01:39:49 +03:00
Kojo Idrissa	93cc73b490	Merge remote-tracking branch 'upstream/master'	2015-02-28 16:08:12 -06:00
Kojo Idrissa	bad3b48af1	reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute"	2015-02-28 15:47:43 -06:00
laituan245	7a19c616c3	Fixed issue #2430	2015-03-01 06:19:35 +09:00
Kojo Idrissa	5812f954f7	added new loading message/tip from prior commit to en-GB & en-US.coffee files	2015-02-28 15:09:12 -06:00
Kojo Idrissa	39f04f0f8b	added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files	2015-02-28 15:03:40 -06:00
FedericoTomas	307556d0d1	Update es-419.coffee ... now its done, thanks.	2015-02-28 17:03:57 -03:00
Imperadeiro98	2bac9b5607	Merge pull request #2425 from nixel2007/master ... Update ru.coffee	2015-02-28 19:48:39 +00:00
Khoffee	b010a9b388	Update names.coffee ... Added more names for issue #53	2015-02-28 13:24:20 -06:00
Fahad Iqbal	ea31862e85	Adding a few names	2015-02-28 12:44:54 -06:00
DotTry	d135ba2513	Added 10 names.	2015-02-28 12:39:30 -06:00
FedericoTomas	8cc99adfd6	Update es-419.coffee ... Doing some work	2015-02-28 15:32:29 -03:00
Kojo Idrissa	d55e4fecba	Added multiple names	2015-02-28 11:58:20 -06:00
nixel2007	6902b7e246	Update ru.coffee	2015-02-28 18:48:36 +03:00
Nick Winter	44008be95f	Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level.	2015-02-27 21:37:55 -08:00
Matt Lott	86d167394e	Remove Segment analytics dependency ... Call Google Analytics, Errorception, and Inspectlet directly.	2015-02-27 16:07:41 -08:00
Imperadeiro98	f2f1359e3b	Update pt-PT.coffee	2015-02-27 22:54:51 +00:00
Nick Winter	6596912fa4	Propagated i18n.	2015-02-27 14:37:05 -08:00
Nick Winter	00245c69ec	Actually activated the previous fix.	2015-02-27 14:07:07 -08:00
Nick Winter	8df779b5a3	Fixed issue of level editor getting super low res when resizing the window when not looking at the ThangsTabView.	2015-02-27 13:49:26 -08:00
Nick Winter	473f9304fd	Merge pull request #2412 from h3yduck/navbar_issue ... Add "navigation bar" to user profile page (issue 2411)	2015-02-27 13:27:17 -08:00
Szabolcs Gelencser	b022a94cf1	Update hu.coffee	2015-02-27 21:51:42 +01:00
Michael Schmatz	d0d622445f	Fixed tracking for non production environments	2015-02-27 14:44:06 -05:00
Michael Schmatz	4efb73d8d7	Switch to new analytics server	2015-02-27 13:45:10 -05:00
Nick Winter	45d4b25c60	Fixed #1048 because I accidentally closed it and then didn't want to reopen it, so figured I might as well fix it as if I meant to do that the whole time.	2015-02-27 09:28:26 -08:00
Szabolcs Gelencser	58f2494c83	update campaign.schema.coffee also	2015-02-27 18:16:16 +01:00
Szabolcs Gelencser	dde3e8cf8f	Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired	2015-02-27 17:33:38 +01:00
Nick Winter	b4e9ee67f0	Added one-minute in-memory server caching for a bunch of common queries.	2015-02-26 17:20:27 -08:00
Nick Winter	9b34d4e166	Ooops, that was just for testing.	2015-02-26 16:04:57 -08:00
Szabolcs Gelencser	b138001205	for issue #2406	2015-02-26 23:42:37 +01:00
Nick Winter	e881aec7d7	Account button shouldn't show up for anonymous players.	2015-02-26 14:35:41 -08:00
Nick Winter	77bca72002	Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white.	2015-02-26 14:24:00 -08:00
Szabolcs Gelencser	eb30daf07a	use nav.profile for i18n	2015-02-26 21:57:05 +01:00
Szabolcs Gelencser	a6ad04af53	Add navbar to profile	2015-02-26 12:19:32 -08:00
Nick Winter	32a95afbd0	Allowing reordering of levels in Campaign. Reversing CampaignEditor levels before save so that when the save magically reverses them again, the order is preserved.	2015-02-26 11:33:07 -08:00
Matt Lott	52bc660391	Add external subs script	2015-02-26 08:44:56 -08:00
Nick Winter	7d2c99acd7	Added attack/health/speed tooltip explanations on hero picker stat comparison bars.	2015-02-26 08:02:22 -08:00
Imperadeiro98	d4c64457b4	Update en.coffee	2015-02-26 14:49:33 +00:00
Imperadeiro98	6a6cd83252	Fixed i18n in about page	2015-02-26 14:48:58 +00:00
Imperadeiro98	ed2f498917	Added i18n to subscribe price	2015-02-26 14:41:40 +00:00
Nick Winter	df4b98a9bf	Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.	2015-02-25 18:41:39 -08:00
Nick Winter	7e889a2a80	Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory.	2015-02-25 18:09:55 -08:00
Nick Winter	3be2b6406d	Admins are now automatically premium.	2015-02-25 17:45:01 -08:00
Nick Winter	c8c76e6b74	Trying to track down the cause of InventoryModal loading without a hero assigned.	2015-02-25 16:19:49 -08:00
Nick Winter	b6d8ceafb0	Updating team page and avatars.	2015-02-25 15:40:50 -08:00
Nick Winter	a2a78286da	Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.	2015-02-25 14:24:32 -08:00
George Saines	9adb59f9ad	fixing the buy gems background	2015-02-25 14:21:32 -08:00
Nick Winter	714ff0a249	Merge pull request #2408 from laituan245/master ... Update hero-victory-modal.sass (Issue 1917)	2015-02-25 13:59:52 -08:00
laituan245	e73208f8e8	Update hero-victory-modal.sass	2015-02-26 06:03:17 +09:00
Nick Winter	15ca65f226	Further disabled employer portal for now.	2015-02-25 12:38:51 -08:00
Nick Winter	d58d151b8c	Got rid of debugging code that was making Hour of Code stuff always show up.	2015-02-25 12:32:59 -08:00
Nick Winter	a66e1c5389	Retoring next level highlight arrow for players who are very new when they click off a selected level.	2015-02-25 11:58:03 -08:00
Nick Winter	9be8c55d6f	Started some new Thang name categories for #53.	2015-02-25 11:50:43 -08:00
Nick Winter	13f9d71cca	You can now use bitcoin to buy gems.	2015-02-25 11:33:51 -08:00
Nick Winter	1ab8274c43	Added a clear storage button to the campaign editor.	2015-02-25 11:09:15 -08:00
angryelven-jdd	6654cfb410	Update de-DE.coffee ... translated subscription section	2015-02-25 16:05:06 +01:00
Nick Winter	1c14059d92	Better console logging for Vectors and shapes.	2015-02-24 18:21:33 -08:00
George Saines	88ebd5f46b	adding subscribe option to buy gems modal	2015-02-24 17:40:50 -08:00
Imperadeiro98	289ddb0a4f	Removed unneeded strong tag from last merge	2015-02-24 21:54:13 +00:00
Shady Kamal	431b9dca85	Update he.coffee	2015-02-24 23:42:47 +02:00
Nick Winter	be625cbfbe	Merge pull request #2403 from divyanshu013/master ... Bug fix for long hero button text in Russian for #1918	2015-02-24 12:56:55 -08:00
Imperadeiro98	c174cc35fa	Merge pull request #2401 from popey456963/master ... Update teacher.jade	2015-02-24 20:49:13 +00:00
Popey456963	e5c71d0c6a	Changed aimed to recommended	2015-02-24 20:46:49 +00:00
Popey456963	f79d90b81f	Changed requirement to recommended	2015-02-24 20:40:44 +00:00
divyanshu013	f2459f1b39	Bug fix for long hero button text in Russian for #1918	2015-02-25 02:08:08 +05:30
Popey456963	9419ec1d33	Update EN.coffee ... For new Teacher.jade	2015-02-24 20:17:04 +00:00
Nick Winter	9dd07b024e	Fixed item shop not loading items with later letters of the alphabet, since there are now so many items.	2015-02-24 12:15:35 -08:00
Popey456963	dabf5ce57d	Added minimum age	2015-02-24 20:13:13 +00:00
Nick Winter	1c691283c4	Merge pull request #2400 from laituan245/iss2388 ... Add Profile to account page (Issue #2388)	2015-02-24 11:57:19 -08:00
laituan245	23a9aa5e33	Changed the URL style	2015-02-25 04:53:20 +09:00
Imperadeiro98	49b6f4ff82	Merge pull request #2397 from divyanshu013/patch-1 ... Update hi.coffee	2015-02-24 19:52:09 +00:00
Nick Winter	592fd52699	Fixed ko.coffee inventory header.	2015-02-24 11:48:44 -08:00
Nick Winter	1e448abde2	Merged ko.coffee.	2015-02-24 11:47:33 -08:00
Divyanshu Maithani	17bdabcc7a	Update hi.coffee	2015-02-25 01:16:47 +05:30
Nick Winter	e48d996a60	Fixed #2286.	2015-02-24 11:45:50 -08:00
Popey456963	ff8e18146e	Edited Teacher.Jade ... Removed HoC references, Added Arrays and Expanded Acronym	2015-02-24 19:31:22 +00:00
Imperadeiro98	9f9e9cc639	Update pt-PT.coffee	2015-02-24 19:24:12 +00:00
Imperadeiro98	088d194755	Merge pull request #2396 from ITz7/patch-6 ... Update zh-HANT.coffee	2015-02-24 19:08:06 +00:00
Imperadeiro98	f42a2af8d7	Merge pull request #2395 from ITz7/patch-5 ... Update zh-HANS.coffee	2015-02-24 19:07:21 +00:00
laituan245	a78f864607	Add Profile to account page (Issue #2388)	2015-02-25 04:03:46 +09:00
Nick Winter	4cbbcdad6d	Merge pull request #2359 from laituan245/master ... Added ability to delete account	2015-02-24 09:30:22 -08:00
laituan245	a588a3b2c8	Some updates to the PR #2359	2015-02-25 02:12:39 +09:00
laituan245	eb53381083	Don't delete the User object, just remove all the properties except for _id	2015-02-24 22:36:12 +09:00
Aman Kumar	0df2dea469	Issue #2387: Accounts setting toggle all fix	2015-02-24 17:25:18 +05:30
Divyanshu Maithani	335e1d96e8	Update hi.coffee	2015-02-24 02:48:20 -08:00
ITz7	5d6b2a890c	Update zh-HANT.coffee ... wondered why Herotype isnt translated o.o	2015-02-24 14:41:18 +08:00
ITz7	a326361e42	Update zh-HANS.coffee ... Many Minor Updates + FInalization :D	2015-02-24 14:36:46 +08:00
Nick Winter	c43ddda235	Reduced number of events being sent by cutting out simulator results.	2015-02-23 16:56:16 -08:00
Nick Winter	34a92838a5	Propagated i18n.	2015-02-23 16:01:06 -08:00
Nick Winter	69959caba5	Using common.play instead of home.play for a more-common use of it.	2015-02-23 15:59:42 -08:00
Nick Winter	88c55fa7fd	Fix for making ja start game text break lines in the right places. #2386	2015-02-23 15:57:43 -08:00
Nick Winter	4d35c2cefc	Merged.	2015-02-23 15:05:54 -08:00
Nick Winter	0f6404fea1	Being a tiny bit more idiomatic about CoffeeScript ranges.	2015-02-23 15:03:48 -08:00
Nick Winter	6d9e7a76ce	Merge pull request #2389 from amankr/bug/duplicates ... Issue #2267: Removed duplicates from TreemaData	2015-02-23 15:02:20 -08:00
Nick Winter	fb10de5023	Merge pull request #2376 from amankr/login ... Issue #2082: Campaign editor login fixed	2015-02-23 14:54:15 -08:00
Nick Winter	1513e20486	Merge pull request #2370 from amankr/newfeature ... Issue #1785: Empty level editor folders removed	2015-02-23 14:53:08 -08:00
Nick Winter	1314695382	Merge pull request #2385 from nixel2007/master ... Update diplomat.jade	2015-02-23 14:50:04 -08:00
Nick Winter	61831e83c2	Merge pull request #2368 from rmarren1/master ... Slight cleanup to level indicator code	2015-02-23 14:49:13 -08:00
Aman Kumar	d8a4803268	Issue #2267: Removed duplicates from TreemaData	2015-02-24 03:18:35 +05:30
Coderaulic	21ddb9ca59	Update ja.coffee ... Some minor fixes added based on last changes. Can you tell me how to add a line break? Is it " text \ text " for: text text as output? Or "ABC '\' DEF" for: ABC DEF Not familiar with line breaks in coffee script.	2015-02-23 12:24:00 -08:00
Imperadeiro98	6afad49d8f	Some fixes to last merge	2015-02-23 20:21:10 +00:00
Imperadeiro98	c375a8ed12	Merge pull request #2384 from etem/master ... Update bg.coffee	2015-02-23 20:16:08 +00:00