Commit graph

1857 commits

Author SHA1 Message Date
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin
f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703
Improve handling of db locks [SCI-7703]
2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin
3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
Martin Artnik
5f7976ce0e Fix copying and pasting TinyMCE images [SCI-7774] 2023-01-17 14:32:25 +01:00
Martin Artnik
76025a4883 Properly assign team to tinymce asset when extracting base64 images [SCI-5098] 2023-01-17 10:49:08 +01:00
Martin Artnik
db76272602 Fix extraction of TinyMCE images [SCI-5098] 2023-01-16 16:35:36 +01:00
Martin Artnik
7cb639524b Fix parsing of RTE images [SCI-5098] 2023-01-16 16:07:14 +01:00
Martin Artnik
a043bf2cd3 Fix tinymce images for blank texts [SCI-5098] 2023-01-16 12:00:00 +01:00
Martin Artnik
a513951a7c Fix legacy tinymce step issues [SCI-5098] 2023-01-16 10:58:37 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
Martin Artnik
4df203bd13 Fix touching of protocol when changes happen [SCI-7584] 2023-01-12 16:18:31 +01:00
Martin Artnik
662b9174fa Extract pasted base64 images from RTE texts [SCI-5098] 2023-01-12 13:24:31 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
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