Commit graph

279 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Alex Kriuchykhin
483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
Alex Kriuchykhin
00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Martin Artnik
ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
ajugo
8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
Soufiane
53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910
Protocol templates - revert action and alert message [SCI-7910]
2023-02-28 15:33:05 +01:00
sboursen-scinote
1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
sboursen-scinote
66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote
b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]"
This reverts commit 0f9dcda99b.
2023-02-28 11:51:42 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
sboursen-scinote
0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote
4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
ajugo
cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870)
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
artoscinote
c1c8425a93
Merge pull request #4857 from artoscinote/ma_SCI_7778
Fix text result creation [SCI-7778]
2023-01-19 13:02:12 +01:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Martin Artnik
3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
Martin Artnik
b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton
bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
Andrej
745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Anton
d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
Alex Kriuchykhin
9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
Martin Artnik
910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
ajugo
a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164)
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
2022-06-21 10:49:03 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
ajugo
ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +02:00
Oleksii Kriuchykhin
823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
artoscinote
2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
Anton
b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
aignatov-bio
4d429b28a8
Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 2022-04-22 11:15:04 +02:00
Anton
fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
Anton
f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +02:00
aignatov-bio
918a11a0b0
Fix decimal render function [SCI-6742] (#4037)
Co-authored-by: Anton <anton@scinote.net>
2022-04-20 11:07:37 +02:00
artoscinote
f3ce338600
Fix error modal opening on successful snapshot [SCI-6726] (#4019) 2022-04-13 14:22:34 +02:00
artoscinote
ee26204af2
Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) 2022-04-13 11:35:22 +02:00
ajugo
1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
artoscinote
83ac50c57d
Add repository snapshot error modal [SCI-6613] (#3993) 2022-04-12 13:29:11 +02:00
ajugo
a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005)
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
2022-04-11 10:47:24 +02:00
ajugo
986e817fdc
Removed autofocus clear on open reminder flyout [SCI-6690] (#4003)
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
2022-04-08 18:08:55 +02:00
artoscinote
d696239649
Fix collapsing of assigned items tables [SCI-6705] (#4000) 2022-04-08 13:55:53 +02:00
ajugo
bb44152d54
Fix assigning and consuming items [SCI-6686] (#3985) 2022-04-04 11:07:46 +02:00
artoscinote
addd4a9522
Make stock column work properly with different orders [SCI-6677] (#3974) 2022-03-31 14:06:37 +02:00