3518 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matej Zrimšek	e5799ee6dc	Some permission fixes.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	a21343a819	Fixing and refactoring project permissions in controllers.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	279da20060	Fixed Hound warnings.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
zmagod	370852d960	set up queries for fetch samples and related objects	2018-02-13 16:52:37 +01:00
mlorb	8d0ac93c80	add check to start work on next task notification if recent changes notification is switched off	2018-02-13 11:01:45 +01:00
zmagod	18eab358c7	generate custom repository when user is created [fixes SCI-2020]	2018-02-13 10:44:50 +01:00
zmagod	5124af6cfb	fixes failing cucumber specs	2018-02-12 11:42:22 +01:00
Zmago Devetak	027297d46a	Merge pull request #985 from ZmagoD/zd_SCI_2008 ... fixes bug with assets upload on task result page,	2018-02-12 11:40:44 +01:00
okriuchykhin	e7fb1bc716	Merge pull request #967 from okriuchykhin/ok_SCI_1966 ... Merge gilson-iot-rails4 to master [SCI-1966]	2018-02-12 11:02:17 +01:00
okriuchykhin	5a94b40d9c	Merge pull request #978 from okriuchykhin/ok_SCI_2003 ... Improve files handling in protocol cloning [SCI-2003]	2018-02-12 11:01:59 +01:00
Zmago Devetak	ccba5d3eb3	Merge pull request #992 from ZmagoD/zd_SCI_2015 ... setup models for repository list column [fixes SCI-2015]	2018-02-12 10:59:20 +01:00
zmagod	27b7aff3ea	fixed bug with assigned repository items [fixes SCI-2040]	2018-02-12 10:49:35 +01:00
zmagod	36595d33f4	fix name scope	2018-02-12 09:09:56 +01:00
zmagod	d12f8403e4	add reference to repository column	2018-02-12 09:05:41 +01:00
zmagod	ae99c92516	follow @okriuchykhin 's suggestions	2018-02-09 16:28:21 +01:00
zmagod	ace78cfb58	fixes errors with form id duplicates [fixes SCI-2039]	2018-02-09 14:54:16 +01:00
zmagod	557aeca049	refactor relations	2018-02-09 14:11:56 +01:00
zmagod	7c13c5a1f4	fixes typo, follows @okriuchykhin 's suggestions	2018-02-09 11:38:52 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 ... Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00
Zanz2	49a4d9cf23	Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar	2018-02-07 15:50:42 +01:00
zmagod	6b7ff11bcf	setup models for repository list column [fixes SCI-2015]	2018-02-07 15:28:28 +01:00
Zanz2	60aa1a0953	Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before	2018-02-07 15:12:03 +01:00
Zanz2	a6356d2420	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
Zmago Devetak	e400514020	Merge pull request #981 from ZmagoD/zd_SCI_2026 ... fixes bug with step table update [fixes SCI-2026]	2018-02-07 14:35:15 +01:00
Zmago Devetak	b33d09536e	Merge pull request #987 from ZmagoD/zd_SCI_2033 ... fixes user dropdown [fixes SCI-2033]	2018-02-07 14:34:37 +01:00
Zanz2	efaf5ad721	Commands now get styled like code	2018-02-07 13:51:22 +01:00
Zanz2	ef0733b886	Merge pull request #988 from Zanz2/red_error_msg_sci1993 ... Accidentally deleted this off master, identical to the branch before [SCI-1993]	2018-02-07 13:08:45 +01:00
Zanz2	a6e93b8e35	Fixed hound line too long	2018-02-07 13:04:02 +01:00
mlorb	edbcdc6bf4	Merge pull request #986 from mlorb/ml-sci-2031 ... Fix error on task activity [SCI-2031]	2018-02-07 11:39:14 +01:00
Zanz2	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
Zanz2	e56c0bb100	Tables are now always atleast 5x5, like in scinote when creating new table	2018-02-07 10:55:44 +01:00
Zanz2	f7f46a094e	Fixed PR and a mistake i made	2018-02-07 09:53:49 +01:00
Zanz2	167cbc98e5	Merge branch 'master' into yellow_flashv3_SCI1834	2018-02-07 09:42:56 +01:00
Zanz2	80735f2412	Fixed the bug with big text difference in preview and imported protocol	2018-02-07 09:26:45 +01:00
zmagod	695e9d90d2	fixes user dropdown [fixes SCI-2033]	2018-02-07 08:43:42 +01:00
Luka Murn	4389c110cf	Merge pull request #982 from biosistemika/lm-remove-component-loader ... Remove component loader (so builds pass)	2018-02-06 17:02:08 +01:00
Luka Murn	b5ac4494d5	Uncommit load_addons_specs.rb	2018-02-06 16:58:15 +01:00
mlorb	e151c963e1	fix error on task activity	2018-02-06 16:34:16 +01:00
zmagod	2ad4eb3488	fix bug with checklists	2018-02-06 16:15:10 +01:00
zmagod	75cc9d11df	fix error on checklists	2018-02-06 16:06:15 +01:00
Zanz2	a37d4f3cde	there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally	2018-02-06 15:46:03 +01:00
Zmago Devetak	25a42658c8	Merge pull request #980 from ZmagoD/zd_SCI_2009 ... adds nil check in step_table_element for table name [fixes SCI-2009]	2018-02-06 15:44:56 +01:00
zmagod	bd1345d560	fixes bug with assets upload on task result page, ... adds ctrl+v listener to upload images from clipboard, adds image preview modal	2018-02-06 15:39:19 +01:00
Zanz2	a2df9777f6	Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 ... fixed empty table name unable to generate reports bug [SCI-2000]	2018-02-06 14:34:31 +01:00
Zanz2	83e9550feb	Merge pull request #966 from Zanz2/images_not_imported_SCI1807 ... Images not imported [SCI-1807]	2018-02-06 14:33:35 +01:00
Zanz2	f9c6eafe49	most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit	2018-02-06 12:04:24 +01:00
Zanz2	9b5ddc6789	moved code from older branch to new master	2018-02-06 11:03:17 +01:00
Zanz2	748af2cbf7	Fixed the issue, table name defaults to empty string space now	2018-02-06 10:29:49 +01:00