11250 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	ae1e206c1c	Merge branch 'master' into production	2015-11-20 07:17:20 -08:00
Nick Winter	7ede7928ca	Fix typo in course ladder links	2015-11-20 07:17:16 -08:00
Nick Winter	9187df5057	Merge branch 'master' into production	2015-11-20 06:30:19 -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	f32316a7f7	Merge branch 'master' into production	2015-11-19 16:07:50 -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	2efc93a93f	Merge branch 'master' into production	2015-11-19 15:23:55 -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	c867b1f5b4	Merge branch 'master' into production	2015-11-19 14:52:04 -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	3d71451e10	Add script to migrate course instance ladder leagues	2015-11-19 12:10:20 -08:00
Nick Winter	04c6b27bed	Merge branch 'master' into production	2015-11-19 10:41:37 -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
Imperadeiro98	c4f0f07994	Fix	2015-11-18 19:36:30 +00:00
Imperadeiro98	db6166d22c	Some changes	2015-11-18 19:33:26 +00:00
Imperadeiro98	a19225013b	Refactor to use view in template	2015-11-18 19:16:44 +00:00
Scott Erickson	890d528d80	Fix level session stats in CourseDetailsView	2015-11-17 16:54:04 -08:00
Rob	c761e8de3b	Merge branch 'master' into production	2015-11-17 16:24:33 -08:00
Matt Lott	bc454191ec	Update accounts prepaid list ... Needed clearer total and remaining columns.	2015-11-17 16:21:08 -08:00
Matt Lott	4abace927a	Add getPrepaidCodes API null check ... https://app.asana.com/0/53713686567836/63657760462910	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	08c7ad71a5	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-11-17 15:26:51 -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	f96a0a018c	Track ladderAchievementDifficulty in multiplayer human level sessions	2015-11-17 15:23:35 -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