7641 commits

Author	SHA1	Message	Date
Scott Erickson	87c7bafd57	Add join-class functionality to /courses	2015-11-29 18:13:31 -05:00
Matt Lott	edc05facfe	Update /courses/purchase ... Updating to latest UI designs.	2015-11-29 14:45:36 -08:00
Scott Erickson	5a72d32f60	Fix HOC complete text in /courses	2015-11-29 17:23:55 -05:00
Scott Erickson	405785bafe	Add completion stats to /courses	2015-11-29 17:18:24 -05:00
Scott Erickson	07ad8382cc	Project sessions loaded in /courses	2015-11-29 16:17:55 -05:00
Nick Winter	ee6be55a9d	Don't load sounds from level while muted	2015-11-29 12:32:04 -08:00
Nick Winter	95c703a7df	Simulate games in background while playing levels if we think there's extra compute power	2015-11-29 12:30:19 -08:00
Scott Erickson	47acfc93d0	Fix course buttons and level links in /courses	2015-11-29 15:26:17 -05:00
Scott Erickson	ea0c274a3c	Fix /courses initial implementation	2015-11-29 15:26:17 -05:00
Matt Lott	33599c8632	Update /teachers based on latest visual design	2015-11-29 07:02:45 -08:00
Nick Winter	46e738a737	Collapse sets of achievements in achievements list	2015-11-28 08:39:05 -08:00
Rob	e6afb51085	First pass at showing indention guides.	2015-11-27 20:46:55 -05:00
Nick Winter	a6f980dab1	Support for pre-configuring hero on Assembly Speed	2015-11-27 12:12:58 -08:00
Nick Winter	9dccf73af0	'Click to view attempt' for incomplete student solutions	2015-11-27 12:12:32 -08:00
Scott Erickson	2bbabd4917	Switch CourseInstance firstLevelURL to return dungeons-of-kithgard ... Since we switched from using forked levels	2015-11-27 11:30:25 -05:00
Scott Erickson	d4540af780	Merge branch 'master' into courses-vhoc	2015-11-27 10:43:15 -05:00
Imperadeiro98	f240e5341f	Update pt-PT.coffee	2015-11-26 16:27:48 +00:00
Imperadeiro98	620448d705	Merge pull request #3209 from criptonauta/patch-3 ... Update pt-BR.coffee	2015-11-26 15:05:42 +00:00
Nick Winter	ac0e21aa39	Propagate i18n	2015-11-25 16:52:10 -08:00
Nick Winter	d465a3080d	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-11-25 16:51:27 -08:00
Nick Winter	88cca795c6	Don't try to autorank anonymous users playing autoranked ladder levels	2015-11-25 16:51:12 -08:00
Nick Winter	8d444e7ce8	Fix returning to course-ladder in HeroVictoryModal when arrived at via next-level button	2015-11-25 16:50:42 -08:00
Matt Lott	e7acf9c798	🐛Fix local env analytics log event URL ... Found another one @basicer	2015-11-25 16:33:27 -08:00
Matt Lott	c385aaa414	Merge branch 'master' into courses-vhoc	2015-11-25 16:11:36 -08:00
Matt Lott	4ba3c47367	🐛Fix courses view jade typo	2015-11-25 15:13:43 -08:00
Matt Lott	7b01fd7b65	Add course name to victory modal	2015-11-25 14:23:35 -08:00
criptonauta	c87abeebff	Update pt-BR.coffee ... Some more changes in courses	2015-11-25 19:02:06 -03:00
Matt Lott	022cdf6d6e	🐛Fix homepage CSS on Windows	2015-11-25 12:27:42 -08:00
Imperadeiro98	de23e03418	Uncommented an header	2015-11-25 18:19:49 +00:00
Imperadeiro98	1df39a61cc	Merge pull request #3207 from criptonauta/patch-4 ... Update pt-BR.coffee	2015-11-25 18:19:06 +00:00
Matt Lott	e716952f5f	Add HoC trial special to /teachers	2015-11-25 08:39:56 -08:00
criptonauta	5bc44e1043	Update pt-BR.coffee ... Some translations for 'courses' section	2015-11-25 12:16:29 -03:00
Imperadeiro98	d7619adde6	Merge pull request #3206 from Saibamen/patch-1 ... Update pl.coffee	2015-11-25 13:59:32 +00:00
Matt Lott	24345cf296	Course victory modal current and next level names	2015-11-24 16:46:27 -08:00
Saibamen	9750aa09a6	Update pl.coffee	2015-11-25 01:30:03 +01:00
Matt Lott	4cc71bd0e6	Add HoC links to homepage	2015-11-24 15:28:37 -08:00
Nick Winter	7cba3f3725	Don't show code language selector for course ladders	2015-11-24 13:52:37 -08:00
Nick Winter	b44714a60b	Fix achievement loads never happening if you didn't earn any of them	2015-11-24 13:49:38 -08:00
Nick Winter	9f0a843593	Enable auto-submission to ladder for Wakka Maul	2015-11-24 13:35:15 -08:00
Imperadeiro98	01c7efb78a	Merge pull request #3205 from criptonauta/patch-3 ... Update DiplomatView.coffee	2015-11-24 21:20:06 +00:00
Nick Winter	67f14c7928	Try putting AI players in league ladders	2015-11-24 13:18:38 -08:00
criptonauta	fddd11f9b4	Update DiplomatView.coffee	2015-11-24 18:16:10 -03:00
Imperadeiro98	2a1b464d5a	Fix for last merge	2015-11-24 21:01:57 +00:00
Imperadeiro98	12c228c14d	Merge pull request #3203 from criptonauta/patch-1 ... Update pt-BR.coffee	2015-11-24 21:01:14 +00:00
Matt Lott	f261c1466a	Update /teachers ... Stop forwarding to HoC Update copy with courses info.	2015-11-24 10:59:14 -08:00
Rob	4dde97153c	Don't panic if we didn't load stripe. (Makes game run offline).	2015-11-24 13:42:00 -05:00
Matt Lott	d7a66722b9	Update teacher surveys ... Removing trial subscriptions Updating trial page copy Adding special HoC trial Introducing a new course prepaid property endDate, which won’t be returned or redeemed after the date.	2015-11-24 10:32:19 -08:00
criptonauta	d44a8b469e	Update pt-BR.coffee	2015-11-24 14:36:44 -03:00
Nick Winter	ec7f17a149	Show level indexes in courses	2015-11-24 08:56:28 -08:00
Nick Winter	d675e14f59	Fix issue returning to ladder when playing course-ladder levels outside of a course arena	2015-11-24 08:36:57 -08:00
Nick Winter	65890130bb	Change how goals are expanded/collapsed at beginnings of levels	2015-11-24 08:28:05 -08:00
Imperadeiro98	0d35f1472e	Fixes for last merge	2015-11-23 20:34:17 +00:00
Scott Erickson	2adb3362ed	Add ChangeCourseLanguageModal to CoursesView	2015-11-23 11:52:15 -06:00
Scott Erickson	03a38f6129	Remove some logs	2015-11-23 08:53:13 -08:00
Scott Erickson	ea4a98af86	Add rest of CoursesView, untested, unhooked to server ... On a plane, so skipping my usual iterative testing. Bugs are undoubtedly everywhere.	2015-11-23 08:46:08 -08:00
Tuan Manh Lai	a0d5d2ea66	Update vi.coffee	2015-11-23 20:37:15 +07:00
Tuan Manh Lai	c00cfddf3b	Update vi.coffee	2015-11-23 20:32:52 +07:00
Yuki Ueda	cfbd62a899	Update ja.coffee	2015-11-23 16:28:34 +09:00
Matt Lott	1f962e7667	Fix analytics /db GET URL	2015-11-22 09:26:35 -08:00
Nick Winter	21810be8eb	End an A/B test	2015-11-22 07:53:49 -08:00
Nick Winter	e0011ee5d0	Classroom invite codes are now real words like BigFrogFarm	2015-11-22 07:47:28 -08:00
Imperadeiro98	6756e5ebe6	Merge pull request #3196 from thatguy7/master ... fixed some errors and added a few new tranlations	2015-11-22 12:13:27 +00:00
Scott Erickson	a98d0b1b2a	Partial work on /courses view when signed in	2015-11-22 00:08:46 -08:00
Nick Winter	e1983f7556	Merge pull request #3191 from viettruong2194/text-overlap-contribute-page ... Change z-index of contribute tiles to prevent overlap between dropdowns for #3127	2015-11-21 16:29:37 -08:00
Nick Winter	295a0e06e9	Merge pull request #3188 from viettruong2194/text-overlap-wooden-frame ... Fix top margin and height for game-menu for #2963	2015-11-21 16:20:12 -08:00
thatguy7	c4146d046a	fixed some errors and added a few new tranlations ... As I played through some of the levels to see if I would suggest this game to my students, I encountered multiple translations that were either phrased very weirdly, grammatically incorrect or completely nonsensical. I fixed those and also translated a few new lines along the way. The german word for buy ("kaufen") is shorter than the word for unlock ("freschalten") and should fit in the button. I suggest changing that, but it feels like avoiding the word buy was a design decision, so I left it as it is.	2015-11-22 00:11:12 +01:00
Scott Erickson	5aff591a8b	Set up courses view for anonymous users	2015-11-21 11:38:34 -08:00
Scott Erickson	f1d4a9d53b	Remove vestigial code from hour of code view template	2015-11-21 11:33:32 -08:00
Scott Erickson	9292396dad	Add logout link to HourOfCodeView when signed in	2015-11-20 18:22:52 -08:00
Scott Erickson	27b21d0c4e	Add classroom code handling to StudentSignUpModal	2015-11-20 18:02:02 -08:00
Scott Erickson	aee1f6587a	Add StudentSignUpModal to HourOfCodeView	2015-11-20 16:28:28 -08:00
Matt Lott	9d329d4a1d	Migrate external trial requests to database ... Added created field to ~2800 older trial.requests Inserted ~700 external requests from Google forms	2015-11-20 15:53:00 -08:00
Scott Erickson	65dd571041	Fix StudentLoginModal when email or password is not included	2015-11-20 15:17:04 -08:00
Scott Erickson	f7f405b774	Remove colons from template, unused formValues from view	2015-11-20 14:52:13 -08:00
Scott Erickson	f8cf3212dc	Remove unneeded .input-border wrapper	2015-11-20 14:47:35 -08:00
Scott Erickson	b88a817e25	Fix login button text	2015-11-20 14:44:17 -08:00
Scott Erickson	f8a5baa4f6	Finish StudentLoginModal implementation	2015-11-20 13:59:43 -08:00
Scott Erickson	70a3a199a0	Remove login button when you are logged in, refactor HOC view to always use a well	2015-11-20 13:36:50 -08:00
Scott Erickson	7cd031064f	Fix HourOfCodeView padding	2015-11-20 13:32:45 -08:00
Scott Erickson	9dbd4d296a	Merge branch 'master' into courses-vhoc	2015-11-20 13:28:43 -08:00
Scott Erickson	bcb869594d	Add start of StudentLoginModal	2015-11-20 07:52:35 -08:00
Nick Winter	7ede7928ca	Fix typo in course ladder links	2015-11-20 07:17:16 -08:00
Imperadeiro98	f3eae6e171	Merge pull request #3186 from mancusoa74/patch-1 ... Update it.coffee	2015-11-20 12:34:54 +00:00
Viet Truong	019995751f	Change z-index of contribute tiles to prevent overlap between dropdowns for #3127	2015-11-19 23:59:43 -08:00
Nick Winter	be00cae1df	Fix returning to course ladder from arena modals	2015-11-19 16:36:29 -08:00
Matt Lott	db5f0171c7	Make trial request created property editable	2015-11-19 16:07:02 -08:00
Nick Winter	9049d2498e	Fix #3179: pending patches collections using _ instead of .	2015-11-19 15:41:20 -08:00
Nick Winter	7fdd6d5180	Fix #3174: save button triggering on delete/reset account form fields	2015-11-19 15:37:37 -08:00
Nick Winter	9ccd03f8d6	Make /teachers -> /courses/teachers?hoc=true more reliable	2015-11-19 15:32:52 -08:00
Scott Erickson	1a4a143340	Initial build of /hoc, no login/create account modals yet	2015-11-19 15:26:45 -08:00
Matt Lott	804c62e13b	Add created field to trial requests ... Necessary for importing external trial requests.	2015-11-19 15:20:42 -08:00
Nick Winter	2fecaf9618	Show AI flare in ladders. Show more players for league ladders.	2015-11-19 15:18:53 -08:00
Nick Winter	df8b52db27	Add ?codeLanguage= parameter for loading levels in different languages	2015-11-19 14:49:47 -08:00
Nick Winter	d673dd9973	Ask, 'How fun was this level?' on course victory	2015-11-19 14:49:29 -08:00
Nick Winter	e80544e215	Don't show Capture Their Flag clan ladder yet	2015-11-19 14:47:41 -08:00
Nick Winter	93fccaa23f	Show humans vs. ogres for Wakka Maul ladder	2015-11-19 14:47:25 -08:00
Imperadeiro98	480a310313	Add sound to Facebook login	2015-11-19 21:36:57 +00:00
Nick Winter	ef7618497f	Fix #3184: get more of our campaign overworld properties we need	2015-11-19 13:20:42 -08:00
Nick Winter	3926204f47	Don't do course arena league for solo course ladders	2015-11-19 13:20:21 -08:00
Nick Winter	c8ceca4d3d	Add user.courseInstances, use it for course ladders	2015-11-19 10:41:31 -08:00
Imperadeiro98	094743c4f5	Fix #2916	2015-11-19 17:05:00 +00:00
Nick Winter	bc1b11df94	Merge pull request #3189 from Imperadeiro98/fix-2966 ... Fix #2966	2015-11-19 08:35:49 -08:00
Imperadeiro98	2d584c527d	Fix #2966	2015-11-19 16:33:54 +00:00
Viet Truong	62345aeb1d	Fix top padding and margin for game-menu for #2963	2015-11-18 15:49:35 -08:00
Scott Erickson	ee1e484dda	Have play buttons show 'Compete!' for arena levels on CourseDetails levels list	2015-11-18 14:08:25 -08:00
Scott Erickson	7a6c42b89f	Set up course-ladder level handling ... * LadderView displays course info, different style for course-ladder levels * LadderView hides simulate tab for course-ladder levels * HeroVictoryModal links to LadderView for course-ladder levels * CourseDetails page links to LadderView for course-ladder levels * Enable course instances for league simulation	2015-11-18 14:02:45 -08:00
Antonio Mancuso	fe7eb89a03	Update it.coffee ... I would like contributing to this great game. I woul dlike to help completing the Italian translation asap to enable Italian kids to play and learn with CodeCombat thnx Antonio	2015-11-18 22:37:40 +01:00
Scott Erickson	890d528d80	Fix level session stats in CourseDetailsView	2015-11-17 16:54:04 -08:00
Matt Lott	bc454191ec	Update accounts prepaid list ... Needed clearer total and remaining columns.	2015-11-17 16:21:08 -08:00
Scott Erickson	6a54c7cf54	Add classroom name, description, and language editing, and classroom language infrastructure	2015-11-17 16:10:23 -08:00
Nick Winter	a0038602a1	Fix some course level submit button behavior, also help mirror session scoring	2015-11-17 15:26:10 -08:00
Nick Winter	040f7c94ab	Track ladderAchievementDifficulty in multiplayer human level sessions	2015-11-17 15:25:22 -08:00
Nick Winter	f1b0b4f9c5	Allow achievement query editing in achievement editor	2015-11-17 15:24:33 -08:00
Nick Winter	a5fc31dbb3	Allow multiplayer levels to earn achievements	2015-11-17 15:23:35 -08:00
Nick Winter	a725cd70d8	Update comment color to Robin's favorite blue	2015-11-17 15:23:35 -08:00
Nick Winter	9b990ba452	Mark mirror match multiplayer levels complete on success	2015-11-17 15:23:34 -08:00
Nick Winter	01c9948b5b	Favor complete over incomplete sessions in CampaignView flag status	2015-11-17 15:23:34 -08:00
Rob	7a86f754df	Add flavor to overworld.	2015-11-17 11:27:08 -08:00
Rob	991fead0f6	Create specific campaign view for campaign selection screen.	2015-11-17 11:15:56 -08:00
Jhoon Saravia	b375e10c68	Finish translation of new strings	2015-11-16 21:44:28 -05:00
Jhoon Saravia	4c25062d78	Make uniform translation of the word subscription	2015-11-16 20:52:31 -05:00
Jhoon Saravia	9d6de4c0ba	Translate half of new strings	2015-11-15 20:47:05 -05:00
Imperadeiro98	6f81a72adf	Merge pull request #3176 from Raphaelwuhao/patch-1 ... Update zh-HANS.coffee	2015-11-16 12:56:11 +00:00
Imperadeiro98	e268e20390	Fixed last merge	2015-11-15 18:13:47 +00:00
Imperadeiro98	8bba79eecf	Merge pull request #3178 from dolasilla/master ... Italian translations added or fixed	2015-11-15 18:12:50 +00:00
SILVIA BINDELLI	bdf2df12be	Italian translations added or fixed	2015-11-15 17:57:37 +01:00
Nick Winter	0abb9a38ad	Use nanoscroller to allow intro doc scrolling	2015-11-15 08:23:12 -08:00
Nick Winter	31a13d69b3	Add playback: playing: false default to scripts, with default editor task to adjust it	2015-11-15 08:03:14 -08:00
Nick Winter	ef72286864	Don't autoplay hero or course levels by default. Fix Course: Known Enemy autocomplete string format.	2015-11-15 07:59:20 -08:00
Nick Winter	1603c72469	Move achievement popup to lower left to avoid covering up Continue button on small screens	2015-11-15 07:08:02 -08:00
Raphaelwuhao	6d989a523a	Update zh-HANS.coffee	2015-11-14 22:20:58 -08:00
Raphaelwuhao	104ca4f2cd	Update zh-HANS.coffee	2015-11-14 20:57:30 -08:00
Nick Winter	5d9d5c0ae6	Remove ProblemAlertView help button	2015-11-14 17:33:05 -08:00
Nick Winter	aee2f7c219	Add loading indicators, hide UI pre-load for /play	2015-11-14 17:30:37 -08:00
Nick Winter	b31e5fc93a	Fix user.code.problem routes to use . instead of _	2015-11-14 16:32:21 -08:00
Nick Winter	401d383ff4	Change gutter X to exclamation mark	2015-11-14 16:31:05 -08:00
Rob	c0d9c231bc	Normalize some URLs that used both .s and _s to use only .s	2015-11-13 15:16:03 -05:00
Matt Lott	b3362c8d0d	Add courses to top menu ... Bumping about to bottom menu, removing clans.	2015-11-13 11:33:03 -08:00
Matt Lott	c7a7a9d3ac	Redirect /teachers to /courses/teachers?hoc=true ... Will update /teachers soon with relevant information, but at the moment it is too outdated.	2015-11-13 10:30:37 -08:00
Matt Lott	c7118d69e5	Redirect 2014 HoC link to 2015 HoC link ... https://app.asana.com/0/54276215890539/65805646890763	2015-11-13 10:17:05 -08:00
Imperadeiro98	12523dd247	Update pt-PT.coffee	2015-11-13 13:21:08 +00:00
Imperadeiro98	d555b04ca4	Merge pull request #3173 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-11-13 13:00:36 +00:00
Imperadeiro98	fc4008567c	Fix build	2015-11-13 12:59:34 +00:00
Yuki Ueda	e6d769bab0	Update ja.coffee	2015-11-13 15:59:19 +09:00
Nick Winter	d744d2db2b	Propagate i18n	2015-11-12 16:42:37 -08:00
Matt Lott	840970c267	🐛Fix greek translation file indentation	2015-11-12 16:39:44 -08:00
Nick Winter	3c62b5b39e	Merge pull request #3172 from zsdregas/master ... Greek Translation	2015-11-12 16:36:15 -08:00
Nick Winter	356f65561c	Add ladder banner images to ladder home	2015-11-12 16:30:56 -08:00
Nick Winter	9e61928080	Add reset progress feature in account settings	2015-11-12 15:27:28 -08:00
Zacharias Sdregas	fdeb86e353	Greek Translation 121115	2015-11-12 23:09:22 +02:00