scinote-web/app/assets/javascripts
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
2018-04-12 13:16:46 +02:00
..
activities remove comments and activity modal 2018-03-13 10:52:53 +01:00
experiments
my_modules Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
projects fix travis againnnnn 2018-03-30 17:16:18 +02:00
protocols Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
reports Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
repositories Merge pull request #1080 from ZmagoD/zd_SCI_2076 2018-04-09 14:29:45 +02:00
repository_columns fix duplications 2018-04-06 17:02:10 +02:00
results
samples Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
sitewide Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
users Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
application.js.erb Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
assets.js Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
comments.js.erb
my_modules.js
navigation.js Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095 2018-03-16 15:32:40 +01:00
notifications.js
search.js
sidebar.js.erb add locales 2018-04-09 10:53:03 +02:00
sidebar_toggle.js.erb implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00