scinote-web/app/assets/javascripts
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
experiments
my_modules Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
projects Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
protocols Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
reports Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
results Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
samples Remove previous fix for popups [SCI-855] 2017-01-18 10:59:00 +01:00
sitewide Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
users cleanup direct upload 2016-12-08 11:26:13 +01:00
application.js.erb Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
assets.js Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
comments.js.erb Fix 2 bugs with comments editing 2016-12-23 20:41:23 +01:00
my_modules.js
navigation.js
notifications.js
sidebar.js.erb