523 commits

Author	SHA1	Message	Date
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
Urban Rotnik	bcce8235cc	Add rescue block for setting default repository state	2020-01-14 23:49:02 +01:00
Oleksii Kriuchykhin	eed68a2590	Refactor repository cell clonning to support all data types [SCI-4204]	2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin	01b8d2226d	Optimize repository table counters [SCI-4224]	2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin	7b82e33eb6	Fix repository filtering and improve speed [SCI-4224]	2020-01-13 16:09:07 +01:00
Urban Rotnik	9296f0eb4f	Add extra format for exports	2020-01-10 11:09:30 +01:00
Oleksii Kriuchykhin	2faab14444	Fix repository table state updates after column creation/deletion [SCI-4196]	2020-01-08 16:16:54 +01:00
Oleksii Kriuchykhin	522ae12f08	Merge branch 'develop' into ok_SCI_3988	2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
Alex Kriuchykhin	1e665804ab	Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export ... Add new column types to team export/import [SCI-4155]	2020-01-07 15:47:09 +01:00
Oleksii Kriuchykhin	1b902ff4b3	Merge branch 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin	4df8779b19	Fix experiment template exporter [SCI-3988]	2020-01-07 15:26:21 +01:00
aignatov-bio	a69e587706	Change cells loading in report repository helper	2020-01-07 14:21:55 +01:00
aignatov-bio	10b7aad732	Add ned column types to team export/import	2020-01-07 14:12:48 +01:00
aignatov-bio	4895f41238	Add helper for repository tables in docx report	2020-01-06 12:40:09 +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
aignatov-bio	210292de07	Leave string_agg only for checklists	2019-12-23 21:36:56 +01:00
Urban Rotnik	c286334c1d	UpdateRepositoryRowService fix	2019-12-23 14:53:51 +01:00
aignatov-bio	725bb449d5	Fix naming	2019-12-23 09:20:36 +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
aignatov-bio	16c4879e56	Merge migrations and update sorting	2019-12-20 15:42:54 +01:00
Alex Kriuchykhin	0566b17d50	Merge pull request #2272 from okriuchykhin/ok_SCI_4166 ... Add view/edit renderers for numeric data type [SCI-4166]	2019-12-19 11:57:13 +01:00
aignatov-bio	dc91893d7e	Refactor checklist column data structure	2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin	e24bc2775a	Add view/edit renderers for numeric data type [SCI-4166]	2019-12-18 11:55:12 +01:00
Urban Rotnik	7153711570	Move delimiter from column to metadata	2019-12-18 10:22:52 +01:00
aignatov-bio	7664f4be78	Add checklist and list edit mode	2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
Urban Rotnik	d35f7119b7	Moved delete action to service	2019-12-10 14:29:37 +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
aignatov-bio	09079fbcda	Fix naming and tests	2019-12-09 13:48:36 +01:00
aignatov-bio	d8676596f1	Add checklists column type	2019-12-09 13:48:36 +01:00
Oleksii Kriuchykhin	03667f619f	Merge branch 'release-1-17-7' into develop	2019-12-05 13:03:39 +01:00
Miha Mencin	80579043b2	Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7	2019-12-03 09:10:09 +01:00
Alex Kriuchykhin	fbf1a5b6e2	Merge pull request #2239 from okriuchykhin/ok_SCI_4098 ... Refactor Azure configuration and connected accounts [SCI-4098]	2019-11-29 11:30:33 +01:00
Urban Rotnik	f39af1916f	Split DateTime and DateTimeRange column types, rename DateType table	2019-11-29 10:19:16 +01:00
Urban Rotnik	9bf948c3a8	Add statuses validation on FE	2019-11-29 10:19:11 +01:00
Urban Rotnik	b2ce600820	Add delimiter column for repository_column	2019-11-29 10:19:10 +01:00
Urban Rotnik	b2b6296cb5	Improve update items action, JS and views	2019-11-29 10:19:10 +01:00
Urban Rotnik	804e36650e	Add service for updating ListColumnItems	2019-11-29 10:19:09 +01:00
Oleksii Kriuchykhin	3481b50796	Fix column reordering for repositories [SCI-4070]	2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin	73be1181ac	Fix failing tests for repository states [SCI-4070]	2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin	338b710d81	Refactor inventory edit mode [SCI-4070]	2019-11-29 10:19:05 +01:00
Urban Rotnik	f645ff52ab	Refactor ColumnServices	2019-11-29 10:17:52 +01:00
Urban Rotnik	1720623665	Refactor RepositoryListColumn controller	2019-11-29 10:17:50 +01:00
Urban Rotnik	43e81c46b7	Rename CreateColumnService to ColumnService	2019-11-29 10:16:46 +01:00
Urban Rotnik	b55966487e	Remove permission helper	2019-11-29 10:16:46 +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
Mojca Lorber	dda5ffe4f9	Add create repository column service	2019-11-29 10:16:43 +01:00
aignatov-bio	3d9351c537	Update filter logic for activities	2019-11-27 13:13:19 +01:00
Oleksii Kriuchykhin	6b20a10473	Refactor Azure configuration [SCI-4098]	2019-11-26 15:09:40 +01:00
Miha Mencin	72c158d3e2	SCI-4108 check if there are any checklist items before rendering the checklist	2019-11-25 11:55:02 +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
Alex Kriuchykhin	8b665d4f1c	Merge pull request #2193 from okriuchykhin/ok_SCI_4028 ... Fix reports in team importer [SCI-4028]	2019-11-13 13:10:15 +01:00
aignatov-bio	e4a39bbbe4	Add check for files	2019-11-06 14:41:51 +01:00
aignatov-bio	b56a997aef	Fix team import for user with avatars	2019-11-04 14:53:59 +01:00
Oleksii Kriuchykhin	1e748f2d7e	Fix reports in team importer [SCI-4028]	2019-10-30 15:47:11 +01:00
Oleksii Kriuchykhin	6c57f56bf4	Fix issue with empty cells for xlsx inventory imports [SCI-4003]	2019-10-21 12:06:45 +02:00
Miha Mencin	0af8629f98	SCI-3994 fix for excel import	2019-10-17 14:37:11 +02:00
Miha Mencin	c673c3960f	removin uneeded stuff left there by supidity	2019-10-08 17:23:46 +02:00
Miha Mencin	4f290cacfc	remove the unneeded require	2019-10-08 16:22:48 +02:00
Miha Mencin	de89a97e0a	Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export	2019-10-08 16:20:40 +02:00
Miha Mencin	5f16926280	SCI-3976 different approach to file download	2019-10-08 16:20:16 +02:00
Oleksii Kriuchykhin	6908a5c3a3	Fix team deletion script [SCI-3960]	2019-10-08 12:04:47 +02:00
Alex Kriuchykhin	076d61d4d0	Merge pull request #2116 from okriuchykhin/ok_SCI_3908 ... Remove Paperclip from the codebase [SCI-3908]	2019-10-04 14:45:42 +02:00
Oleksii Kriuchykhin	9d2ac4179e	Fix failing tests [SCI-3908]	2019-10-04 13:02:18 +02:00
Urban Rotnik	81d66ceedd	Add CustomDisk Service for ActiveStorage	2019-10-03 13:16:15 +02:00
Oleksii Kriuchykhin	260fcd6e89	Remove Paperclip from codebase [SCI-3908]	2019-10-02 19:45:14 +02:00
Urban Rotnik	e2a779ccfe	Activestorage fix for disk storage ... [SCI-3947]	2019-10-02 14:01:38 +02:00
Anton Ignatov	b382eb607b	Fix docx report for active storage	2019-10-01 10:26:24 +02:00
Anton Ignatov	99005cf22e	Fix tests for repository row importer	2019-09-30 16:27:45 +02:00
aignatov-bio	856e876b61	Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy ... Fix error on task copy [SCI-3900]	2019-09-24 14:16:38 +02:00
Anton Ignatov	646107a35b	Fix error on task copy	2019-09-23 16:33:57 +02:00
Anton Ignatov	09e3b7c80b	Fix repository row import/export	2019-09-23 13:33:02 +02:00
Alex Kriuchykhin	29ffe05442	Merge pull request #1964 from okriuchykhin/ok_SCI_3643 ... Add text extraction from MarvinJS for search [SCI-3643]	2019-09-18 16:22:11 +02:00
Anton Ignatov	b9f6b3a082	Fix error when save report to inventory	2019-09-18 12:50:54 +02:00
Oleksii Kriuchykhin	e12cd0ae9d	Fix autoloading issues [SCI-3881]	2019-09-17 10:50:01 +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
Alex Kriuchykhin	0d6f011e61	Merge pull request #2006 from okriuchykhin/ok_SCI_3765 ... Add path method to custom ActiveStorage S3 service [SCI-3765]	2019-09-12 15:34:03 +02:00
aignatov-bio	a3b2c7d5fe	Fix report image issues [SCI-3772] (#1983) ... * Fix report image issues * Small fixes	2019-09-12 09:02:45 +02:00
aignatov-bio	01d6a17f2b	Fix permission check for inventory (#2039)	2019-09-09 15:11:18 +02:00
aignatov-bio	bc86d5bc40	Fix import items to inventory (#2019)	2019-09-05 08:35:11 +02:00
Oleksii Kriuchykhin	267c53c2d2	Refactor inventory sharing logic [SCI-3803]	2019-08-29 17:21:49 +02:00
aignatov-bio	5bf3a5d418	Fix sharing check in service [SCI-3798] (#2011) ... * Update shared inventory permissions * Fix tests and simplify condition for placeholder * Fix sharing check in service * Fix rebase conflicts	2019-08-26 09:36:41 +02:00
Oleksii Kriuchykhin	2298ba4e4e	Add path method to custom ActiveStorage S3 service [SCI-3765]	2019-08-21 14:33:28 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
aignatov-bio	710af85743	Fix template generating (#1980)	2019-08-14 09:06:12 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56:00 +02:00
Urban Rotnik	7719b825e3	Update wording for sharing activities, rename button, add view-only paragraph	2019-08-09 14:15:51 +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	3c1f28ec06	fix smart annotation permission check	2019-08-09 14:13:03 +02:00
Mojca Lorber	71b881cbdf	fix failing tests	2019-08-09 14:13:03 +02:00
Mojca Lorber	4c7c7ccdf1	Add ability to browse through shared inventories to smart annotations	2019-08-09 14:13:03 +02:00
Mojca Lorber	cac7dab440	Show shared inventories in left navigation and fix read repository permission	2019-08-09 14:13:00 +02:00
Urban Rotnik	077369d960	Update permissions for Repositories	2019-08-09 14:12:59 +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	d52df56fc4	Fix production build and update packages [SCI-3678]	2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	973fc775c0	Enforce file size limits for direct uploads on S3 [SCI-3681]	2019-08-06 17:09:00 +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
Oleksii Kriuchykhin	a2fe4bee94	Add text extraction from MarvinJS for search [SCI-3643]	2019-08-02 15:17:28 +02:00
Anton Ignatov	f35f4886a3	Fix markup	2019-07-29 10:18:34 +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
Anton Ignatov	0702dacc5b	Security fixes	2019-07-19 14:10:38 +02:00
Anton Ignatov	ad7130d3b2	Simplify TinyMCE assets for MarvinJS	2019-07-19 09:27:03 +02:00
Anton Ignatov	bdc2dbbac1	Simplify image creation	2019-07-18 14:29:24 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
Anton Ignatov	3339c1fbbf	Add MarvinJS to Result and TinyMce MarvinJS refactor	2019-07-15 17:17:14 +02:00
Miha Mencin	47d3315d82	SCI-3702 revert the fix and use local variables	2019-07-15 16:20:39 +02:00
Miha Mencin	1c84e46a21	Revert "SCI-3702 replace _to_text with _to_html" ... This reverts commit 93b7c472ac.	2019-07-15 16:18:26 +02:00
Miha Mencin	93b7c472ac	SCI-3702 replace _to_text with _to_html	2019-07-15 16:16:41 +02:00
Jure Grabnar	a372d4056d	Add last_published protocols.io endpoint	2019-07-14 19:24:53 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
Anton Ignatov	7831b0a089	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 15:00:07 +02:00
aignatov-bio	4bae87e3f7	Styling changes in DOCX report [SCI-3633] (#1899) ... * Styling changes in DOCX report * Update result comments in docx report * Fix markup	2019-07-12 13:48:14 +02:00
aignatov-bio	5ca822a7d8	Add archive lables and fix bright colors in RTE fields (#1923)	2019-07-12 11:38:48 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin	64b7a5646a	Implement custom document file previewer [SCI-3677]	2019-07-10 14:37:23 +02:00
Urban Rotnik	cc3cd43270	Log to console when error occur on ProtocolsImport actions	2019-07-09 15:32:43 +02:00
Oleksii Kriuchykhin	a1941a21dc	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
aignatov-bio	c8b0d87054	Fix global links in reports (#1894)	2019-07-09 09:35:43 +02:00
mlorb	7272d838b6	Merge pull request #1875 from mlorb/ml-sci-3618 ... Remove unassign_user_from_project notification…[SCI-3618]	2019-07-08 15:23:06 +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
aignatov-bio	0d1ec0d4ed	Fix I18n and constants in DOCX report (#1901)	2019-07-08 12:51:26 +02:00
Alex Kriuchykhin	82708f0124	Merge pull request #1891 from okriuchykhin/ok_SCI_3654 ... Fix project page view saving [SCI-3654]	2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Jure Grabnar	dc7fee51fa	Add Show more protocols functionality to external protocols ... Closes SCI-3646	2019-07-04 15:35:18 +02:00
Oleksii Kriuchykhin	c0c8e0e1a3	Refactor Experiment workflow images [SCI-3539]	2019-07-04 09:33:12 +02:00
Jure Grabnar	20134c9f8a	Features/protocolsio integration (#1893) ... Features/protocolsio integration	2019-07-03 17:32:20 +02:00
Oleksii Kriuchykhin	e16cb513e1	Fix project page view saving [SCI-3654]	2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin	028e647f4d	Upgrade to Rails 5.2.3 [SCI-3651]	2019-07-03 11:15:13 +02:00
Jure Grabnar	4715e8ec4b	Fix building of zero steps protocls ... Close SCI-3648	2019-07-03 09:34:15 +02:00
aignatov-bio	b1a74a893c	Remove strange symbol (#1874)	2019-07-02 11:21:14 +02:00
Mojca Lorber	41935a9471	Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation	2019-07-01 13:44:27 +02:00
Anton Ignatov	1f40fa69fc	Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-07-01 11:51:27 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00
aignatov-bio	2793777463	Features/docx report (#1873) ... * Initial setup for docx report * Add render for project, experiment, my_module * Implement converter for RTE fields * Add all report elements * fix markup * Change headers, remove empty blocks, refactored repository draw * Add smart annotations support * Fix justify fields * Prepare for addons integration * Fix markup * Add comments to GemFile * Fix TinyMCE error * Change UI for new report download selector * Fix file error in inventory cell for docx * Fix i18n object for header	2019-07-01 10:14:16 +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
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Jure Grabnar	bc4b07cc0f	Refactor hardcoded protocol_source in SearchService	2019-06-28 02:26:31 +02:00
Jure Grabnar	0a77cedaf8	Fix sorting of external protocols and start showing results	2019-06-27 22:48:56 +02:00