160 commits

Author	SHA1	Message	Date
Urban Rotnik	7c312a844f	Fix updating updated_at on protocol while load/sync with repository	2020-09-29 15:37:40 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
Urban Rotnik	de4e4ca967	Add before_action for team switch	2020-04-23 16:20:01 +02:00
aignatov-bio	fe718349da	Add recent protocol tab to load protocal from repository	2020-04-09 17:29:39 +02:00
aignatov-bio	0b04ca4012	Fix markup	2019-11-21 12:19:47 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +01:00
aignatov-bio	1488f75e26	Add activities	2019-11-13 13:57:04 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Oleksii Kriuchykhin	584f2d07c0	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-01 13:06:01 +02:00
aignatov-bio	6e5f078dea	Add activities for marvinJS [SCI-3630] (#1950) ... * Add marvinJs activities to step and results * Add activities for TinyMCE marvinJS assets * Fix markup	2019-08-09 09:47:07 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin	a1941a21dc	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +02:00
Alex Kriuchykhin	df59c54bd4	Merge pull request #1776 from okriuchykhin/ok_SCI_3477 ... Fix protocol metadata editing in repository [SCI-3477]	2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin	488fc99dae	Fix protocol metadata editing in repository [SCI-3477]	2019-05-16 17:11:17 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Anton Ignatov	2e6bab4638	Fix smart anottation to protocols in repository	2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin	40550f92c9	Improve HTML data escaping in JSON endpoints [SCI-3403]	2019-05-08 17:38:24 +02:00
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
aignatov-bio	a1047f4597	Fix activities wording [SCI-3287] (#1635) ... * Fix activities wording * Adding project to export protocol	2019-04-04 10:45:35 +02:00
aignatov-bio	e034a0c055	Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) ... * Fix bug with update protocol from repository and modal disable button	2019-04-03 09:18:18 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Urban Rotnik	2ea2700837	fixup! Fix failing tests	2019-03-15 10:30:51 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Oleksii Kriuchykhin	3376fd012c	Improve error loggin in protocol import [SCI-3023]	2019-02-07 14:00:24 +01:00
Jure Grabnar	6ec2c99a28	Hound styling	2018-11-26 13:52:01 +01:00
Jure Grabnar	0086e4dcf3	Catch some of templates error when import protocols.io	2018-11-26 13:43:05 +01:00
Jure Grabnar	1c7a051551	Catch all errors on PIO import and show message	2018-11-23 20:47:48 +01:00
Zanz2	b26530a02f	Found a new, and more elegant fix inside controller with Luka	2018-08-28 14:48:23 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
okriuchykhin	fc06f8c60b	Merge pull request #1055 from okriuchykhin/ok_SCI_2250 ... Skip asset if file is missing in protocol export [SCI-2250]	2018-03-26 14:19:49 +02:00
zmagod	c61efb0624	rename before_acton hook	2018-03-26 13:07:00 +02:00
Oleksii Kriuchykhin	ecd3c73772	Skip asset if file is missing in protocol export [SCI-2250]	2018-03-25 13:36:24 +02:00
zmagod	c46da5cc67	fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-19 16:10:28 +01:00
mz3944	bb21f6543c	Merge pull request #1004 from mz3944/mz-SCI-2011 ... Wrapping up the permissions [SCI-2011]	2018-03-06 07:10:40 +01:00
Zanz2	29aea1ebd2	refactored according to PR	2018-02-21 16:17:53 +01:00
Matej Zrimšek	b8b9707c06	Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.	2018-02-19 14:51:14 +01:00
Matej Zrimšek	7b07e7b347	Fixed protocol in repository permissions, and refactored it a bit.	2018-02-16 12:04:11 +01:00
Matej Zrimšek	6ba226d514	Added missing '?' to the canaid permission calls that were missing it.	2018-02-16 11:12:30 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Zanz2	c963c948a1	Fixed main issue, bad step structure now gets fixed to empty template	2018-02-15 23:28:20 +01:00