scinote-web/app/views/shared
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
..
sidebar fixed navigation link 2016-12-14 10:35:48 +01:00
_drag_n_drop_overlay.html.erb adds overlay partial 2017-06-05 11:31:05 +02:00
_flash_errors.html.erb Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
_image_preview_modal.html.erb Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
_invite_users_modal.html.erb renamed organizations in views 2017-01-25 12:01:23 +01:00
_invite_users_modal_results.html.erb renamed organizations in views 2017-01-25 12:01:23 +01:00
_navigation.html.erb put all titles on links 2017-06-27 14:21:06 +02:00
_sample.html.erb Initial commit. 2016-02-12 16:52:43 +01:00
_samples.html.erb Merge pull request #645 from ZmagoD/zd_SCI_1278 2017-06-07 15:04:24 +02:00
_secondary_navigation.html.erb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
_sidebar.html.erb fixed navigation link 2016-12-14 10:35:48 +01:00