12465 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matt Lott	96cbcfada2	🐛Fix prepaids middleware missing this.logError	2016-08-05 09:21:37 -07:00
Matt Sanders	ef7b9aa3aa	fixes #3794 by not making everything 100% height	2016-08-05 17:12:18 +12:00
Matt Sanders	95146e7820	fixed the background issue on the tasks tab	2016-08-05 17:02:22 +12:00
Matt Sanders	d5e3be62a4	fixed the background issue on the achievements view	2016-08-05 16:52:02 +12:00
Nick Winter	246469bdde	A couple fixes for demo flow	2016-08-04 18:37:13 -07:00
Josh Callebaut	33134eb6c9	Merge pull request #3815 from Zerrien/campaign-arrow-fix ... Tweak campaign connecton arrows	2016-08-04 10:38:45 -07:00
Josh Callebaut	41cf864dc7	Add divide by zero check'	2016-08-04 10:20:50 -07:00
Bryukhanov Valentin	c4ee32f3e1	Merge pull request #3812 from Bryukh/master ... Add bunch of Russian translation	2016-08-04 08:16:31 +03:00
Josh Callebaut	796c35f66d	Tweak campaign connecton arrows so they point more accurately to the next level	2016-08-03 14:53:03 -07:00
Nick Winter	6917843018	Add a couple animations to defaultActions while game-dev lazy rendering isn't working	2016-08-03 13:32:49 -07:00
Nick Winter	1cc11127f0	Merge branch 'master' into production	2016-08-03 13:07:51 -07:00
Nick Winter	35966b24c1	ES5ify web-dev-listener.js	2016-08-03 13:02:55 -07:00
Matt Lott	652a2b1b87	Merge branch 'master' into production	2016-08-03 11:12:12 -07:00
Matt Lott	ba6d51659c	Show in-game programming language ... Closes #3814	2016-08-03 11:08:20 -07:00
Matt Lott	079ad6c0fa	Replace /about Matt and Nick pics with real photos	2016-08-03 10:17:57 -07:00
phoenixeliot	d52c0a2846	Merge branch 'master' into production	2016-08-02 14:25:30 -07:00
phoenixeliot	5dc3ebe9b1	Include other timeout error codes for good measure	2016-08-02 14:25:14 -07:00
phoenixeliot	36449bb6b6	Account for both types of timeouts in retry logic	2016-08-02 14:18:26 -07:00
phoenixeliot	a4fcbadc76	Merge branch 'master' into production	2016-08-02 13:46:14 -07:00
phoenixeliot	2e9ff61436	Fix broken ladder in course	2016-08-02 13:43:13 -07:00
phoenixeliot	eaaea6f08b	Retry models when they time out	2016-08-02 13:42:56 -07:00
Nick Winter	fad53cf43f	Don't wait for simulation load progress on game-dev levels	2016-08-02 12:31:36 -07:00
Matt Lott	e51186ec46	Add JS primer to update courses script	2016-08-02 11:08:46 -07:00
phoenixeliot	fc78c5af82	Merge branch 'master' into production	2016-08-01 16:46:33 -07:00
phoenixeliot	5f560f3e7d	Don't allow conversion to student without a ClassCode ... Fix i18n and tests	2016-08-01 16:44:57 -07:00
phoenixeliot	bd45f75bc0	Add test for Export Student Progress (CSV) button ... Add number checking to CSV test	2016-08-01 15:31:55 -07:00
phoenixeliot	94e3c5a2b5	Add first/last names to Account Settings	2016-08-01 14:12:35 -07:00
Valentin Bryukhanov	2e3d1531bf	Add bunch of Russian translation	2016-08-01 08:48:00 +03:00
Imperadeiro98	e34abb0d27	Update pt-PT.coffee	2016-07-30 13:59:55 +01:00
Nick Winter	18f8f3fd41	Merge branch 'master' into production	2016-07-29 16:36:50 -07:00
Nick Winter	24d58a1971	Handle old programming languages during simulation	2016-07-29 16:36:12 -07:00
phoenixeliot	a6d31d3064	Merge branch 'master' into production	2016-07-29 16:22:02 -07:00
phoenixeliot	d388975217	Fix unescaped HTML in goal descriptions	2016-07-29 16:21:13 -07:00
phoenixeliot	51706a52be	Fix indefiniteLength error on first frame	2016-07-29 16:16:50 -07:00
phoenixeliot	f3ffcc2885	Make hamburger more visible	2016-07-29 14:55:42 -07:00
phoenixeliot	fe4ac0aac3	Merge branch 'master' into production	2016-07-29 14:40:19 -07:00
phoenixeliot	83557910b2	Fix CSV export and projects tab	2016-07-29 14:37:45 -07:00
Nick Winter	e7c1d3d5d3	Remove stale educator wiki link	2016-07-29 14:36:31 -07:00
phoenixeliot	b702b84100	Merge branch 'master' into production	2016-07-29 13:40:22 -07:00
themaka	8135bd73d0	Added Māori and Croatian to list of languages to display on Diplomat page.	2016-07-29 15:53:01 -04:00
themaka	2d87a51f30	Forgot to update language names in first line of hr/mi .coffee	2016-07-29 15:39:37 -04:00
themaka	66817657f0	Added "te reo Māori" (Māori) to locale	2016-07-29 15:34:34 -04:00
themaka	715939dfb1	Adding Croatian language to locale	2016-07-29 15:20:24 -04:00
themaka	499c5f28b6	Merge remote-tracking branch 'refs/remotes/codecombat/master'	2016-07-29 15:05:24 -04:00
phoenixeliot	4af822d13a	Revert "Add game UI programming language label" ... This reverts commit b7f916116d. Some heights in gameplay were made worse by this; needs some more work.	2016-07-29 11:23:42 -07:00
Nick Winter	488e533e4e	Remove old bower dependency on tablesorter	2016-07-28 19:03:25 -07:00
phoenixeliot	55b5682691	Merge branch 'master' into production	2016-07-28 16:54:06 -07:00
Matt Lott	1c777ee7f5	Update site desert image	2016-07-28 16:10:28 -07:00
phoenixeliot	4abc26a8d4	Fix progress resetting	2016-07-28 15:47:17 -07:00
phoenixeliot	a47bdc084a	Allow admins to become teachers	2016-07-28 15:28:31 -07:00