36 commits

Author	SHA1	Message	Date
Scott Erickson	97a7bc7614	Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch ... Conflicts: app/initialize.coffee bower.json	2014-04-11 10:32:19 -07:00
Nick Winter	8d5e129c2c	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
Nick Winter	7a35a6248f	Adding contact form for employers to contact candidates.	2014-04-10 14:59:32 -07:00
Scott Erickson	a3951b0fa7	Extended the save version modal to allow submitting patches.	2014-04-10 13:09:44 -07:00
Scott Erickson	3c832d3707	Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.	2014-04-10 11:13:33 -07:00
Nick Winter	b96bca8c18	Finished most of basic features for job profiles.	2014-04-07 17:58:02 -07:00
Aditya Raisinghani	44979c074d	Integrated nanoscroller.	2014-04-03 03:10:06 +05:30
Nick Winter	36a90de7f9	Last bits of #546.	2014-03-17 04:44:00 -07:00
Scott Erickson	296a7584a6	Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.	2014-03-16 20:28:02 -07:00
Nick Winter	0125c46dc2	Resolved merge conflict.	2014-03-12 08:29:42 -07:00
Ruben Vereecken	27fd580324	Got rid of CRLF line endings	2014-03-12 16:03:36 +01:00
Ruben Vereecken	af73e5a594	Added a versions modal for every type	2014-03-10 23:29:34 +01:00
Ruben Vereecken	8e989ec08f	Got the level history view set up as before, but better	2014-03-10 23:17:19 +01:00
Alexei Nikitin	f6d6805534	Add password i18n	2014-03-09 04:31:15 +04:00
Alexei Nikitin	bfebd0b47a	Add revert i18n	2014-03-09 04:13:30 +04:00
Nick Winter	a8ef87c9ea	Fixed a few bugs; re-enabled protectAPI for Brawlwood.	2014-03-02 16:06:22 -08:00
Scott Erickson	7c734d6bc9	Added an async name checker for the wizard settings modal.	2014-02-27 14:42:11 -08:00
Scott Erickson	02cb9155c0	Improved a bunch of things with the wizard settings view.	2014-02-27 12:25:59 -08:00
Scott Erickson	3f0f391556	Finished up work on the wizard settings modal.	2014-02-24 09:46:40 -08:00
Scott Erickson	2d6dd36a68	Saturation and lightness was flipped on the spritebuilder. Fixed.	2014-02-24 09:06:22 -08:00
Nick Winter	9ac0939bb8	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
Kushal	40eead0341	use https when linking to wikipedia ... Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :) https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/	2014-02-08 16:31:52 -06:00
Nick Winter	e0108a3166	A few fixes for the Bootstrap 3 migration. Fixed #280.	2014-01-29 12:18:37 -08:00
Scott Erickson	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -08:00
Scott Erickson	096d318e96	Fixed #283	2014-01-27 18:05:39 -08:00
Scott Erickson	d6e21192f5	Fixed #278	2014-01-27 16:59:34 -08:00
Scott Erickson	88c8c3896b	Merge branch 'master' into feature/bootstrap3	2014-01-27 11:03:04 -08:00
Scott Erickson	9da955d1a2	Set up a backup system for the editor using localStorage.	2014-01-26 14:46:25 -08:00
Tom Steinbrecher	cd33376dea	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
GlenDC	95c81e4672	Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file	2014-01-19 17:19:19 +01:00
GlenDC	6c46dc3fda	Tracked down common used i18n tags and applied it already on the nl.coffee file	2014-01-19 17:00:41 +01:00
Nick Winter	60850d5c48	Updated some tags. Added a script to copy tags from en.coffee.	2014-01-14 10:29:23 -08:00
Nick Winter	00f4699ce5	Further fixes for save modals.	2014-01-10 17:32:29 -08:00
Scott Erickson	ecd9ed8fef	Fixed the save version modal.	2014-01-10 17:11:13 -08:00
GlenDC	100a296951	Fixed Issue #26	2014-01-10 22:31:26 +01:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00