73 commits

Author	SHA1	Message	Date
Martin Artnik	7e6ca3be8a	Merge branch 'develop' into features/new_permissions	2021-09-06 10:33:32 +02:00
Martin Artnik	5cc966e11e	Remove delete molecule activities [SCI-5999]	2021-08-16 13:58:54 +02:00
Martin Artnik	56576960b0	Rework molecule registration activities [SCI-5999]	2021-08-13 15:15:45 +02:00
artoscinote	f839cb5256	Merge pull request #3464 from biosistemika/features/bioeddie-integration ... Features/bioeddie integration	2021-08-03 13:32:53 +02:00
Martin Artnik	a82af505eb	Merge branch 'develop' into features/webhooks	2021-08-02 16:22:52 +02:00
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	9bf02a02b9	Copy fix [SCI-5547]	2021-07-19 13:01:55 +02:00
Martin Artnik	96a5b97bdb	Implement Save & Register molecule [SCI-5879]	2021-07-15 12:37:04 +02:00
Oleksii Kriuchykhin	d1208bad0b	Merge branch 'develop' into features/new_permissions	2021-07-07 13:44:36 +02:00
aignatov-bio	3c7592657c	Add activity filters [SCI-5765]	2021-05-31 13:39:10 +02:00
zmagoD	67cf09e030	log activities on experiment and my_module assignment change	2021-05-22 13:59:27 +02:00
aignatov-bio	bb5f985630	Add new activities to reports [SCI-5638]	2021-05-06 14:03:45 +02:00
mlorb	45da42b924	Merge branch 'develop' into ml-sci-5311	2021-02-07 19:20:09 +01:00
Urban Rotnik	ebbbfa657c	Fix folders activities [SCI-5402] [SCI-5403] (#3112) ... * Fix activities and make folders clickable * Remove archive project activity and action * Save nil value for root folder * Add empty values to hash	2021-01-22 11:24:08 +01:00
Mojca Lorber	c58d5734ad	Implement the option of deleting empty folders [SCI-5311]	2021-01-21 19:42:25 +01:00
Urban Rotnik	7773afbcdb	Add activities for Project Folders [SCI-5181]	2020-12-04 12:03:49 +01:00
aignatov-bio	deaecf57c9	Add activity for project moving	2020-11-16 12:21:03 +01:00
Urban Rotnik	581cd69963	Add activities for status change	2020-09-01 11:48:04 +02:00
Oleksii Kriuchykhin	ce8d12e1c4	Create new activities for exporting assigned items (live & snapshots) [SCI-4881]	2020-08-05 09:59: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	26db4f3515	Add Archive and Restore service	2020-06-09 18:50:36 +02:00
Mojca Lorber	9b7d321666	Add rename task and rename experiment activities	2020-05-26 15:34:20 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
Urban Rotnik	8ff7c33431	Fix start date activity message	2020-05-06 12:34:45 +02:00
Urban Rotnik	de4e4ca967	Add before_action for team switch	2020-04-23 16:20:01 +02:00
Oleksii Kriuchykhin	3c53be1f9a	Add start date to the task [SCI-4504]	2020-03-31 14:17:14 +02:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
Anton Ignatov	7117b767f4	Fix commnets to PR	2019-11-18 13:59:54 +01:00
Anton Ignatov	17e457c686	Finished global activities refactoring	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
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +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
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	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +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
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
Anton Ignatov	dd8b3caf65	Fix duplicate activtiy issue and fix link to inventory	2019-04-15 11:35:30 +02:00
aignatov-bio	e2e299b424	Add dynamic generating filters for global activities [SCI-3228] (#1644) ... * Add dynamic generating filters * Add url methods	2019-04-09 09:08:27 +02:00
Mojca Lorber	501c46bc92	Remove activities that belong to addons	2019-04-05 16:25:22 +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
Oleksii Kriuchykhin	d6bd703ec8	Fix activity genereation with discarded inventories [SCI-3290]	2019-04-03 21:18:48 +02:00
Urban Rotnik	1257c8fd80	Fix archive task translation	2019-04-03 11:21:53 +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