27 commits

Author	SHA1	Message	Date
Nick Winter	81634190ef	Added i18n for translating specific articles now, too.	2014-05-05 19:14:38 -07:00
Nick Winter	183fe9c496	Code review of 97d3b6.	2014-04-25 10:46:43 -07:00
Michael Schmatz	97d3b6107d	Merge feature/linkedin into master	2014-04-25 08:47:31 -07:00
Michael Schmatz	4f6f845c2d	Employer signup works	2014-04-24 17:36:07 -07:00
Scott Erickson	cfbd7b9b12	Fixed #911	2014-04-24 11:51:00 -07:00
Nick Winter	ab77176ed0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-22 11:11:10 -07:00
Nick Winter	675db1b76f	Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.	2014-04-22 11:11:08 -07:00
Scott Erickson	f57be1ae52	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
Nick Winter	848ebf2ffe	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-18 09:53:34 -07:00
Nick Winter	844c1391ca	Reworked top nav. Many improvements to job profile form.	2014-04-18 09:53:28 -07:00
Scott Erickson	731726dcd3	Merge branch 'master' into feature/jsondiffpatch	2014-04-16 10:42:43 -07:00
Scott Erickson	c395a3414e	Merge branch 'master' into feature/jsondiffpatch	2014-04-15 15:18:57 -07:00
Scott Erickson	58b1019934	Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.	2014-04-15 15:09:36 -07:00
Nick Winter	f762d95ab8	ModelModal and simple leaderboard pagination.	2014-04-15 15:01:54 -07:00
Nick Winter	e49344bd87	A few job profile fixes and cleanup.	2014-04-15 10:45:54 -07:00
Nick Winter	9194f842e6	Added some job description fields.	2014-04-15 09:28:19 -07:00
Scott Erickson	d65498998d	Merge pull request #851 from JasperDhaene/master ... Added some schemas	2014-04-15 08:18:03 -07:00
Glen De Cauwsemaecker	891cf74a8a	Resolved merge conflicts of Jasper's translations	2014-04-15 02:04:52 +02:00
Jasper D'haene	2cde44319c	added some app schemas + missing schema stub	2014-04-13 16:05:11 +02:00
Jasper D'haene	4157447337	completed bus schemas	2014-04-13 15:23:24 +02:00
JasperDhaene	3915ebc8b3	Updated some Bus schemas.	2014-04-13 12:31:12 +02:00
Scott Erickson	30f785f7cf	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
Aditya Raisinghani	e04787475c	Rebased master to get updated schemas and added patch schema	2014-04-12 15:16:42 +05:30
Aditya Raisinghani	b932bf1e7c	Deleted schemas from /server and modified files to point to /app/schemas	2014-04-12 14:45:59 +05:30
Aditya Raisinghani	6fb5b59a01	Refactored schemas to be in /app	2014-04-12 14:33:55 +05:30
Ruben Vereecken	a07457acac	Finished minor refactorings	2014-04-11 20:09:50 +02:00
Ruben Vereecken	c2c0496883	Added schema stubs for about everything	2014-04-11 14:22:49 +02:00