12327 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	b04e968da5	Add support for CSS docs	2016-07-16 23:17:05 -07:00
Nick Winter	5d0b9c875a	Fix some typos that made it not work in Firefox (not sure how it worked in Chrome)	2016-07-16 13:32:54 -07:00
Nick Winter	0cd3278b8f	Add simple ImageGalleryView for some sample images in web-dev levels	2016-07-16 13:11:43 -07:00
Nick Winter	d37527d21b	Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc	2016-07-16 00:35:52 -07:00
Nick Winter	dc6a1de9fa	Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc	2016-07-16 00:33:10 -07:00
Nick Winter	b64bcd9f02	Use shareable false/true/'project' for different levels of shareability	2016-07-15 23:26:43 -07:00
Nick Winter	6ae89e31f1	Add direct link to play game/web-dev creations while coding them	2016-07-15 22:14:25 -07:00
Nick Winter	5d26b03918	Add buttons to view game/web-dev levels to courses views	2016-07-15 21:57:04 -07:00
Nick Winter	5f95a4d158	Play game-dev levels without API restrictions. Show game button in CourseDetailsView only when appropriate.	2016-07-15 20:47:09 -07:00
Nick Winter	7e4733f07e	Hack: check HTML goals now and in a second to account for built-in CSS transition	2016-07-15 20:25:37 -07:00
Nick Winter	224ad54bdd	View web dev levels. Add proper victory modal game/webpage share links. Fix playing game dev levels. Add generic change transition to all web-dev pages.	2016-07-15 20:03:12 -07:00
Scott Erickson	0570644943	Set up a bunch of game dev, web dev playing logic	2016-07-15 16:57:39 -07:00
Nick Winter	788a14398a	Fix starting web dev levels	2016-07-15 16:22:33 -07:00
Scott Erickson	7b38181241	Merge branch 'master' into game-dev-levels	2016-07-15 16:02:21 -07:00
Scott Erickson	ab704a1cab	Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels ... # Conflicts: # app/views/play/level/PlayLevelView.coffee	2016-07-15 16:01:57 -07:00
Scott Erickson	10ca59d10f	Have CourseVictoryModal used for course-ladder levels	2016-07-15 15:54:22 -07:00
Nick Winter	0922eec2cc	Add stubs for game-dev-1, web-dev-1, and web-dev-2 to updateCourses script	2016-07-15 14:47:42 -07:00
Scott Erickson	0a8514b688	Merge branch 'master' of https://github.com/codecombat/codecombat	2016-07-15 13:44:19 -07:00
Scott Erickson	df028b32bb	Add compiler requirements to fix npm update	2016-07-15 13:43:08 -07:00
Scott Erickson	486949d07c	Admin only courses (#3797) ... * adminOnly course field * Properly check not-admin-only when fetching courses	2016-07-15 13:28:35 -07:00
Nick Winter	9be8151959	Don't create God for web-dev levels	2016-07-15 13:24:54 -07:00
Nick Winter	cb085d019d	Update Aether version	2016-07-15 11:27:58 -07:00
Nick Winter	5a688e42c7	Slightly more flexible iframe origin checking	2016-07-15 11:19:22 -07:00
Nick Winter	1e640fb74c	Fix CampaignView styles to cover the whole screen with background again	2016-07-15 10:14:00 -07:00
Nick Winter	bc5375770e	Fix Mongoose at 4.5.3 while 4.5.4 has bug creating new clans and trial requests	2016-07-15 10:13:45 -07:00
Scott Erickson	6652b4920b	Have travis run npm update after install ... This is to make sure it's running the latest possible npm modules, in case of bugs they introduce.	2016-07-15 09:59:10 -07:00
Nick Winter	1e89775486	Basic campaign mode victory modal hookup for web-dev levels	2016-07-15 09:53:16 -07:00
Nick Winter	739973cb47	Sending goal states to GoalManager and GoalStatusView	2016-07-15 09:11:36 -07:00
Nick Winter	3c8db7e055	Fix Mongoose at 4.5.3 while 4.5.4 has bug creating new clans and trial requests	2016-07-15 08:15:44 -07:00
Nick Winter	c44c16e5d2	Started implementing web-dev goals	2016-07-15 00:40:32 -07:00
Nick Winter	69f21514b9	Add Lodash to iframe content	2016-07-14 22:43:49 -07:00
Nick Winter	e3670165e7	Remove code for multiple spells; rename SpellListTabEntryView to SpellTopBarView; remove hero avatar from SpellTopBarView	2016-07-14 22:43:25 -07:00
Nick Winter	220db3106c	Run button now recreates web-dev DOM; no submit button	2016-07-14 19:48:27 -07:00
Nick Winter	33ba3f6033	Enable docs for web-dev levels	2016-07-14 19:14:18 -07:00
Nick Winter	ed320a8d9e	WebSurfaceView now parsing player code through virtual DOM into iframe	2016-07-14 18:07:36 -07:00
Scott Erickson	9d0ad7af44	Start work on having course arenas use the CourseVictoryModal	2016-07-14 16:50:17 -07:00
Scott Erickson	9a79cae09d	Fix PlayGameDevLevelView to run in course mode	2016-07-14 16:49:48 -07:00
phoenixeliot	c3ed217964	Fix i18n render bug on SimulateTabView	2016-07-14 16:20:15 -07:00
Scott Erickson	c0bc10ffb6	Add projects tab stub to TeacherClassView	2016-07-14 15:53:54 -07:00
Scott Erickson	61caf3dcd3	Merge branch 'master' into game-dev-levels	2016-07-14 15:50:04 -07:00
Scott Erickson	dd88f39761	Add shareable property to levels	2016-07-14 15:48:42 -07:00
Scott Erickson	0cb92582f4	Add destroy method	2016-07-14 15:13:02 -07:00
Nick Winter	5b16da099a	Hack LevelEditor to load web-dev levels	2016-07-14 12:47:25 -07:00
Nick Winter	be50657530	Remove Firebase for now.	2016-07-14 12:47:00 -07:00
Nick Winter	16b10612b6	Stub WebSurface showing for web-dev levels	2016-07-14 12:34:22 -07:00
phoenixeliot	5e10e34825	Add spy buttons to admin page search results	2016-07-14 11:27:18 -07:00
Nick Winter	c5c831c211	Remove real-time multiplayer prototype code	2016-07-14 10:26:09 -07:00
Scott Erickson	2284a9f495	Remove semi-colons from AnalyticsView to satisfy linter	2016-07-14 10:10:22 -07:00
Scott Erickson	48502c40e6	Merge pull request #3788 from matt-sanders/master ... fixes #3393 by allowing the content to scroll	2016-07-14 10:03:12 -07:00
Nick Winter	349ab24da7	First pass at adding 'web-dev' level type	2016-07-14 09:38:45 -07:00