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
Anton
9c488d5a0c
Add new access user modal [SCI-7518]
2023-01-03 14:43:03 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views
2022-12-22 13:33:25 +01:00
Anton
d1a68adb22
Add access modal for protocols [SCI-7518]
2022-12-22 13:27:46 +01:00
Oleksii Kriuchykhin
72f1cf2704
Fix viewer permissions for inventories [SCI-7422]
2022-12-20 13:26:38 +01:00
Oleksii Kriuchykhin
5fea4722ac
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-19 15:39:32 +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
Oleksii Kriuchykhin
9b72474943
Add versioning implementation to protocols data layer [SCI-7513]
2022-11-30 19:52:36 +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
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
ajugo
0493d6f31d
Fix label template preview issues [SCI-7313] ( #4514 )
...
* Add preview label at open modal [SCI-7313]
* Add density and unit to the label template [SCI-7313]
2022-10-11 10:58:37 +02:00
Oleksii Kriuchykhin
9322052f9d
Add logic for user role updates for team child objects [SCI-7292]
2022-10-10 15:27:42 +02:00
Alex Kriuchykhin
5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308
...
Fix user invitation modal [SCI-7308]
2022-10-07 14:53:34 +02:00
Alex Kriuchykhin
4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291
...
Update teams table with new user assignments system [SCI-7291]
2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin
173e3b09cd
Fix user invitation modal [SCI-7308]
2022-10-06 17:55:51 +02:00
Alex Kriuchykhin
9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290
...
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-06 15:45:48 +02:00
Alex Kriuchykhin
d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293
...
Fix project visibility for team admins [SCI-7293]
2022-10-06 15:45:29 +02:00
Alex Kriuchykhin
5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295
...
Assign user to public projects after adding to a team [SCI-7295]
2022-10-06 15:45:17 +02:00
ajugo
f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] ( #4471 )
...
* Remove icon from the status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
2022-10-06 11:53:12 +02:00
Oleksii Kriuchykhin
9a05bf04bd
Assign user to public projects after adding to a team [SCI-7295]
2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin
b87ed7db8e
Fix project visibility for team admins [SCI-7293]
2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin
0a8ebef095
Update teams table with new user assignments system [SCI-7291]
2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin
cf34ddcbd1
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-04 13:53:45 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] ( #4448 )
...
* Add validation to print modal [SCI-7052]
* Fix dropdown on label modal print [SCI-7052]
* Fix hound [SCI-7052]
* Rename validation endpoint [SCI-7052]
* Add zpl label printing and fix fluics printing [SCI-7221]
* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"
2022-09-21 10:07:44 +02:00
artoscinote
6faa59581e
Merge pull request #4427 from artoscinote/ma_SCI_7163
...
Skip previews for non-supported images in team zip export [SCI-7163]
2022-09-19 13:59:35 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177
2022-09-19 13:58:33 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps
2022-09-15 11:25:25 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions
2022-09-14 14:34:02 +02:00
aignatov-bio
33f210638a
Merge branch 'features/team-permissions' into ok_SCI_6947
2022-09-14 14:31:45 +02:00
aignatov-bio
9e63dcab22
Merge pull request #4207 from okriuchykhin/ok_SCI_6918
...
Update repository sharing actions [SCI-6918]
2022-09-14 14:23:52 +02:00
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
Giga Chubinidze
22aa04a5ac
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:57:17 +04:00
Giga Chubinidze
133302964c
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:53:41 +04:00
Giga Chubinidze
0a1b879c3d
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:49:12 +04:00
Martin Artnik
b836b9a12b
Add task IDs to canvas view [SCI-7177]
2022-09-13 12:42:12 +02:00
Giga Chubinidze
2c393a1bef
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:31:04 +04:00
Giga Chubinidze
fbbe394029
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:24:06 +04:00
Anton
7d02b9f26d
Fix repository selection in reports [SCI-7167]
2022-09-13 09:59:11 +02:00