Commit Graph

14 Commits

Author SHA1 Message Date
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
6e7c250ad1 revert collapsed file forms in edit mode, this caused too much trouble. Added some comments concerning that. 2016-06-29 15:38:53 +02:00
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
757efeaf02 minor UI changes, removed elements not needed, replaced text-area for description with an ace editor. 2016-03-10 14:58:50 +01:00
3ada44a3d5 fix 2015-03-12 17:04:53 +01:00
cd09e19d24 hide fields from the file form if not matching the file's role 2015-03-12 17:04:47 +01:00
a62d4ad789 minor usability improvement 2015-03-12 16:44:38 +01:00
22ad6c63e7 removed unused constants and parameters 2015-03-12 12:06:41 +01:00
6ee0b6bf81 implemented partial batch update for exercises 2015-03-12 11:05:11 +01:00
f1de18141a refactored JavaScript code not to use inline Ruby evaluation 2015-03-12 09:13:38 +01:00
8ef0e92914 infer file type from uploaded file 2015-03-10 11:20:48 +01:00
0c47337d5a added the ability to discard files when creating a new exercise 2015-03-10 10:48:53 +01:00
b5eb2f6129 fixed minor code style issues 2015-03-03 11:31:20 +01:00
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00