Commit graph

12050 commits

Author SHA1 Message Date
sboursen-scinote
4083f0a065 Use YAGNI on the file [SCI-7685] 2023-02-08 11:53:04 +01:00
sboursen-scinote
da1d8231cc Convert font-size unit to pt [SCI-7685] 2023-02-08 11:50:19 +01:00
artoscinote
6e44c8895d
Merge pull request #4948 from artoscinote/ma_SCI_7187
Add targetable class to tinyMCE packs [SCI-7187]
2023-02-07 15:51:55 +01:00
Martin Artnik
eceeb7ceb5 Add targetable class to tinyMCE packs [SCI-7187] 2023-02-07 15:47:44 +01:00
ajugo
5dd9a7adaf
Fixed protocols.io import for multiple-step cases. [SCI-7843] (#4946)
* Fix attachments for protocols.io importer [SCI-7843]

* Fix protocols io import for multiple step cases [SCI-7843]
2023-02-07 15:34:04 +01:00
aignatov-bio
054c8c476d
Merge pull request #4945 from aignatov-bio/ai-sci-7894-fix-experiment-sorting
Fix experiments sidebar sorting [SCI-7894]
2023-02-07 15:20:48 +01:00
Anton
94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
aignatov-bio
6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce
Fix heading styles for tinymce [SCI-7840]
2023-02-07 13:25:02 +01:00
artoscinote
ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
2023-02-07 13:11:03 +01:00
artoscinote
1a8cacaeb8
Merge pull request #4942 from artoscinote/ma_SCI_7886
Disable all TinyMCE context menus [SCI-7886]
2023-02-07 13:10:12 +01:00
artoscinote
1ef59632ff
Merge pull request #4943 from G-Chubinidze/gc_SCI_7837
step timestamp changes [SCI-7837]
2023-02-07 13:04:31 +01:00
Giga Chubinidze
3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Giga Chubinidze
9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
Martin Artnik
d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
ajugo
c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
artoscinote
5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187
Support compiling webpacker content from addons [SCI-7187]
2023-02-07 10:24:18 +01:00
artoscinote
b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674
Inventories: archived by and archived on seen on active item list [SCI-7674]
2023-02-07 10:23:28 +01:00
artoscinote
db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
2023-02-06 16:59:08 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
sboursen-scinote
1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote
2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
Martin Artnik
ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +01:00
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata
Save handson table metadata [SCI-7834]
2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote
93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote
9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
sboursen-scinote
c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote
2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359
Fix multiple route helper incluions [SCI-6359]
2023-02-06 13:08:04 +01:00
Martin Artnik
7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
artoscinote
3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837
Step timestamp display [SCI-7837]
2023-02-06 12:03:02 +01:00
ajugo
442fd5e971
Fix protocol printing dialog [SCI-7889] (#4933) 2023-02-06 11:34:59 +01:00
sboursen-scinote
a78f113498 Update the style of the form-group with errors [SCI-7831] 2023-02-06 11:31:25 +01:00
artoscinote
41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883
Update the TinyMCE font [SC-7883]
2023-02-06 11:19:29 +01:00
artoscinote
d8c5bcedd1
Merge pull request #4926 from okriuchykhin/ok_SCI_7761
Allow user management on archived projects [SCI-7761]
2023-02-06 11:18:39 +01:00
ajugo
5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] (#4907) 2023-02-06 11:18:19 +01:00
ajugo
914cd3c2c8
Fix the eye icon on disable 2fa modal [SCI-7528] (#4906) 2023-02-06 11:17:57 +01:00
artoscinote
6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
2023-02-06 11:17:43 +01:00
artoscinote
4405fa2cd9
Merge pull request #4913 from sboursen-scinote/sb_SCI-7814
FIX: Tag modal opens in experiment table view [SCI-7814]
2023-02-06 11:14:13 +01:00
artoscinote
d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676
CSS: error messages at moving experiment [SCI-7676]
2023-02-06 11:12:45 +01:00
sboursen-scinote
43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Giga Chubinidze
f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Giga Chubinidze
9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Alex Kriuchykhin
958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
artoscinote
fa3dbbfee9
Merge pull request #4929 from sboursen-scinote/sb_SCI-7832
Bring the user information flyout to the foreground in task panel [SCI-7832]
2023-02-03 12:38:46 +01:00
Martin Artnik
a26d26a695 Support compiling webpacker content from addons [SCI-7187] 2023-02-03 12:03:50 +01:00
Giga Chubinidze
ac4b090560 slight style refactor 2023-02-03 13:38:03 +04:00
sboursen-scinote
ada165264a Bring the information flyout to the foreground in task panel [SCI-7832] 2023-02-03 08:25:07 +01:00
Giga Chubinidze
ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
artoscinote
dd5c567e50
Merge pull request #4927 from artoscinote/ma_SCI_7584
Don't touch steps when commenting [SCI-7584]
2023-02-02 16:42:29 +01:00
Martin Artnik
ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00