Commit Graph

10 Commits

Author SHA1 Message Date
3730376ec1 after merge 2016-08-03 11:22:39 +02:00
ed3526a578 Merge branch 'master' into feature-file-templates
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
2016-07-28 15:16:11 +02:00
72def4a661 delete class team 2016-06-30 12:00:54 +02:00
f75f889ed1 remove sumbission button 2016-06-30 11:47:36 +02:00
7ef401f75a Add navigation item for file templates 2016-06-10 18:15:37 +02:00
c947bbf152 Add CodeHarbor links to administation navigation
(leoselig/codeocean#2)
2016-02-04 11:43:27 +01:00
c84e47753c added link to administrator dashboard 2015-02-24 18:25:33 +01:00
466f8967e2 eliminated naming clash with Sorcery 2015-02-23 10:39:04 +01:00
dd624b26c8 started implementing teams 2015-01-28 12:28:09 +01:00
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00