scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
402 commits 69 branches 179 tags 166 MiB
Commit graph

5 commits

Author SHA1 Message Date
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Mojca Lorber fb081be682 fixes warning messages when loading a new protocol that is linked with repository 2016-08-19 16:03:10 +02:00
Matej Zrimšek ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
zmagod 76dd4bc90a fixed protocol status bar [fixes SCI-318] 2016-08-16 10:47:23 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00