10927 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Imperadeiro98	c27c4e100a	Merge pull request #3286 from JurianLock/patch-1 ... Update nl-NL.coffee	2015-12-29 14:53:27 +00:00
Rob Blanckaert	0fe700b6bf	Add healthcheck route	2015-12-29 00:03:43 -05:00
JurianLock	2ab3033e21	Update nl-NL.coffee	2015-12-29 02:34:39 +01:00
JurianLock	b9239503f9	Update nl-NL.coffee	2015-12-29 00:33:05 +01:00
Nick Winter	187a6f87a9	Include course info in contact message session links	2015-12-28 08:15:48 -08:00
Imperadeiro98	f369c73b2a	Remove unnecessary sound	2015-12-28 16:11:09 +00:00
Nick Winter	972243ae50	Merge pull request #3283 from Imperadeiro98/master ... Use view in template	2015-12-28 06:37:29 -08:00
Imperadeiro98	bf6601c3cc	Fix for GenerateTerrainModal	2015-12-26 21:56:05 +00:00
Imperadeiro98	b7ba677b00	Use view in template	2015-12-26 14:21:06 +00:00
Imperadeiro98	bfeee90f51	Merge pull request #3282 from Nainufar/patch-6 ... Update ca.coffee	2015-12-26 12:27:00 +00:00
Nainufar	718d546354	Update ca.coffee ... more translations :)	2015-12-26 12:37:24 +01:00
Nick Winter	208073ffdb	Fix saving levels from #3276 refactoring	2015-12-24 11:21:12 -08:00
Nick Winter	e9e7416c8f	Merge branch 'zxcpoiu-master'	2015-12-24 06:37:47 -08:00
Nick Winter	35a18eadb4	Merge zh-HAN*.coffee	2015-12-24 06:37:40 -08:00
Nick Winter	c0d58c3786	Tweak style and add i18n for #3280	2015-12-24 06:34:54 -08:00
Nick Winter	00fe5a6c0c	Merge pull request #3280 from thepulkitagarwal/master ... Add level to user profile page	2015-12-24 06:32:38 -08:00
Pulkit Agarwal	357e8c0bcd	Add level to user profile page	2015-12-24 15:52:30 +05:30
Imperadeiro98	325c774b90	Update pt-PT.coffee	2015-12-23 23:22:54 +00:00
Nick Winter	71fc8d5230	Don't risk destruction of level unlock links	2015-12-23 12:08:09 -08:00
Nick Winter	55f7b4a115	Fix config refactoring	2015-12-23 12:08:07 -08:00
Nick Winter	d56ba6e1e8	Try upgrading webworker-threads	2015-12-23 10:34:01 -08:00
Nick Winter	40da26f99c	Remove misc typo. Fix NewModelModal name field focus while at it.	2015-12-23 10:33:55 -08:00
Nick Winter	08f983db59	Propagate i18n	2015-12-23 10:07:32 -08:00
Nick Winter	a82f80bacb	Fix client test LevelLoader Thang URLs	2015-12-23 09:34:27 -08:00
Nick Winter	8fb358425d	Merge pull request #3270 from sasha-bichkov/master ... Refactor Level.coffee	2015-12-23 08:56:00 -08:00
Nick Winter	130b67d6ce	Merge pull request #3273 from codecombat/clean-i18n ... Remove unused i18n strings	2015-12-23 08:52:47 -08:00
Nick Winter	b42ed395c0	Small fix for #3276 NewLevelComponentModal	2015-12-23 08:41:00 -08:00
Nick Winter	6b02a7a31f	Merge pull request #3276 from Imperadeiro98/master ... Use view in template	2015-12-23 08:29:54 -08:00
Nick Winter	da70980ad5	Merge branch 'Zerrien-master'	2015-12-23 08:23:32 -08:00
Nick Winter	3be6abf2e1	Merge Router.coffee	2015-12-23 08:23:23 -08:00
Nick Winter	08d0440c71	Link to language-specific forum categories when available	2015-12-23 08:22:19 -08:00
Nick Winter	dfc1ef2e89	Add i18n tags for new legal page stuff	2015-12-23 08:21:49 -08:00
Nick Winter	21ae7d47be	Don't load extra level completion images unless it's that level	2015-12-23 08:21:11 -08:00
zxcpoiu	d54c2a786c	app/locale: translation for ZH_HANT and ZH_HANS	2015-12-23 15:15:11 +08:00
Imperadeiro98	d321bb7a95	Removed spr from spell_list_entry_thangs.jade	2015-12-22 21:41:20 +00:00
Nick Winter	a92ed8fbbe	Fix /courses/teachers link to /schools	2015-12-22 06:43:19 -08:00
Imperadeiro98	14fcc1f2ac	Merge pull request #3278 from Nainufar/patch-5 ... Update ca.coffee	2015-12-22 13:04:10 +00:00
Matt Lott	68aae0d4e0	Update /courses/teachers active courses styling	2015-12-21 16:18:01 -08:00
Nainufar	59862f666d	Update ca.coffee ... some translations more	2015-12-22 01:12:45 +01:00
Nick Winter	8683a2f27a	Merge pull request #3251 from themaka/browserstack-quid-pro-quo ... Adding Browserstack to our web page as we promised	2015-12-21 15:55:29 -08:00
Nick Winter	848263d8a2	Merge pull request #3231 from weevilgenius/master ... Fix up vagrant config	2015-12-21 15:54:33 -08:00
Nick Winter	0d958cef06	No longer under high load	2015-12-21 15:54:00 -08:00
Matt Lott	b971ce3492	Enroll single student without modal in classroom view	2015-12-21 15:45:14 -08:00
Josh Callebaut	314f8256ee	Improves style further.	2015-12-21 15:42:46 -08:00
Matt Lott	bde8e6721c	Add enroll students button to /courses/teachers	2015-12-21 15:04:21 -08:00
Nick Winter	e070c70b9d	Put /schools into the main flow in place of anonymous /teachers for now	2015-12-21 15:02:11 -08:00
Matt Lott	b5e7a9694e	Remove /courses/teachers concepts ... Also moving enrolled counts around a bit and adding a class count sentence.	2015-12-21 14:19:35 -08:00
Matt Lott	d782eb174e	Fix /schools big quote location	2015-12-21 14:09:57 -08:00
Nick Winter	2adb255a48	Merge pull request #3275 from taptapdan/fix-issue-3243 ... Fix achievements notifications animation	2015-12-21 13:32:44 -08:00
Matt Lott	11d24e939b	Add smooth down arrow navigation to /schools	2015-12-21 13:00:39 -08:00