scinote-web/app/assets/javascripts/repositories
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
..
import 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
edit.js
index.js removed reload on hide modal 2017-06-22 16:47:50 +02:00
repository_datatable.js Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00