Scott Erickson 6445924598 Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder_tab.jade app/views/play/ladder/ladder_tab.coffee		2014-03-21 19:53:32 -07:00
..
account	Add admin i18n	2014-03-09 04:36:48 +04:00
admin	No email addresses for non-admins on CLA submissions.	2014-03-21 17:20:47 -07:00
contribute	Add to french diplomats list	2014-03-17 23:39:36 +01:00
editor	Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks	2014-03-21 07:25:33 -07:00
kinds	Show videos in HD if possible. Use ready state on level loader.	2014-03-17 05:52:19 -07:00
modal	Last bits of #546.	2014-03-17 04:44:00 -07:00
play	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-21 19:53:32 -07:00
about.jade	Applied proofread of Julian.	2014-03-19 02:21:45 +01:00
admin.jade	Adding CLAs view.	2014-03-21 16:22:47 -07:00
base.jade	Improved page title. Fixed Twitter card image.	2014-03-21 17:06:51 -07:00
cla.jade	Update cla.jade	2014-03-21 21:59:31 +00: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	Fix login popup being displayed under trailer. (#596)	2014-03-21 06:44:21 +05:30
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
multiplayer_launch_modal.jade	Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed.	2014-03-19 17:25:56 -07: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