10948 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matt Lott	e37c5645ef	Merge branch 'master' into production	2015-09-25 15:23:56 -07:00
Matt Lott	5eadd926b3	Move redeem prepaid code UI out of modal	2015-09-25 15:21:51 -07:00
Nick Winter	f9b9ac8f86	Fix error in playing victory sound	2015-09-25 15:19:44 -07:00
ecemm	3a07c6a257	Update tr.coffee	2015-09-26 00:32:57 +03:00
RUSLAN LÓPEZ CARRO	4060a1b029	Update es-419.coffee	2015-09-25 16:32:15 -05:00
Matt Lott	c6caafb7cd	Remove extra Stripe call in sub prepaid redeem	2015-09-25 14:06:51 -07:00
Nick Winter	11c03b3905	Think I fixed commonJSHeader regardless of npm version.	2015-09-25 13:58:42 -07:00
Imperadeiro98	4cb885faf3	Small change	2015-09-25 20:54:21 +01:00
Imperadeiro98	446b193f8c	Added i18n to courses	2015-09-25 20:51:51 +01:00
Imperadeiro98	17a24bbcba	Merge pull request #3057 from christotsvetanov/master ... Bulgarian translation	2015-09-25 19:51:39 +01:00
Matt Lott	1f08867f79	Update subscription server tests to use async.series	2015-09-25 10:28:27 -07:00
Matt Lott	928f72e2cf	Merge branch 'prepaid-v2' into master	2015-09-25 10:28:27 -07:00
Nick Winter	ad0dfef50f	Merge pull request #3055 from eschuler21/patch-2 ... Update package.json	2015-09-25 09:41:55 -07:00
Nick Winter	15ecd28b06	Merge pull request #3054 from eschuler21/patch-1 ... Update config.coffee	2015-09-25 09:41:49 -07:00
jpss256	ab97c1d5d4	Bulgarian translation	2015-09-25 19:19:34 +03:00
eschuler21	9c7fe0c512	Update package.json	2015-09-25 09:58:35 -04:00
eschuler21	257f0f6b1e	Update config.coffee	2015-09-25 09:55:54 -04:00
Matt Lott	18d64e64fb	Merge pull request #3009 from Imperadeiro98/master ... Use playSound across the code	2015-09-25 06:21:08 -07:00
Imperadeiro98	4f054fa31a	Fixed issue with string interpolation	2015-09-25 14:00:03 +01:00
Imperadeiro98	4cd8d95c72	Removed an unnecessary console log	2015-09-25 13:12:06 +01:00
Matt Lott	71538b0ac9	Remove 'do not localize' comment from courses UI ... It’s ok to localize / i18n these now.	2015-09-24 17:56:12 -07:00
Matt Lott	feef9c0ac6	🐛Fix instance selection on /courses page	2015-09-24 17:52:00 -07:00
Matt Lott	d7d6694ee9	Update course level routing	2015-09-24 17:12:18 -07:00
Matt Lott	b4d59ced3e	Update course details progress level cell popups	2015-09-24 14:48:54 -07:00
Matt Lott	238ea49090	Add stats to course details page	2015-09-24 07:28:43 -07:00
Matt Lott	cbaac98556	Course details page no instances selected UI	2015-09-23 16:27:49 -07:00
Imperadeiro98	4cd872091e	Uncommented an header	2015-09-23 20:00:38 +01:00
Imperadeiro98	a2a334e8a7	Merge pull request #3051 from rohmunhoz/patch-2 ... Translate and correct	2015-09-23 20:00:00 +01:00
rohmunhoz	0e149e84e1	Translate and correct ... Translate some strings and correted the translation of some other ones	2015-09-23 15:49:56 -03:00
Cat Sync	dcfc5726e9	Added Librarian name	2015-09-23 13:56:25 -04:00
Nick Winter	3253ae456e	Fix #3050: undefined simulation debugging tooltips	2015-09-23 08:24:35 -07:00
Imperadeiro98	0492d455b0	Merge pull request #3041 from tuomastanner/patch-1 ... A few tip translations	2015-09-23 14:08:27 +01:00
Imperadeiro98	1a08730ae7	Uncommented an header	2015-09-23 14:05:09 +01:00
Imperadeiro98	4efd1eeb1a	Merge pull request #3048 from mads232/patch-1 ... Update da.coffee	2015-09-23 14:04:04 +01:00
AkaKaras	06214880cc	Merge remote-tracking branch 'codecombat/master' into translation	2015-09-23 00:38:07 -04:00
AkaKaras	99d3b6a762	Merge remote-tracking branch 'origin/translation' into translation	2015-09-23 00:37:57 -04:00
Nick Winter	b76df77178	Merge branch 'rohmunhoz-patch-1'	2015-09-22 13:13:23 -07:00
Nick Winter	3dd36ebe6e	Fixed merge conflicts.	2015-09-22 13:13:12 -07:00
mads232	ca629e383f	Update da.coffee	2015-09-22 17:16:45 +02:00
Nick Winter	ad00c5688c	Merge branch 'master' into production	2015-09-21 14:16:31 -07:00
Nick Winter	144d6cfb32	Further disable social services in ladder	2015-09-21 14:16:23 -07:00
Nick Winter	49279367d1	Fix facebook.coffee linting issue	2015-09-21 14:16:08 -07:00
Imperadeiro98	8cee4d8baf	Update pt-PT.coffee	2015-09-21 21:30:59 +01:00
Imperadeiro98	7b183e3ae5	Removed some old 'changed' from en.coffee	2015-09-21 21:03:55 +01:00
Nick Winter	b06b7b779c	Merge branch 'master' into production	2015-09-21 12:41:24 -07:00
Nick Winter	3ac8a32be8	Propagate i18n	2015-09-21 12:41:16 -07:00
Nick Winter	c2c3ae4c4c	Add /careers and Ace of Coders links to home page	2015-09-21 12:40:33 -07:00
Imperadeiro98	83f6f8f5d4	Uncommented headers from last merge	2015-09-21 16:36:06 +01:00
Imperadeiro98	d0ba986ba4	Merge pull request #3037 from Mephisto07/patch-1 ... Labels translated to portuguese	2015-09-21 16:33:52 +01:00
Nick Winter	f1add14a27	Fix #2946 (one channel audio)	2015-09-20 16:23:47 -07:00