Commit graph

163 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
308e565d58 Move molecule edited on step activity to Task protocol group [SCI-5999] 2021-08-18 09:54:05 +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
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