Scott Erickson 53579b2632 Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade		2014-04-11 22:52:05 -07:00
..
account	Added some i18n and improved employer page.	2014-04-11 12:49:44 -07:00
admin	No email addresses for non-admins on CLA submissions.	2014-03-21 17:20:47 -07:00
contribute	add myself into diplomat.jade	2014-04-06 11:56:25 +08:00
editor	Merge branch 'master' into feature/jsondiffpatch	2014-04-11 22:52:05 -07:00
kinds	Fix crlf	2014-04-08 10:50:58 +04:00
modal	Merge branch 'master' into feature/jsondiffpatch	2014-04-11 22:52:05 -07:00
play	Moved nanoscroller to bower components and related fixes.	2014-04-08 03:04:36 +05:30
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	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -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	Added some i18n and improved employer page.	2014-04-11 12:49:44 -07:00
error.jade	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
home.jade	use youku for Chinese Version	2014-04-09 13:50:13 +08:00
legal.jade	Fix link in legal.jade	2014-02-27 16:34:58 -08:00
loading.jade	Set up a new loading/progress system for views.	2014-04-03 18:43:29 -07:00
loading_error.jade	Set up a new loading/progress system for views.	2014-04-03 18:43:29 -07:00
multiplayer_launch_modal.jade	Updated i18n tags.	2014-03-28 13:19:17 -07:00
not_found.jade	- create sass file to center 404 image on page	2014-03-03 11:42:07 -05:00
play.jade	Fixed 101: added level completion status to /play.	2014-03-31 15:48:22 -07:00
teachers.jade	Updated language progress; added Slovene placeholder.	2014-01-14 12:18:05 -08:00