258 commits

Author	SHA1	Message	Date
Martin Artnik	67f4e81a3a	Merge branch 'develop' into features/new_permissions	2021-07-28 15:16:47 +02:00
artoscinote	888131a465	Merge branch 'features/bioeddie-integration' into ma_SCI_5879	2021-07-20 09:48:13 +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
Martin Artnik	96a5b97bdb	Implement Save & Register molecule [SCI-5879]	2021-07-15 12:37:04 +02:00
Oleksii Kriuchykhin	549fc8e5a0	Fix repository cell joining and preloading [SCI-5847]	2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin	d1208bad0b	Merge branch 'develop' into features/new_permissions	2021-07-07 13:44:36 +02:00
zmagoD	a678f07b47	update extends and remove format from links	2021-06-27 09:45:32 +02:00
Oleksii Kriuchykhin	bb458abec6	Remove old reports code [SCI-5650]	2021-06-18 10:40:00 +02:00
Miha Mencin	46e2adf2e3	Merge pull request #3334 from okriuchykhin/ok_SCI_5730 ... Improve filtering for inventories [SCI-5730]	2021-06-09 09:50:56 +02:00
Oleksii Kriuchykhin	16bad9eb9c	Fix export all functionality [SCI-5776]	2021-06-08 14:21:34 +02:00
zmagoD	67cf09e030	log activities on experiment and my_module assignment change	2021-05-22 13:59:27 +02:00
Oleksii Kriuchykhin	29c83ffbb1	Merge branch 'develop' into features/new-reports	2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin	0ff1277dbf	Improve filtering for inventories [SCI-5730]	2021-05-19 22:48:52 +02:00
Miha Mencin	d952edd389	Merge pull request #3316 from okriuchykhin/ok_SCI_5702 ... Add generation error states to reports [SCI-5702]	2021-05-17 10:16:06 +02:00
Alex Kriuchykhin	34c79d66b8	Merge pull request #3278 from okriuchykhin/ok_SCI_5664 ... Add report templates loader and move out templates from the main source tree [SCI-5664]	2021-05-13 15:51:24 +02:00
Oleksii Kriuchykhin	a175e83a16	Add generation error states to reports [SCI-5702]	2021-05-11 14:52:02 +02:00
aignatov-bio	bb5f985630	Add new activities to reports [SCI-5638]	2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin	96f85aeb3c	Add report templates loader and move out templates from the main source tree [SCI-5664]	2021-05-06 11:27:05 +02:00
aignatov-bio	689967f82c	Add Scinote Report Template [SCI-5686]	2021-05-05 15:13:06 +02:00
aignatov-bio	86854b015d	Add third template to reports [SCI-5618]	2021-04-29 15:21:58 +02:00
aignatov-bio	6b023603f9	Add second template for reports [SCI-5617] (#3268)	2021-04-29 10:42:17 +02:00
Oleksii Kriuchykhin	a9ac8452f2	Add dynamic form elements in report wizard step 1 [SCI-5591]	2021-04-06 13:56:24 +02:00
miha	a82479cd49	unfreeze extents	2021-03-29 11:31:04 +02:00
miha	e20191a865	fix code style 2	2021-03-29 11:13:32 +02:00
miha	11284d3b87	[SCI-5577] filter notifications	2021-03-29 09:52:57 +02:00
Mojca Lorber	c58d5734ad	Implement the option of deleting empty folders [SCI-5311]	2021-01-21 19:42:25 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
Urban Rotnik	7773afbcdb	Add activities for Project Folders [SCI-5181]	2020-12-04 12:03:49 +01:00
aignatov-bio	56a58e08eb	Fix markup	2020-11-23 14:22:10 +01:00
aignatov-bio	deaecf57c9	Add activity for project moving	2020-11-16 12:21:03 +01:00
Urban Rotnik	e923128c0e	Merge pull request #2927 from biosistemika/features/signature-requests ... Features/signature requests into develop	2020-10-29 14:48:25 +01:00
aignatov-bio	111a5338af	Merge pull request #2895 from aignatov-bio/ai-sci-5031-refactor-export-all-method ... Refactor export all my module generator [SCI-5031]	2020-10-29 13:05:34 +01:00
aignatov-bio	3b0f35aef3	Fix markup	2020-10-22 14:33:17 +02:00
aignatov-bio	f4bf2ab75f	Remove empty children from extents	2020-10-22 14:29:35 +02:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
aignatov-bio	bdcc7939ad	Update export all generator	2020-10-16 18:25:01 +02:00
Urban Rotnik	dac8dda6bc	Update comment	2020-10-14 14:54:29 +02:00
aignatov-bio	36bab10de7	Update export all to tree structure	2020-10-14 12:08:04 +02:00
aignatov-bio	a7da7b0de3	Refactor export all my module generator	2020-10-12 15:55:06 +02:00
aignatov-bio	5d6c9e78fd	Refactor dashboard layout	2020-10-06 16:09:26 +02:00
aignatov-bio	6ed8757eb1	Merge branch 'features/task-flows' into develop	2020-09-17 14:52:05 +02:00
Oleksii Kriuchykhin	db3de835f8	Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]	2020-09-15 11:58:35 +02:00
Oleksii Kriuchykhin	73cf620960	Add Completion and Uncompletion consequences [SCI-5004]	2020-09-14 20:06:48 +02:00
Urban Rotnik	581cd69963	Add activities for status change	2020-09-01 11:48:04 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
Urban Rotnik	a5fb873d19	Add default workflow	2020-08-27 10:54:39 +02:00
Oleksii Kriuchykhin	ce8d12e1c4	Create new activities for exporting assigned items (live & snapshots) [SCI-4881]	2020-08-05 09:59:58 +02:00
Urban Rotnik	9bcf1a5df5	Add blacklist for dashboard activities	2020-07-23 14:22:58 +02:00
Oleksii Kriuchykhin	7ea577d8d4	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
Mojca Lorber	8d9d3778e1	Fix activities filters	2020-06-19 10:46:58 +02:00
Mojca Lorber	6e8062179c	Implement archiving and restoring of whole inventories	2020-06-18 18:07:23 +02:00
Urban Rotnik	39eb8145c2	Rename params method	2020-06-11 16:11:23 +02:00
Urban Rotnik	26db4f3515	Add Archive and Restore service	2020-06-09 18:50:36 +02:00
mlorb	26bdabb0c3	Merge pull request #2609 from mlorb/ml-sci-4529 ... Add rename task and rename experiment activities [SCI-4529]	2020-06-01 12:58:36 +02:00
Urban Rotnik	fcd3efe07e	Fix constantizing for repository	2020-05-27 09:19:11 +02:00
Mojca Lorber	9b7d321666	Add rename task and rename experiment activities	2020-05-26 15:34:20 +02:00
Oleksii Kriuchykhin	3a67c99982	Switch to STI for repositories, fix cell values snapshotting [SCI-4516]	2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin	3c53be1f9a	Add start date to the task [SCI-4504]	2020-03-31 14:17:14 +02:00
Oleksii Kriuchykhin	57e7ab8c1c	Fix empty number column data_type in API [SCI-4454]	2020-03-12 12:04:29 +01:00
Oleksii Kriuchykhin	9d0d75acc5	Add API endpoints for new column types [SCI-4276]	2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin	0fec8f4d95	Improve speed of inventory import [SCI-4336]	2020-02-11 13:51:34 +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	6f8f89fbf0	Improve speed of global activities fetching query [SCI-4330]	2020-02-07 13:53:25 +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
Urban Rotnik	ec8af5f943	Add readonly repository rows records	2020-01-24 16:33:44 +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	7b82e33eb6	Fix repository filtering and improve speed [SCI-4224]	2020-01-13 16:09:07 +01:00
Oleksii Kriuchykhin	ad5a5f3ebf	Fix sorting for date time columns [SCI-4197]	2020-01-09 16:18:28 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
Urban Rotnik	c15bcf0769	Add search support for numeric	2020-01-06 10:12:11 +01:00
Urban Rotnik	87288d0771	Add search for statuses	2020-01-06 10:12:08 +01:00
aignatov-bio	dc91893d7e	Refactor checklist column data structure	2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
Mojca Lorber	8503dd7007	Add numeric repository column type	2019-12-09 16:38:21 +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
Urban Rotnik	f39af1916f	Split DateTime and DateTimeRange column types, rename DateType table	2019-11-29 10:19:16 +01:00
Urban Rotnik	b591346a3f	Add DateTime type column	2019-11-29 10:19:13 +01:00
Urban Rotnik	1e8261ac2a	Update InventoryColumns API for new Status Type	2019-11-29 10:19:07 +01:00
Urban Rotnik	c00a837105	Add models for RepositoryStatus column type	2019-11-29 10:16:43 +01:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
Anton Ignatov	fc70ce24f8	Refactor side filters for global activities	2019-11-18 13:59:54 +01:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin	267c53c2d2	Refactor inventory sharing logic [SCI-3803]	2019-08-29 17:21:49 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
Miha Mencin	d1ecdedd59	SCI-3768 remove .freeze from multiple constants	2019-08-12 22:31:47 +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	171cdb319b	Add ShareInventory activities	2019-08-09 14:13:01 +02:00
Urban Rotnik	f569411bc7	Add TeamRepository model	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
Luka Murn	0e71351473	Remove unnecesary report element checks in extends.rb	2019-07-26 10:34:30 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +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
Anton Ignatov	a843a016a0	Fix markup and naming	2019-06-19 15:19:47 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
aignatov-bio	d3aa6371cd	Fix report saving [SCI-3443] (#1753) ... * Fix report saving * Fix the report saving by using the reports' structures * Remove uneccesary yarn.lock (mistake)	2019-05-13 10:55:08 +02:00
aignatov-bio	0b194eb3b1	Revert "Fix report saving (#1748)" (#1752) ... This reverts commit 3db6129808.	2019-05-13 09:09:36 +02:00
aignatov-bio	3db6129808	Fix report saving (#1748)	2019-05-13 08:58:47 +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
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
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
aignatov-bio	7ef7e2397f	Change activity filter order and reduce custom date label size [SCI-3301] (#1651) ... * Change activity filter order and reduce custom date label size * Fix hound	2019-04-09 14:18:22 +02:00
Mojca Lorber	501c46bc92	Remove activities that belong to addons	2019-04-05 16:25:22 +02:00
Jure Grabnar	7136294386	Remove archive_task from the list of activity_types ... Closes SCI-3288	2019-04-03 19:13:00 +02:00
Jure Grabnar	22d193114e	Add asset to activity message item type ... Closes SCI-3283	2019-04-02 16:10:20 +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
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
aignatov-bio	5c8f976ad1	Adding missed project comment activities [SCI-3250] (#1612) ... * Adding missed project comment activities * Fix markup	2019-03-29 11:45:31 +01:00
aignatov-bio	b51dcc9d75	Adding children selector to global activities subjects [SCI-3247] (#1605) ... * Adding children selector to global activities subjects * Fix naming, add seperate check for project id	2019-03-29 09:26:27 +01:00
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
aignatov-bio	54fd3a748b	Adding activity groups [SCI-3203] (#1588) ... * Adding activty groups	2019-03-26 15:29:21 +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	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Mojca Lorber	1418abc8d7	Reports 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	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	1a3c97b978	Add new enum values for Activity type_of	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
Oleksii Kriuchykhin	74a60d443d	Merge branch 'features/global-activities' into ok_SCI_3014_v2	2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Urban Rotnik	863e3873c2	Comment for depricated NotificationType	2019-01-29 11:40:26 +01:00
Oleksii Kriuchykhin	ed46115b3f	Implement inventory column data type name mappings [SCI-2772]	2018-10-16 15:35:02 +02:00
Luka Murn	7b5a65416a	Update status endpoint	2018-10-06 11:47:23 +02:00
Oleksii Kriuchykhin	0e372af729	Adds API authentication with Azure AD [SCI-2608]	2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
Oleksii Kriuchykhin	e42fc3117b	Implement search in file repository cells and improve performance [SCI-2111]	2018-03-26 13:19:09 +02:00
zmagod	dd2f7dd417	Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration	2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin	be1ead22e0	Implement importable selector for repository columns [SCI-2078]	2018-03-13 11:36:05 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
Oleksii Kriuchykhin	1765d83cd1	Refactor search to support repository list items [SCI-2108]	2018-03-09 11:05:43 +01:00
mlorb	5e44859ce0	Merge pull request #1010 from mlorb/ml-sci-1826 ... Sign up with linkedIn account [SCI-1826]	2018-03-05 13:24:36 +01:00
Luka Murn	070450f813	Merge branch 'release-1.12.11' ... Conflicts: config/initializers/extends.rb	2018-03-01 14:04:57 +01:00
mlorb	9199f287ba	fix hound	2018-03-01 09:18:36 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
Oleksii Kriuchykhin	aa933ad1f4	Add extendable file types mappings for icons [PIP-46]	2018-02-26 14:23:02 +01:00
zmagod	6b7ff11bcf	setup models for repository list column [fixes SCI-2015]	2018-02-07 15:28:28 +01:00
Oleksii Kriuchykhin	d1a515da90	Allow first user seeding from env variables [SCI-1949]	2018-01-18 16:23:33 +01:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
Luka Murn	e0828657b3	Somebody kill the Hound please	2017-06-08 11:23:24 +02:00
Luka Murn	9bfbf3b634	Minor fix #2	2017-06-08 11:22:27 +02:00
Luka Murn	b729c06f31	Minor fix	2017-06-08 11:20:11 +02:00
Luka Murn	02dd6636ba	Allow saving & editing of reports with repository elements ... Closes SCI-1279.	2017-06-07 16:55:00 +02:00