Commit graph

56 commits

Author SHA1 Message Date
zmagod
0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod
e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
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
zmagod
6bb8d075e0 truncate asset name in task step and result [fixes SCI-294] 2016-08-18 09:22:12 +02:00
Matej Zrimšek
27a9dac412 File permissions corrected, with some refactoring. 2016-08-17 18:23:24 +02:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00