scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
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
..
assets Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
controllers Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
datatables Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2 2017-01-17 08:17:52 +01:00
helpers Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
mailers Bugfix for notification emails 2016-10-13 12:12:28 +02:00
models Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
utilities Also employ "no format" Nokogiri strategy when sanitizing 2016-11-17 16:43:14 +01:00
views Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00