1227 commits

Author	SHA1	Message	Date
Jayant Jain	74205b31d2	Adds code for passing randomised thangs to thang view	2014-07-11 00:01:18 +05:30
Jayant Jain	c40da260f0	Adds initial modal and view for terrain generator	2014-07-11 00:01:18 +05:30
Jayant Jain	efa2bee08c	Adds shortcuts for undo/redo for thangs tab view	2014-07-11 00:01:18 +05:30
Nick Winter	9ee373428f	Fixed some schema issues related to snippets and code languages.	2014-07-10 08:31:40 -07:00
nemoyatpeace	8700da6570	Update play_view.coffee ... Added my level to the page.	2014-07-10 09:19:59 +08:00
Nick Winter	4b16e2fc57	Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master	2014-07-09 13:53:58 -07:00
Nick Winter	ca847329b1	Merge branch 'dkundel-feature/fullscreen-editor'	2014-07-09 13:41:57 -07:00
Nick Winter	0ed8d2b371	Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.	2014-07-09 13:41:42 -07:00
Darredevil	4309bfbe67	new Documentation page	2014-07-09 23:01:53 +03:00
Scott Erickson	d74a778f67	Made creating components open to everyone!	2014-07-09 12:21:32 -07:00
Scott Erickson	3fbce8334d	Fixed #1276	2014-07-09 10:47:02 -07:00
gosnat	4d50a6d76a	Update play_view.coffee ... Added "Guide Everyone Home" level	2014-07-09 08:02:58 -05:00
Nick Winter	928e4362ba	Made some style tweaks to the employers page to move the filters into a sidebar when authorized.	2014-07-08 20:47:22 -07:00
Nick Winter	c19a31a58c	Fixed some wizard positioning issues in multiplayer.	2014-07-08 18:51:10 -07:00
Michael Schmatz	21d056ff01	Instant application of filters	2014-07-08 11:19:14 -07:00
Michael Schmatz	bbc793b003	Fixed modal popping up when logging out sometimes	2014-07-08 10:42:36 -07:00
Michael Schmatz	aa40257034	Table styling/ copy edit	2014-07-07 23:23:36 -07:00
Michael Schmatz	e71ca28f02	Implement candidate filter counts next to filters	2014-07-07 21:43:30 -07:00
Michael Schmatz	e294f344c4	Move featured candidates to top of sort	2014-07-07 21:29:48 -07:00
Michael Schmatz	08b9a8fdaa	Various changes to education filter	2014-07-07 21:04:12 -07:00
Michael Schmatz	9313541f9f	Fixed targeting on employers CSS	2014-07-07 20:02:01 -07:00
Michael Schmatz	05560662dd	Various fixes to employer page/profile view	2014-07-07 19:34:36 -07:00
Scott Erickson	c1f77e3f07	Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch	2014-07-07 18:48:26 -07:00
Scott Erickson	5d00aedac7	Widened the click area on the wizard settings view for color config.	2014-07-07 18:13:19 -07:00
Scott Erickson	1263d4724a	Fixed the title in the gold view to handle when goldEarned isn't available.	2014-07-07 16:56:47 -07:00
Scott Erickson	908772d8fe	Fixed an instance where a level loading callback was erroring if called before the surface was built.	2014-07-07 16:44:18 -07:00
Scott Erickson	61e6c8dfc3	Fixed the gold view not showing numbers until the first change.	2014-07-07 16:05:23 -07:00
Scott Erickson	2a309c149c	Enabled submitting patches for thangs and articles.	2014-07-07 15:19:22 -07:00
Scott Erickson	12543cf4dd	Added the foundation of a component docs view.	2014-07-07 10:11:02 -07:00
Ruben Vereecken	128008daa1	Hid the progress bar on load failed	2014-07-06 21:48:31 +02:00
Scott Erickson	94a6e3961b	Added a button in the level editor to choose which team to play when editing a ladder level.	2014-07-05 13:54:41 -07:00
Scott Erickson	b635c4cf16	Fixes #1220. Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.	2014-07-04 20:45:42 -07:00
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	1ce55e356c	Making the ladder tab reload when social network friends load. See #1196.	2014-07-04 17:32:16 -07:00
Scott Erickson	ca8394621d	Fixes #1223	2014-07-04 11:46:33 -07:00
Scott Erickson	f553a1c493	Merge pull request #1256 from rubenvereecken/patch_fix ... Patch fix: applyDelta now always called	2014-07-04 11:45:22 -07:00
Ruben Vereecken	08030dc785	Cleaned up patch rendering logic	2014-07-04 20:18:26 +02:00
Ruben Vereecken	44c84b3689	proofed the SearchView's runSearch	2014-07-04 19:36:55 +02:00
Ruben Vereecken	6e4170012f	Made sure applyDelta is called in all cases	2014-07-04 18:38:15 +02:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Scott Erickson	2855d2a402	Made the deltas lib conflict identifying library able to handle many-to-many conflicts. ... Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.	2014-07-03 17:41:58 -07:00
Michael Schmatz	6a33ca0892	Removed autoscrolling	2014-07-03 16:40:00 -07:00
Michael Schmatz	615303395c	Various fixes for recruiting page	2014-07-03 16:30:27 -07:00
George Saines	4d12aff35e	removing the counselor from the contribute page and all other links	2014-07-03 15:42:24 -07:00
Michael Schmatz	52ddb8db62	Add login link and rounded corners for pics	2014-07-03 15:10:09 -07:00
Michael Schmatz	3f1547488c	Added login button and fixed bg color	2014-07-03 14:40:39 -07:00
Michael Schmatz	538344094b	Fixed filter behavior	2014-07-03 13:59:10 -07:00
Michael Schmatz	ae63461ef3	Filter functional	2014-07-03 11:39:44 -07:00
Michael Schmatz	49e4dd71ae	Merge branch 'master' into employer-redesign ... Conflicts: app/schemas/models/user.coffee	2014-07-03 10:15:31 -07:00