9801 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alan Hohn	9b22fd2323	Integrate Vagrant	2015-03-26 16:36:38 -04: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	238c36ac74	Merge branch 'master' into production	2015-03-25 16:53:35 -07: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
Imperadeiro98	d750c95933	Merge pull request #2573 from matheod/patch-2 ... Correct action_cooldown translation (french translation).	2015-03-25 22:33:55 +00: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
Imperadeiro98	4e66b906b0	Merge pull request #2572 from matheod/patch-1 ... Two missing spaces on french translation	2015-03-25 21:06:26 +00: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
Matt Lott	ef0087c8b1	Create bulk prepaids script	2015-03-25 12:23:51 -07:00
Imperadeiro98	a238b8b6db	Fixed indentation in sk.coffee	2015-03-25 12:08:26 +00:00
Imperadeiro98	5259c9ff00	Merge pull request #2571 from cundamic/patch-1 ... Update sk.coffee	2015-03-25 12:05: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	1feba83fed	Merge branch 'master' into production	2015-03-24 18:57:12 -07:00
Nick Winter	a7244e1567	Tweaking offer triggers.	2015-03-24 18:56:32 -07:00
Nick Winter	a39a4d4c1c	MailChimp API doesn't let us segment by custom properties like chinaVersion.	2015-03-24 18:22:59 -07:00
Nick Winter	5bc58ce996	Added MakerSquare email offer. Not emailing subscribers with next-steps offers.	2015-03-24 17:08:50 -07:00
Nick Winter	94cec4c9e6	Merge branch 'master' into production	2015-03-24 15:40:04 -07: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	34b38c9678	Merge branch 'master' into production	2015-03-24 15:26:37 -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	56581cfc96	Merge branch 'master' into production	2015-03-23 17:01:46 -07:00
Nick Winter	62e8ee624c	Made chinaVersion detection fire only when the language is Chinese.	2015-03-23 17:00:29 -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	90bc6fb39e	Merge branch 'master' into production	2015-03-23 16:38:20 -07:00
Nick Winter	eda57e366a	Fix for anonymous user signups.	2015-03-23 16:38:12 -07:00
Nick Winter	d34577dd38	Propagated i18n.	2015-03-23 15:54:26 -07:00
Nick Winter	0b601ea695	Merge pull request #2558 from nixel2007/scocode ... Add npm&bower update to SCOCODE.bat. Update ver #	2015-03-23 15:46:25 -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
Imperadeiro98	bcc8bf66c5	Merge pull request #2559 from AtaZh/master ... Update uk.coffee	2015-03-23 13:30:57 +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