Commit graph

1842 commits

Author SHA1 Message Date
ajugo 99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
ajugo ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo 92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
artoscinote 710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596
Don't touch result when comment is created [SCI-7596]
2023-01-04 13:14:07 +01:00
Martin Artnik 7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik 15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
aignatov-bio eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Oleksii Kriuchykhin 72f1cf2704 Fix viewer permissions for inventories [SCI-7422] 2022-12-20 13:26:38 +01:00
Oleksii Kriuchykhin 9900b62e03 Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577] 2022-12-13 16:12:08 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Giga Chubinidze 864e92e03b hound styling fix 2022-12-07 14:36:32 +04:00
Giga Chubinidze 96987977d1 fixed default visible column logic 2022-12-07 14:35:25 +04:00
Martin Artnik df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]""
This reverts commit 50e7531ffa.
2022-12-06 12:43:30 +01:00
ajugo 02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659)
* Implement experiment table sort flyout [SCI-7451]

* Implement archive sort options for experiment table [SCI-7497]

* Fix hound [SCI-7451]

* Clean code for experiment table view sorting [SCI-7497]

* Fix hound [SCI-7451]
2022-12-05 10:30:20 +01:00
Giga Chubinidze 769fe7ebd8 fixed id sorting on reports removed model duplicate code 2022-12-05 13:17:15 +04:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +01:00
ajugo 847280489a
Add report id to the report datatable [SCI-7199] (#4453)
* Add report id to the report datatable [SCI-7199]

* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
Oleksii Kriuchykhin 0d6c6ccd9e Introduce searchability by ID in global search field [SCI-7208] 2022-12-02 11:16:18 +01:00
artoscinote 4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653)
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

* Add readable scope to batch clone action [SCI-7382]

* Move 'Clone' to translations, simplify JS [SCI-7382]
2022-12-01 15:08:59 +01:00
Oleksii Kriuchykhin b032cfbd35 Add task moving action to experiment table view [SCI-7381] 2022-12-01 13:33:07 +01:00
Giga Chubinidze b695903ea4 added frozen string literal 2022-11-30 11:39:28 +04:00
Giga Chubinidze 8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
G-Chubinidze fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-28 15:57:46 +04:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
Alex Kriuchykhin b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
Giga Chubinidze 43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
Alex Kriuchykhin dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo 42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612)
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]

* Fix zebra enabled [SCI-7430]
2022-11-14 10:43:09 +01:00
G-Chubinidze 8e63bfb7c2
Update my_module.rb 2022-11-09 14:46:36 +04:00
G-Chubinidze 996cb68fdd
Update my_module.rb 2022-11-09 14:45:18 +04:00
G-Chubinidze 62b48ee59a
updated my_module rb, added searchable id attribute 2022-11-09 13:36:55 +04:00
Giga Chubinidze 18fe2cd207 update display of the current tasks with IDs [SCI-7205] 2022-11-08 16:06:48 +04:00
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
artoscinote 938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377
Add ENV setting for max step text length [SCI-7377]
2022-10-25 16:04:36 +02:00
Martin Artnik ebe0ffa286 Add ENV setting for max step text length [SCI-7377] 2022-10-25 13:08:33 +02:00
ajugo ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Oleksii Kriuchykhin 7d3f48199a Fix shared repositories migration, update sharing logic and permissions [SCI-7360] 2022-10-21 11:00:52 +02:00
Oleksii Kriuchykhin 94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +02:00
Oleksii Kriuchykhin 5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
Andrej 538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Alex Kriuchykhin 63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Alex Kriuchykhin 51da8edacc
Merge pull request #4533 from okriuchykhin/ok_SCI_7336
Fix project users assignment to newly created experiments [SCI-7336]
2022-10-17 10:15:44 +02:00
Alex Kriuchykhin c725e1f100
Merge pull request #4521 from okriuchykhin/ok_SCI_7325
Fix protocol import in templates [SCI-7325]
2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin a3b8f98b24 Fix project users assignment to newly created experiments [SCI-7336] 2022-10-14 10:23:57 +02:00
Oleksii Kriuchykhin e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Oleksii Kriuchykhin 1bd3a7e783 Fix protocol import in templates [SCI-7325] 2022-10-12 14:27:21 +02:00