118 commits

Author	SHA1	Message	Date
Martin Artnik	1df4433074	Fix file activity logging in steps controller	2022-06-02 13:44:03 +02:00
artoscinote	98d66a3276	Implement reordering activities [SCI-6851] (#4129) ... * Implement reordering activities [SCI-6851] * Added asset activity types [SCI-SCI-6853]	2022-06-01 12:30:09 +02:00
artoscinote	23872f519b	Implement step element sorting modal [SCI-6849] (#4124) ... * Implement step element sorting modal [SCI-6849] * Implement step reordering modal [SCI-6850] * Refactor reorderable items a bit [SCI-6850]	2022-05-30 13:45:51 +02:00
Anton	a494051f61	Add placeholder for new files in step [SCI-6833]	2022-05-23 13:44:34 +02:00
Anton	9cd0e010a6	Add file upload logic [SCI-6829]	2022-05-19 08:54:22 +02:00
Anton	711bd77222	Add manage dropdown to attachments section [SCI-6815]	2022-05-16 11:05:18 +02:00
Anton	940b0ea744	Add general layout for step attachments [SCI-6811]	2022-05-12 12:26:50 +02:00
Anton	c0660d0243	Small fixes [SCI-6808]	2022-05-11 11:32:27 +02:00
Anton	04e16cf6b5	Add text component [SCI-6808]	2022-05-11 09:51:47 +02:00
Anton	6a827022f6	Add insert step element dropdown [SCI-6758]	2022-05-03 13:22:26 +02:00
Anton	189f4335ea	Add main layout for step [SCI-6755]	2022-04-28 11:38:33 +02:00
Anton	6dde945d61	Add step layout [SCI-6755]	2022-04-28 11:13:38 +02:00
Anton	ba3c73439a	Add step creation/deletion functionality [SCI-6754]	2022-04-25 12:40:14 +02:00
Oleksii Kriuchykhin	a99599efea	Merge branch 'features/new_permissions' into develop	2021-10-29 15:16:30 +02:00
Alex Kriuchykhin	1bde37db78	Merge branch 'develop' into ok_SCI_5579	2021-10-28 13:26:27 +02:00
aignatov-bio	4705d09a96	Small permission fixes for controllers [SCI-6132] (#3581)	2021-10-08 12:43:26 +02:00
Oleksii Kriuchykhin	c26dcf4b23	Replace empty? with blank? [SCI-5579]	2021-07-23 11:56:28 +02:00
aignatov-bio	53456988ba	Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411) ... * Add bio eddie licens to users [SCI-5845] * Add activities for BioEddie [SCI-5842]	2021-07-19 21:33:28 +02:00
Urban Rotnik	8ca8c84efd	Fix report completed_on time and username (partially) ... SCI-5439 We cannot realy on last_modified_by, because it can be changed after step completion	2021-02-25 13:24:21 +01:00
aignatov-bio	188013dd56	Change permission for sorting in steps and asset view [SCI-5289]	2020-12-08 10:45:43 +01:00
Urban Rotnik	dc9fae6af0	Remove manage permissions check from step toggle	2020-11-27 11:37:39 +01:00
aignatov-bio	0f80786433	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step	2020-11-02 18:52:46 +01:00
aignatov-bio	84a7d49023	Fix markup	2020-11-02 18:51:21 +01:00
aignatov-bio	eca39a00b5	Add attachments dropdown to step	2020-11-02 18:47:08 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
Mojca Lorber	04e3b67968	Change the way buttons are toggled	2020-10-30 18:47:01 +01:00
aignatov-bio	6193f91192	Update view mode switcher logic	2020-10-29 16:42:05 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +01:00
aignatov-bio	6ed8757eb1	Merge branch 'features/task-flows' into develop	2020-09-17 14:52:05 +02:00
Oleksii Kriuchykhin	73cf620960	Add Completion and Uncompletion consequences [SCI-5004]	2020-09-14 20:06:48 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin	dea75553a3	Fix handling of duplicated step positions [SCI-4880]	2020-09-07 10:44:00 +02:00
Oleksii Kriuchykhin	ed2eb81c68	Switch to position swapping when updating step position [SCI-4880]	2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin	a206890a8c	Fix step position adjusting on move and destroy [SCI-4880]	2020-08-25 15:46:21 +02:00
Urban Rotnik	5923a4c014	Merge branch 'develop' into features/task-flows	2020-08-25 15:30:22 +02:00
aignatov-bio	19a0d05467	Fix for checklist ordering	2020-08-14 12:32:39 +02:00
Urban Rotnik	38d3411007	Update checklist item positions with validations skip	2020-08-13 20:06:03 +02:00
Oleksii Kriuchykhin	aa38d92982	Improve completed_on generation for steps/my_modules [SCI-4776]	2020-07-07 09:34:51 +02:00
Oleksii Kriuchykhin	dc481cf236	Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]	2020-07-03 16:48:29 +02:00
aignatov-bio	d5f9604e1c	Fix file post process method	2019-12-03 10:17:47 +01:00
Oleksii Kriuchykhin	c068901b00	Upgrade Rails to 6.0 [SCI-3745]	2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin	32054c5516	Handle situation for assets without blob in list sorting [SCI-3757]	2019-08-09 15:17:19 +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
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Oleksii Kriuchykhin	6e1a7a3392	Implement saving of attachments ordering on steps [SCI-3436]	2019-06-11 10:08:33 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
aignatov-bio	59e824ef9e	Fix nil handling in different places [SCI-2840] (#1777) ... * Fix nil handling in different places	2019-05-21 15:53:34 +02:00
Anton Ignatov	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +02:00