2768 commits

Author	SHA1	Message	Date
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	49c8360d5b	Fixed me emitting 'me:synced' and anything listening for that.	2014-07-07 16:53:34 -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
Michael Schmatz	0305374580	Add featured field to curation	2014-07-07 10:42:16 -07:00
Michael Schmatz	b76239b4e9	Replaced candidate avatars on employer page	2014-07-07 10:29:35 -07:00
Scott Erickson	12543cf4dd	Added the foundation of a component docs view.	2014-07-07 10:11:02 -07:00
Scott Erickson	86a3fbacd1	Made the CocoCollection more strict about setting the model property.	2014-07-07 10:11:02 -07:00
Michael Schmatz	3151db6fc5	Hide briefcase when no work history	2014-07-07 09:49:13 -07:00
Scott Erickson	aea1d0e8f2	Changed the angel logigng to use info instead of log, to more easily differentiate.	2014-07-06 15:01:39 -07:00
Scott Erickson	850712442d	Added underscore.string to the worker.	2014-07-06 15:01:20 -07:00
Scott Erickson	a2740279bc	Added styling for tables in the guide.	2014-07-06 15:00:51 -07:00
Scott Erickson	d640dac33a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-06 09:36:12 -07:00
Scott Erickson	37a28cf826	Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor.	2014-07-06 09:35:28 -07: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
Tery Lim	a5476f90ed	Minor cleanup for convention and readability	2014-07-05 18:48:08 +08: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	dc49499679	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-04 18:12:10 -07:00
Scott Erickson	41a8d21bfe	Merged conflicts.	2014-07-04 18:11:50 -07:00
Scott Erickson	c76032b0af	Merged conflicts.	2014-07-04 18:11:26 -07:00
Scott Erickson	92948e64b5	Merge pull request #1245 from greyhusky/patch-2 ... new translations	2014-07-04 18:09:02 -07:00
Scott Erickson	be3a428b50	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-04 18:02:12 -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	81121faebf	Merge pull request #1242 from differentmatt/master ... Fix Placement Agreement typo	2014-07-04 17:39:38 -07:00
Scott Erickson	4e284d81b7	Handled conflicts, throwing out changes to ladder_tab.coffee.	2014-07-04 17:36:10 -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
Tery Lim	329f0e7e22	Clean up for coffeescript convention	2014-07-04 22:23:47 +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	cc917162a7	Fixed doober alignment	2014-07-03 17:01:09 -07:00
Michael Schmatz	6a33ca0892	Removed autoscrolling	2014-07-03 16:40:00 -07:00
Michael Schmatz	d3cc9ae179	10 pixel margin on photos	2014-07-03 16:33:10 -07:00
Michael Schmatz	45e3da0945	Hover on logout button	2014-07-03 16:32:20 -07:00
Michael Schmatz	615303395c	Various fixes for recruiting page	2014-07-03 16:30:27 -07:00
Michael Schmatz	6c31f08853	Unchecked all by default	2014-07-03 15:48:50 -07:00
George Saines	4d12aff35e	removing the counselor from the contribute page and all other links	2014-07-03 15:42:24 -07:00
George Saines	6d438319ab	Merge branch 'employer-redesign' of https://github.com/codecombat/codecombat into employer-redesign	2014-07-03 15:17:41 -07:00
George Saines	88b0a0a97b	making changes to the employer page icon dimensions	2014-07-03 15:17:38 -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	b58f2c49eb	Fix description	2014-07-03 10:22:50 -07:00