Commit graph

12207 commits

Author SHA1 Message Date
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
ajugo
d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +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
Oleksii Kriuchykhin
53fca4f022 Allow user managment on archived projects [SCI-7761] 2023-02-02 15:09:45 +01:00
Alex Kriuchykhin
15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +01:00
Miha Mencin
1720fdf85b
Merge pull request #4923 from okriuchykhin/ok_SCI_7764_v2
Fix Azure and Okta sign in links [SCI-7764]
2023-02-02 12:04:43 +01:00
Oleksii Kriuchykhin
8eafe0fd4a Fix Azure and Okta sign in links [SCI-7764] 2023-02-02 11:20:02 +01:00
Alex Kriuchykhin
7654f063f2
Fix version of Yomu gem, update gem location (#4919) 2023-02-01 17:04:51 +01:00
Soufiane
937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854)
Update Invite new user to team modal [SCI-6007]
2023-02-01 16:27:50 +01:00
Alex Kriuchykhin
dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816
Fix date time inventories reminder processing [SCI-7816]
2023-02-01 16:26:54 +01:00
Alex Kriuchykhin
81e25dba21
Merge pull request #4917 from scinote-eln/features/sso-improvements
Merge features/sso_improvements to develop
2023-02-01 16:14:50 +01:00
Oleksii Kriuchykhin
e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin
94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
Anton
a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01:00
aignatov-bio
39e213104b
Merge pull request #4914 from aignatov-bio/ai-sci-7826-fix-comments-css-in-experiment-table
Fix comments css in experiment table [SCI-7826]
2023-02-01 14:00:43 +01:00
ajugo
6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911)
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
2023-02-01 12:01:18 +01:00
Anton
e6baf20198 Fix comments css in experiment table [SCI-7826] 2023-02-01 11:42:43 +01:00
aignatov-bio
e2da83ee6e
Merge pull request #4904 from aignatov-bio/ai-sci-7822-fix-dimension-calculation
Fix label template logo dimension calculation [SCI-7822]
2023-02-01 11:27:06 +01:00
ajugo
cb3334e818
Fix datetime in repository advanced filters [SCI-7514] (#4910) 2023-02-01 10:33:36 +01:00