Scott Erickson 209a1a3563 Merge branch 'master' of https://github.com/codecombat/codecombat		2014-03-16 17:00:12 -07:00
..
account	Add admin i18n	2014-03-09 04:36:48 +04:00
admin	First big fix for issue #23. The issue is as good as fixed besides some details I think.	2014-01-11 17:25:04 +01:00
contribute	Resolved some merge conflicts.	2014-03-13 10:32:18 -07:00
editor	Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.	2014-03-16 13:23:01 -07:00
kinds	Got rid of CRLF line endings	2014-03-12 16:03:36 +01:00
modal	Resolved merge conflict.	2014-03-12 08:29:42 -07:00
play	A couple tweaks for #577.	2014-03-16 16:04:17 -07:00
about.jade	Moved Glen from Archmages to About.	2014-03-13 18:27:08 -07:00
admin.jade	Implemented espionage mode	2014-02-26 14:14:43 -08:00
base.jade	adding the new website background images	2014-03-14 15:24:36 -07:00
cla.jade	More fixes for #283	2014-01-27 18:44:05 -08:00
editor.jade	fix i18n tag in editor and setting template	2014-01-19 18:20:41 +01:00
employers.jade	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
home.jade	New level page with new artwork.	2014-03-16 16:59:48 -07:00
legal.jade	Fix link in legal.jade	2014-02-27 16:34:58 -08:00
loading.jade	Fixed the progress bar for loading pages.	2014-01-27 11:12:58 -08:00
not_found.jade	- create sass file to center 404 image on page	2014-03-03 11:42:07 -05:00
play.jade	Updates for /play levels list.	2014-03-12 16:41:09 -07:00
teachers.jade	Updated language progress; added Slovene placeholder.	2014-01-14 12:18:05 -08:00