scinote-web/app/views
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
..
activities Fix activities and the dreaded no project for modules error 2016-08-11 16:57:29 +02:00
canvas Add placeholders for empty experiments 2016-08-23 10:37:48 +02:00
comments Add edit project comments functionality 2016-08-25 13:51:30 +02:00
custom_fields Initial commit. 2016-02-12 16:52:43 +01:00
experiments Merge pull request #94 from mlorb/ml_sci_375 2016-08-25 09:45:16 +02:00
layouts Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
my_module_comments Add individual permission checks in dropdowns 2016-08-25 13:51:50 +02:00
my_module_tags Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
my_modules fixes cloned experiment protocol [fixes SCI-376] 2016-08-23 16:15:45 +02:00
organizations Initial commit. 2016-02-12 16:52:43 +01:00
project_activities Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
project_comments Add individual permission checks in dropdowns 2016-08-25 13:51:50 +02:00
projects Merge pull request #102 from ZmagoD/zd_SCI_336 2016-08-26 09:19:36 +02:00
protocols Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
reports adds font-awesome to pdf [fixes SCI-345] 2016-08-22 14:40:09 +02:00
result_assets 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
result_comments Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
result_tables 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
result_texts 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
results Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
sample_groups Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
sample_my_modules Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
sample_types Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
samples Initial commit. 2016-02-12 16:52:43 +01:00
search adds experiment and team to tag search resuls [fixes SCI-381] 2016-08-25 10:40:03 +02:00
shared change position of overview and samples 2016-08-25 11:19:53 +02:00
step_comments Add individual permission checks in dropdowns 2016-08-25 13:51:50 +02:00
steps Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
user_my_modules Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
user_projects Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
users 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