scinote-web/app/views
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 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +01:00
assets Add HTML <head><title> to edit, view file pages 2017-03-06 13:55:07 +01:00
canvas Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
client_api Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
comments Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
experiments Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
layouts Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
my_module_comments Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
my_module_tags Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
my_modules 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
project_activities Add task name to project activity [SCI-275] 2016-12-29 16:31:48 +01:00
project_comments Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
projects Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
protocols Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
reports Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
repositories Merge pull request #1080 from ZmagoD/zd_SCI_2076 2018-04-09 14:29:45 +02:00
repository_columns fixes delete column action 2018-04-05 09:56:09 +02:00
repository_rows fix assigned ordering 2018-03-08 17:36:10 +01:00
result_assets Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
result_comments Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
result_tables adds results js code in modules 2017-05-11 16:54:28 +02:00
result_texts adds results js code in modules 2017-05-11 16:54:28 +02:00
results Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
sample_groups add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
sample_my_modules Refactor canvas a lot. 2016-07-28 16:41:10 +02:00
sample_types add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
samples Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
search Merge pull request #1068 from okriuchykhin/ok_SCI_2217 2018-04-05 00:18:43 +02:00
shared Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
step_comments Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
steps Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
teams renamed organizations in views 2017-01-25 12:01:23 +01:00
user_my_modules Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
user_notifications Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
user_projects Fix user management on project [SCI-2146] 2018-03-09 12:08:34 +01: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
zip_exports adds view if download expires 2017-03-27 10:38:28 +02:00