812 commits

Author	SHA1	Message	Date
Urban Rotnik	26db4f3515	Add Archive and Restore service	2020-06-09 18:50:36 +02:00
aignatov-bio	37baa13f47	Fi tests	2020-06-09 14:37:45 +02:00
aignatov-bio	c0e984b316	Fix tests	2020-06-04 18:41:45 +02:00
Urban Rotnik	446a2db186	Export and import checklist items with delimiter	2020-06-01 17:19:33 +02:00
aignatov-bio	f963608996	Add I18n and tests	2020-06-01 14:34:04 +02:00
Mojca Lorber	285280827a	Refactor repository column base controller	2020-05-28 12:18:46 +02:00
Mojca Lorber	c673e27109	Merge branch 'develop' into ml-sci-4261	2020-05-28 08:18:24 +02:00
Oleksii Kriuchykhin	d77930af61	Fix failing tests for repository rows controller [SCI-4629]	2020-05-18 14:12:06 +02:00
Oleksii Kriuchykhin	c0521c3ca7	Prevent the inventory items editing while snapshot is being created [SCI-4629]	2020-05-15 17:46:59 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
aignatov-bio	8ec7a4b7b4	Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory	2020-05-07 13:03:00 +02:00
aignatov-bio	ff2a7aa9b6	Fix spec markup	2020-05-05 09:47:55 +02:00
aignatov-bio	b01ff206e8	Fix tests	2020-04-28 13:18:57 +02:00
Urban Rotnik	9c3fb063c0	Fix counter and error showing for CheckList column type	2020-04-24 16:09:54 +02:00
aignatov-bio	c2e456aa27	Fix activities and specs	2020-04-23 15:25:28 +02:00
aignatov-bio	10fdd0c1c7	Merge branch 'develop' into features/new-task-layout	2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin	837437309e	Fix failing tests [SCI-4516]	2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin	3c53be1f9a	Add start date to the task [SCI-4504]	2020-03-31 14:17:14 +02:00
aignatov-bio	6d41d4d112	Fix tests	2020-03-31 14:16:31 +02:00
Miha Mencin	ecd49cb1e7	fix format and export_format mess	2020-03-18 09:57:57 +01:00
Miha Mencin	24b979aa6f	fix CR comments	2020-03-18 09:53:47 +01:00
Miha Mencin	c89503f691	SCI-4464 fix the import of the dates, some tests	2020-03-17 21:20:50 +01:00
Oleksii Kriuchykhin	675b578272	Add used space calculation method to the team model [SCI-4459]	2020-03-17 16:56:55 +01:00
Alex Kriuchykhin	2a2e479cd3	Merge pull request #2470 from okriuchykhin/ok_SCI_4408 ... Enable time fraction for task due date [SCI-4408]	2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin	bece39fbfb	Fix failing tests [SCI-4408]	2020-03-16 18:30:17 +01:00
Mojca Lorber	8dac5effbe	Another fix	2020-03-13 14:57:26 +01:00
Mojca Lorber	c716a52aae	Fix bug with date format when importing to inventory	2020-03-12 12:19:25 +01:00
Oleksii Kriuchykhin	9d0d75acc5	Add API endpoints for new column types [SCI-4276]	2020-02-18 15:13:46 +01:00
Alex Kriuchykhin	9c763f2111	Merge pull request #2383 from okriuchykhin/ok_SCI_4220 ... Extend inventory import to support new data types [SCI-4220]	2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin	7d107bf45b	Fix tests [SCI-4317]	2020-02-05 11:58:27 +01:00
Mojca Lorber	f0dcf60421	Fix tests	2020-02-04 16:23:06 +01:00
Mojca Lorber	2727614603	Clean up controllers for manage repository columns	2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin	632b54cb98	Merge branch 'develop' into ok_SCI_4220	2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin	b0c785f4fb	Extend inventory import to support new data types [SCI-4220]	2020-02-03 15:20:01 +01:00
Miha Mencin	0d3e8ac3e1	remove silly test	2020-01-27 15:04:53 +01:00
Alex Kriuchykhin	da26d8a018	Merge pull request #2304 from okriuchykhin/ok_SCI_4204 ... Refactor repository cell cloning to support all data types [SCI-4204]	2020-01-15 13:04:50 +01:00
Alex Kriuchykhin	9412cccc9c	Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update ... Fix for list items update	2020-01-15 12:34:33 +01:00
Urban Rotnik	a23b2eab78	Fix list item update	2020-01-15 11:24:50 +01:00
Oleksii Kriuchykhin	9e8bd23616	Merge latest branch 'develop' into ok_SCI_3988	2020-01-15 10:52:20 +01:00
Oleksii Kriuchykhin	66def56af9	Fix test for checklist value [SCI-4204]	2020-01-15 10:21:14 +01:00
Oleksii Kriuchykhin	0e391f6751	Fix tests [SCI-4224]	2020-01-13 17:17:07 +01:00
Oleksii Kriuchykhin	4799e6a1eb	Fix failing tests [ok_SCI_4197]	2020-01-10 11:09:47 +01:00
Oleksii Kriuchykhin	522ae12f08	Merge branch 'develop' into ok_SCI_3988	2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin	fb9493a11c	Fix tests [SCI-3988]	2020-01-07 15:30:30 +01:00
Oleksii Kriuchykhin	1b902ff4b3	Merge branch 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
aignatov-bio	3bd44dc5ab	Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model ... Refactor checklist column data structure [SCI-4168]	2019-12-24 11:12:36 +01:00
Urban Rotnik	400c109592	Refactor StatusesJS for new dropdown	2019-12-23 14:34:11 +01:00
aignatov-bio	54800cb69b	Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model	2019-12-20 15:46:39 +01:00
Urban Rotnik	2e88f194bc	Fix tests	2019-12-20 14:58:14 +01:00
Oleksii Kriuchykhin	56b002452e	Fix tests for inventories [SCI-4166]	2019-12-19 11:38:26 +01:00
aignatov-bio	dc91893d7e	Refactor checklist column data structure	2019-12-18 14:10:41 +01:00
Urban Rotnik	d35f7119b7	Moved delete action to service	2019-12-10 14:29:37 +01:00
Urban Rotnik	82b93bf9a4	Fix failing tests	2019-12-10 14:29:35 +01:00
Urban Rotnik	508a9b4e3e	RepositoryRows controller refactor	2019-12-10 14:29:35 +01:00
Urban Rotnik	b68aadf506	Update params nesting	2019-12-10 14:29:35 +01:00
Urban Rotnik	dd9880f030	Add CreateRepositoryRowService	2019-12-10 14:29:34 +01:00
Urban Rotnik	98b89e9e80	Add UpdateRepositoryRowService	2019-12-10 14:29:34 +01:00
Urban Rotnik	0c990ef8cf	Add functions for creating new cells with values	2019-12-10 14:29:34 +01:00
Urban Rotnik	5b710241e1	Add delete condition to update_data method on CellValues	2019-12-10 14:29:33 +01:00
Urban Rotnik	79a50860b6	Add methods update_data, data_changed, formatted for all types off ColumnValues	2019-12-10 14:29:29 +01:00
Urban Rotnik	e764e856d8	Fix syntax error	2019-12-10 09:40:40 +01:00
aignatov-bio	09079fbcda	Fix naming and tests	2019-12-09 13:48:36 +01:00
aignatov-bio	643abc3fd7	Fixes tests	2019-12-09 13:48:36 +01:00
aignatov-bio	d8676596f1	Add checklists column type	2019-12-09 13:48:36 +01:00
Urban Rotnik	eca0c84bbd	Fix tests	2019-12-06 14:20:37 +01:00
Urban Rotnik	65d8d0e35b	DateTime HTML and JS simplified	2019-11-29 10:19:57 +01:00
Urban Rotnik	5ae29d549e	Add manage modal for DateTime values	2019-11-29 10:19:55 +01:00
Urban Rotnik	f39af1916f	Split DateTime and DateTimeRange column types, rename DateType table	2019-11-29 10:19:16 +01:00
Urban Rotnik	d1f23d008a	Fix tests	2019-11-29 10:19:16 +01:00
Urban Rotnik	2a20ad68a3	Add range column to RepositoryColumn	2019-11-29 10:19:14 +01:00
Urban Rotnik	fe4aa12ced	Add DateTime columns CRUD endpoints	2019-11-29 10:19:14 +01:00
Urban Rotnik	b591346a3f	Add DateTime type column	2019-11-29 10:19:13 +01:00
Urban Rotnik	b2ce600820	Add delimiter column for repository_column	2019-11-29 10:19:10 +01:00
Urban Rotnik	804e36650e	Add service for updating ListColumnItems	2019-11-29 10:19:09 +01:00
Urban Rotnik	1e8261ac2a	Update InventoryColumns API for new Status Type	2019-11-29 10:19:07 +01:00
Urban Rotnik	7ab12baef9	Add API endpoint for StatusItems	2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin	73be1181ac	Fix failing tests for repository states [SCI-4070]	2019-11-29 10:19:05 +01:00
Mojca Lorber	305104f639	Refactor text inventory type	2019-11-29 10:17:53 +01:00
Urban Rotnik	f645ff52ab	Refactor ColumnServices	2019-11-29 10:17:52 +01:00
Urban Rotnik	28d7a4f284	Refactor FileColumnController	2019-11-29 10:17:51 +01:00
Urban Rotnik	1720623665	Refactor RepositoryListColumn controller	2019-11-29 10:17:50 +01:00
Urban Rotnik	14b43d516e	Add UpdateStatusColumnService service	2019-11-29 10:16:45 +01:00
Urban Rotnik	de2ee66dd4	Add DeleteStatusColumnService service	2019-11-29 10:16:44 +01:00
Urban Rotnik	5930bdd794	Add StatusColumnsController	2019-11-29 10:16:44 +01:00
Urban Rotnik	bbb8c46fe2	Add CreateStatusColumnService service	2019-11-29 10:16:44 +01:00
Urban Rotnik	c00a837105	Add models for RepositoryStatus column type	2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin	5e8afae1f0	Fix failing tests [SCI-3988]	2019-11-18 15:15:44 +01:00
Oleksii Kriuchykhin	b2862b6c9e	Remove Paperclip DB columns and fix experiment templates [SCI-3988]	2019-11-18 14:16:28 +01:00
aignatov-bio	b1f9e7f1ca	Fix global activities jsonb field [SCI-3830] (#2030) ... * Fix global activities jsonb field * Fix tests	2019-11-18 13:59:54 +01:00
Urban Rotnik	54c473fa6b	Tests fix	2019-11-18 11:11:41 +01:00
Urban Rotnik	b8bf7bbd9b	Rename validation	2019-11-18 11:11:40 +01:00
Urban Rotnik	d5716c4260	Add rake task for fixing invalid canvas positions	2019-11-18 11:11:40 +01:00
Urban Rotnik	43e3763ec8	Update x, y, experiment unqiue validation ... [SCI-3887]	2019-11-18 11:11:40 +01:00
Urban Rotnik	8b5e346770	Remove file deletion manually	2019-11-18 11:11:39 +01:00
Urban Rotnik	cc9d987321	Add update result(file) and create result(file) API endpoint	2019-11-18 11:11:38 +01:00
Urban Rotnik	060125a1c4	Add file size validation	2019-11-18 11:11:38 +01:00
Urban Rotnik	1be88baab1	Add API endpoint for Attachments resource	2019-11-18 11:11:38 +01:00
Urban Rotnik	e7083e188c	Add API endpoint for Step resource ... [SCI-3835]	2019-11-18 11:11:37 +01:00
Urban Rotnik	24033bec7a	Add API endpoint for Task creation	2019-11-18 11:11:37 +01:00
Urban Rotnik	7802d5ee8b	Add uniq validation for x and y position scoped to experiment	2019-11-18 11:11:36 +01:00
aignatov-bio	b9a34fa809	Fix placeholder for authors	2019-11-15 16:23:48 +01:00
aignatov-bio	1488f75e26	Add activities	2019-11-13 13:57:04 +01:00
Oleksii Kriuchykhin	9d2ac4179e	Fix failing tests [SCI-3908]	2019-10-04 13:02:18 +02:00
Oleksii Kriuchykhin	0475394b08	Fix test [SCI-3881]	2019-09-16 13:03:41 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin	bc38c6b29e	Fix failing test [SCI-3745]	2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin	c068901b00	Upgrade Rails to 6.0 [SCI-3745]	2019-09-12 17:24:08 +02:00
aignatov-bio	1f12a63a25	Fix counter on task inventory and failing test (#2043)	2019-09-10 13:51:37 +02:00
Luka Murn	bff4029e8d	Minor typo fix in tests	2019-09-05 11:13:01 +02:00
Oleksii Kriuchykhin	267c53c2d2	Refactor inventory sharing logic [SCI-3803]	2019-08-29 17:21:49 +02:00
aignatov-bio	0810699770	Update shared inventory permissions [SCI-3802] (#2009) ... * Update shared inventory permissions * Fix tests and simplify condition for placeholder	2019-08-23 10:57:02 +02:00
Luka Murn	9ad2490285	Remove the deprecated archive endpoint controller rspec test	2019-08-21 16:00:04 +02:00
aignatov-bio	f94b8165dc	Fix marvinjs edit button and icon (#1985)	2019-08-21 11:15:57 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
Urban Rotnik	0ce331227c	Update permission and model to share repository over all teams	2019-08-13 14:07:24 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56:00 +02:00
Urban Rotnik	786716974b	Add validation for team on TeamRepository	2019-08-09 14:15:50 +02:00
Urban Rotnik	32783576c1	Add controller action 'multiple_update' ... Add controller action, add update permission activity, add JS for handling ajax req	2019-08-09 14:15:50 +02:00
Urban Rotnik	6cbece9f86	Add service for multiple share	2019-08-09 14:15:49 +02:00
Mojca Lorber	c21a648c29	Fix failing tests	2019-08-09 14:13:02 +02:00
Urban Rotnik	171cdb319b	Add ShareInventory activities	2019-08-09 14:13:01 +02:00
Mojca Lorber	b005f90e95	Add tests for permission can_read_repository	2019-08-09 14:13:01 +02:00
Urban Rotnik	1a77702fa7	Add uniq index for Repository and Team in TeamRepositories	2019-08-09 14:13:00 +02:00
Urban Rotnik	5456c1e38a	Add basic controller for TeamRepositories	2019-08-09 14:12:59 +02:00
Urban Rotnik	077369d960	Update permissions for Repositories	2019-08-09 14:12:59 +02:00
Urban Rotnik	f569411bc7	Add TeamRepository model	2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Jure Grabnar	c3fd810691	Remove sample_custom_field factory	2019-08-06 23:30:05 +02:00
Jure Grabnar	f71cabcd60	Fix templates tests	2019-08-05 19:05:15 +02:00
Anton Ignatov	e2e876b2a3	Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests	2019-08-05 13:51:04 +02:00
Jure Grabnar	c63737f750	Add check_pending! call for test migrations ... Close SCI-3567	2019-07-31 14:57:47 +02:00
Anton Ignatov	f35f4886a3	Fix markup	2019-07-29 10:18:34 +02:00
Anton Ignatov	a4b2825258	Fix tests for active storage	2019-07-26 15:58:51 +02:00
Anton Ignatov	618f0cc334	Fix tests for services	2019-07-26 14:16:44 +02:00
Anton Ignatov	84fe10df47	Fix tests for models and tema import/export	2019-07-26 12:40:36 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
Urban Rotnik	795c355f01	Merge pull request #1915 from urbanrotnik/ur-sci-3531-tests-for-step-components ... Add tests for StepComponents [SCI-3531]	2019-07-15 13:25:36 +02:00
Jure Grabnar	20120bf2e6	Add test for empty search key	2019-07-15 08:44:02 +02:00
Jure Grabnar	015dae1a05	Fix old tests	2019-07-15 08:27:34 +02:00
Urban Rotnik	5cf100a787	Show 'published_on' instead of 'created_on' on external_protocols list	2019-07-12 16:56:07 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Jure Grabnar	ed5eb39bb2	Fix tests for GET show on protocols.io	2019-07-10 19:20:40 +02:00
Urban Rotnik	b9bec32316	Add tests for StepComponents	2019-07-10 12:48:08 +02:00
Urban Rotnik	be77746aef	Fix description styling of components	2019-07-09 13:41:51 +02:00
Jure Grabnar	05f2210002	SCI-3650, SCI-3655 Fix empty file name, empty description when… (#1892) ... SCI-3650, SCI-3655 Fix empty file name, empty description when parsing tables	2019-07-09 10:24:03 +02:00
Jure Grabnar	ae7da78bff	Merge pull request #1897 from jbargu/jg_sci_3646 ... [SCI-3646] Add paging functionality to external protocols	2019-07-08 13:06:19 +02:00
Miha Mencin	ab9b7a7429	Merge pull request #1902 from biosistemika/release-1.16.6 ... Merge 'release-1.16.6' into 'master'	2019-07-08 12:49:40 +02:00
aignatov-bio	291563c80e	Fix tests for 1.16.6 release (#1903) ... * Fix tests for 1.16.6 release	2019-07-08 11:09:24 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Jure Grabnar	6e1d4c205c	Add tests for page_id for search service	2019-07-04 16:02:29 +02:00
Jure Grabnar	9f42f6f24b	Fix normalizer tests caused by pagination	2019-07-04 15:45:09 +02:00
Jure Grabnar	20134c9f8a	Features/protocolsio integration (#1893) ... Features/protocolsio integration	2019-07-03 17:32:20 +02:00
Jure Grabnar	8866d98512	Fix empty file name on protocols.io ... Closes SCI-3650	2019-07-03 16:11:51 +02:00
Miha Mencin	b709c0ec3c	fix the normalized protocol fixture	2019-07-03 11:49:01 +02:00
Anton Ignatov	c9ae9f056e	Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration	2019-07-01 10:44:29 +02:00
Anton Ignatov	390002f40f	Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539	2019-07-01 10:12:26 +02:00
Anton Ignatov	6be227b2d3	Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-06-28 10:47:38 +02:00
Jure Grabnar	9be4fc2470	Fix tests	2019-06-28 02:19:06 +02:00
Urban Rotnik	9cb4454537	New implementation for attachments creation	2019-06-27 17:02:06 +02:00
Jure Grabnar	82fb8ebd2e	Implement protocols.io error handling (#1869) ... Implement protocols.io error handling	2019-06-27 16:35:55 +02:00
Jure Grabnar	7fc1243e48	Add ProtocolNormalizer errors tests	2019-06-27 14:59:03 +02:00
Jure Grabnar	06b8d1fda7	Update ApiClient tests ... Closes SCI-3434	2019-06-27 14:54:19 +02:00
Mojca Lorber	9fd83d54a0	Put network error handeling into api and refactor errors	2019-06-26 14:04:03 +02:00
aignatov-bio	83bc9eb22f	Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation ... Adding new activities for image editing [SCI-3369]	2019-06-24 10:31:39 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Anton Ignatov	6530786f17	Fix tests	2019-06-20 16:05:19 +02:00
aignatov-bio	a00ec02983	Add tests for edit WOPI activities [SCI-3238] (#1822) ... * Add tests for edit wopi activities	2019-06-20 09:31:29 +02:00
Anton Ignatov	6f1f6e297c	Fix tests	2019-06-19 15:40:27 +02:00
Urban Rotnik	bf6041e13d	Update sanitization of html descriptions	2019-06-19 11:05:22 +02:00
Urban Rotnik	7e69375016	Drop header column and row when extract tables	2019-06-19 10:47:38 +02:00
Urban Rotnik	2a579f2240	Add Warnings, Before start and Guidelinese to protocol description	2019-06-19 09:02:42 +02:00
Mojca Lorber	ebcaa4b014	Implement protocols.io error handling for api client and normalizer	2019-06-18 14:01:57 +02:00
Urban Rotnik	c691ad80b5	Add fields to query params for ApiClient	2019-06-17 12:24:16 +02:00
Urban Rotnik	88d96c0938	Use service in controller	2019-06-17 12:24:15 +02:00
Urban Rotnik	7fad5fc594	Add search service and normalizer for list	2019-06-17 12:24:15 +02:00
Jure Grabnar	4f6397b5b9	Add form to external_sources#new action ... Closes SCI-3532	2019-06-17 12:24:15 +02:00
Jure Grabnar	c8b8bcffdb	Add external_protocols#show action	2019-06-17 12:24:14 +02:00
Jure Grabnar	f7c6f78925	Add external_protocols#index action	2019-06-17 12:24:14 +02:00
Jure Grabnar	2a61075156	Add ExternalProtocols#create action and tests	2019-06-17 12:24:14 +02:00
Jure Grabnar	9baa66c998	Refactor OnlineSources -> ExternalProtocols	2019-06-17 12:24:13 +02:00
Jure Grabnar	eb0d677a36	Refactor pio_protocol -> built_protocol	2019-06-17 12:24:13 +02:00
Jure Grabnar	94e7fe1e6c	OnlineSourcesController skeleton and #new action tested	2019-06-17 12:24:13 +02:00
Urban Rotnik	0d43ecdfab	Import protocol service after object is built	2019-06-17 12:24:11 +02:00
Jure Grabnar	eb275c4d12	Add tests for BuildProtocolService and fix bugs	2019-06-17 12:24:11 +02:00
Jure Grabnar	362b0cd45d	Hound fixes	2019-06-17 12:24:11 +02:00
Jure Grabnar	640f6c1211	Fix tests after BuildProtocolFromClientService refactor ... Closes SCI-3544	2019-06-17 12:24:11 +02:00
Jure Grabnar	1e8627c450	Refactor ImportProtocol service to BuildProtocolService ... Closes SCI-3544	2019-06-17 12:24:10 +02:00
Urban Rotnik	92c24451d9	Moved normalized_single_protocol.json	2019-06-17 12:24:10 +02:00
Urban Rotnik	a15596a126	Add ImportProtocolService	2019-06-17 12:24:10 +02:00
Urban Rotnik	2bb4f558b7	View rendering simplified, small improvements	2019-06-17 12:24:09 +02:00
Urban Rotnik	807104035c	Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated	2019-06-17 12:24:09 +02:00
Urban Rotnik	6a4deb0201	Add ProtocolIntermediateObject	2019-06-17 12:24:09 +02:00
Urban Rotnik	aadf2eecb4	Basic data normalizer for ProtocolIO	2019-06-17 12:24:08 +02:00
Urban Rotnik	ec49388283	Add protocol base normalizer class	2019-06-17 12:24:08 +02:00
Jure Grabnar	c1cee07a63	Extract API client constants to constants.rb	2019-06-17 12:24:08 +02:00
Jure Grabnar	5685709f48	Implement API client for protocols.io ... Closes SCI-3357	2019-06-17 12:24:07 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
Oleksii Kriuchykhin	109793c7fb	Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539]	2019-06-13 12:10:44 +02:00
Urban Rotnik	bbe0062bfd	Small fixes for factories	2019-06-10 12:24:05 +02:00
Urban Rotnik	1bae169ab0	Delete duplicaed user_project factory	2019-06-10 12:24:05 +02:00
Urban Rotnik	965b7eb58b	Add missing factories	2019-06-10 12:24:04 +02:00
Urban Rotnik	f19eeba8dc	Add factory valid check for User's associations	2019-06-10 12:24:04 +02:00
Urban Rotnik	ba340f7bee	Add valid factory check for Table, Tag, Team	2019-06-10 12:24:03 +02:00
Urban Rotnik	9348886fb1	Minior changes in SystemNotifications tests	2019-06-10 12:24:03 +02:00
Urban Rotnik	15cbd8864c	Add valid factory check to Steps models	2019-06-10 12:24:03 +02:00
Urban Rotnik	1e60102a7d	Add valid factory check for Sample(s) models	2019-06-10 12:24:02 +02:00
Urban Rotnik	c66aa29227	Add valid factory check for Result(s) models	2019-06-10 12:24:02 +02:00
Urban Rotnik	3adf2bb736	Add factories and validation tests for repositories and related models ... Repositories, cells, columns, values (date, text, asset, list), rows, items	2019-06-10 12:24:02 +02:00
Urban Rotnik	a7558d83be	Add valid factory check for Project, MyModules, notification, protocol	2019-06-10 12:24:01 +02:00
Urban Rotnik	3348b81b14	Checklist, checklist_item, activity, experiment spec and factories updated	2019-06-10 12:24:01 +02:00
Urban Rotnik	6321c0f5c0	Assets spec and factories updated	2019-06-10 12:24:01 +02:00
Alex Kriuchykhin	36255f82ed	Merge pull request #1817 from okriuchykhin/ok_SCI_3522 ... Add system notifications service to health check endpoint [SCI-3522]	2019-06-04 14:41:43 +02:00
Oleksii Kriuchykhin	2842ea381e	Fix tests for health check endpoint [SCI-3522]	2019-05-31 16:48:10 +02:00
Luka Murn	98234287f5	Fix failing permission_eval_spec test	2019-05-31 10:33:55 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
Oleksii Kriuchykhin	0fd7a4e8f1	Fix failing tests [SCI-3412]	2019-05-27 17:32:21 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Alex Kriuchykhin	2a7f70929a	Merge pull request #1717 from okriuchykhin/ok_SCI_3368 ... Improve clean up of Export All files [SCI-3368]	2019-05-09 13:37:56 +02:00
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
Urban Rotnik	62bc0520e9	Update method last_sync_timestamp from Last to First user	2019-05-08 08:38:11 +02:00
Urban Rotnik	2364c2653f	Add bulk insert for UserSystemNotifications, New service for sending emails	2019-05-08 08:38:10 +02:00
Oleksii Kriuchykhin	84712de9ca	Fix failing tests [SCI-3368]	2019-05-07 16:42:06 +02:00
Anton Ignatov	d36160386f	Merge branch 'master' into master-with-note-section	2019-05-07 13:26:55 +02:00
Anton Ignatov	88e67a16c2	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
Oleksii Kriuchykhin	4522e6bf06	Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]	2019-04-30 17:04:48 +02:00
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
aignatov-bio	687b53feb1	Add new tag activtiies [SCI-3341] (#1712) ... * Add new tag activtiies	2019-04-30 10:23:09 +02:00
Anton Ignatov	c1214c84f5	Fix factories markup	2019-04-28 19:52:30 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	fe620c4a63	Add marvin model and controller	2019-04-26 22:59:38 +02:00
Mojca Lorber	9e04eb8ea1	Fixes upon Urbans request	2019-04-26 11:34:53 +02:00
Oleksii Kriuchykhin	260782e233	Update tests for new rich text enabled fileds [SCI-3264]	2019-04-24 13:45:29 +02:00
Oleksii Kriuchykhin	7c91b4a255	Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266	2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin	c7a707f9db	Fix task clonning with TinyMCE images [SCI-3266]	2019-04-23 15:16:40 +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	6ac620feb3	Migration for old tinymce assets [SCI-3176] (#1663) ... * adding rake task * Addign test for update images * Adding tests for tiny mce model	2019-04-19 15:24:54 +02:00
aignatov-bio	a75c4c2f91	Update Result API for new tiny mce image format (#1674)	2019-04-19 14:44:16 +02:00
Mojca Lorber	208b7c9939	Fix hound	2019-04-19 13:56:21 +02:00
Mojca Lorber	36e7cfe5c4	Change failing tests	2019-04-19 13:37:52 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin	96cf7b4de2	Fix failing tests [SCI-3177]	2019-04-17 12:58:47 +02:00
Urban Rotnik	22af36dd2d	Fix for exports_left, fix for some edge cases	2019-04-16 09:59:02 +02:00
Urban Rotnik	caccf8d9f0	Reset counter for export in last 24 hours ... Fix for check if user has avaiable exports, bit refactored increas_counter method.	2019-04-10 10:56:33 +02:00
Anton Ignatov	94efd2e649	Fix tests	2019-04-02 16:04:50 +02:00
Urban Rotnik	86ddbc68b6	fixup! Show date actual value without link	2019-04-02 14:21:06 +02:00
Anton Ignatov	c9f9523210	Remove src when save description and rename token tag	2019-04-02 13:41:32 +02:00
Urban Rotnik	8eaeeee9f8	Show date actual value without link	2019-04-02 13:15:34 +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
Urban Rotnik	b91f08fe99	Add activity for copying Inventory and Invetory item	2019-04-01 15:40:00 +02:00
Jure Grabnar	e165459ef5	Merge pull request #1574 from jbargu/jg_sci_3149_3163 ... Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]	2019-04-01 14:32:54 +02:00
Jure Grabnar	ebc2d8ee75	Fix experiment_spec test using the old variable ... Closes SCI-3244	2019-04-01 12:50:35 +02:00
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Jure Grabnar	f3e6a35121	Update PermissionEval tests with team check	2019-03-21 10:45:21 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Anton Ignatov	5d6f009ee8	fix error for delay deleting	2019-03-20 15:20:31 +01:00
Anton Ignatov	55c93922ea	markup fixes	2019-03-20 14:46:54 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Jure Grabnar	5de51f9c58	Prevent smart annotations accessing other teams when importing protocol ... Closes SCI-3163	2019-03-20 12:58:22 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Mojca Lorber	7757096693	Results activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	1418abc8d7	Reports activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	d1e38e5bc9	Project activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	70eebca5ee	experiment activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +01:00
Urban Rotnik	c65d1af18d	Fix failing tests	2019-03-13 09:53:34 +01:00
Urban Rotnik	b6a8556601	Add activities for exporting Projects, Inventory items	2019-03-12 09:15:06 +01:00
Urban Rotnik	e7b57aa4f7	Add creating activities for Team actions	2019-03-12 09:15:06 +01:00
Urban Rotnik	3f18166320	Add Task and TaskTags activities	2019-03-12 09:15:06 +01:00
Urban Rotnik	7a05e817ef	Add new Protocol steps activities	2019-03-12 09:15:06 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Urban Rotnik	cfe2888bea	Repository columns actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	2a7bbac733	Repository actions logging	2019-03-12 09:11:00 +01:00
Urban Rotnik	976831e7d3	Edit and Archive experiment activity logging	2019-03-12 09:11:00 +01:00
Urban Rotnik	b8e84b5685	Add logic for saving message items values and types	2019-03-11 08:37:22 +01:00
Urban Rotnik	9ed3313f0f	Create project activity refactored	2019-03-11 08:36:15 +01:00
Urban Rotnik	117944117b	Add service for activity creation	2019-03-11 08:36:15 +01:00
Miha Mencin	51b3aea49a	added uniquness validator and index on user_projects and user_teams relations ... finxing typo, fixied failing test fixing mistakenly commited file fixing schema to include bigint migration	2019-02-27 15:09:47 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +01:00
Urban Rotnik	5b5c6c7122	Changes to Activity model	2019-02-25 16:49:55 +01:00
Miha Mencin	bcd0b433b6	Merge pull request #1514 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-21 16:38:58 +01:00
aignatov-bio	5f78d83f9c	Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) ... * fix dropdown apperance * Remove search and fix duplicate bug * Fix specs for new method	2019-02-21 16:15:13 +01:00
aignatov-bio	5fdba554d2	Merge pull request #1510 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-20 17:22:57 +01:00
Urban Rotnik	82ea31e275	Add validation limits for system notification fields	2019-02-20 16:05:15 +01:00
Urban Rotnik	7b6c6c414d	Merge branch 'master' into features/templates	2019-02-19 14:46:15 +01:00
aignatov-bio	fcdb4e7a92	Merge pull request #1500 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-19 13:51:18 +01:00
Urban Rotnik	f7c7335bf0	Change test to pass on Travis	2019-02-19 11:23:01 +01:00
Urban Rotnik	f63eaaefe7	Add user_system_notification records when syncing notifications, update email sending	2019-02-19 11:22:58 +01:00
Urban Rotnik	29d77ca81d	Add system_notification sending email feature	2019-02-19 11:20:25 +01:00
aignatov-bio	8e905b67b2	System notification navbar menu drop down [SCI 2955] (#1498) ... * Add dropdown menu and icon for system notifications * Finish system notification dropdown menu and add tests	2019-02-19 11:08:59 +01:00
Alex Kriuchykhin	185e3b4832	Merge pull request #1495 from okriuchykhin/ok_SCI_3039 ... Create templates project when syncing templates if team doesn't have it [SCI-3039]	2019-02-14 17:40:01 +01:00
Urban Rotnik	5b55860dea	Add scheduler	2019-02-13 15:48:15 +01:00
Urban Rotnik	9f3187abdf	Add service for sync system notifications	2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin	da30d187a6	Create templates project when syncing templates if team doesn't have it [SCI-3039]	2019-02-13 15:17:33 +01:00
mlorb	71e4cc4dbd	Merge branch 'master' into ml-sci-2940	2019-02-13 14:35:03 +01:00