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
..
_edit.html.erb	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
_empty_step.html.erb	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
_form_assets.html.erb	File permissions corrected, with some refactoring.	2016-08-17 18:23:24 +02:00
_form_checklists.html.erb	Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.	2016-08-17 17:54:06 +02:00
_form_tables.html.erb	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
_new.html.erb	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
_step.html.erb	Merge branch 'master' into mz_file_upload_and_client_side_upgrade	2016-08-26 11:13:40 +02:00