Commit graph

7634 commits

Author SHA1 Message Date
Martin Artnik
975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
aignatov-bio
ccc2964aff
Add error message on empty BioEddie save [SCI-5993] (#3526) 2021-09-06 10:13:30 +02:00
Martin Artnik
3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
artoscinote
35874d6a93
Merge pull request #3521 from artoscinote/ma_SCI_6022
Fix barcode scanning in modals [SCI-6022]
2021-08-31 14:37:39 +02:00
Martin Artnik
73241e87bb Fix barcode scanning in modals [SCI-6022] 2021-08-31 14:37:02 +02:00
artoscinote
19a499b613
Merge pull request #3519 from artoscinote/ma_SCI_6022
Made barcode search globally available [SCI-6022]
2021-08-30 15:39:20 +02:00
Alex Kriuchykhin
a63f047ae7
Merge pull request #3512 from okriuchykhin/ok_SCI_6031
Add configuration variable for webhooks, disable by default [SCI-6031]
2021-08-30 15:35:38 +02:00
Martin Artnik
6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Miha Mencin
50d33896e3
Merge pull request #3480 from artoscinote/ma_SCI_5963
Downcase all user emails, downcase when finding user [SCI-5963]
2021-08-30 13:00:12 +02:00
artoscinote
afc74b6b8f
Merge pull request #3500 from artoscinote/ma_SCI_6014
Added edit activities on asset deletion [SCI-6014]
2021-08-30 10:00:58 +02:00
Martin Artnik
1b26a4f65a Added access token to protocols.io requests [SCI-5968] 2021-08-26 15:26:35 +02:00
Oleksii Kriuchykhin
d67f7691a1 Add configuration variable for webhooks, disable by default [SCI-6031] 2021-08-26 14:08:15 +02:00
artoscinote
295d27f0d7
Added option to override default OTP drift time [SCI-6027] (#3507) 2021-08-25 14:02:25 +02:00
Martin Artnik
56fa07aa21 Moved max item name length to constant [SCI-6025] 2021-08-24 10:19:30 +02:00
Martin Artnik
289095ecbc Amended label template, truncate item name before print [SCI_6025] 2021-08-24 09:52:29 +02:00
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
Martin Artnik
b46df537d5 Added edit activities on asset deletion [SCI-6014] 2021-08-20 14:45:33 +02:00
aignatov-bio
546b108bd2
Fix webhooks page for user without teams [SCI-6016] (#3498) 2021-08-20 13:14:24 +02:00
artoscinote
5856778e69
Merge pull request #3494 from aignatov-bio/ai-sci-6018-fix-edit-icon-for-bioeddie
Add edit bio eddie button to asset card [SCI-6018]
2021-08-20 11:06:17 +02:00
artoscinote
c89384cf3c
Merge pull request #3495 from aignatov-bio/ai-sci-6015-clear-errors-on-new-webhook
Clear errors on cancel new webhook form [SCI-6015]
2021-08-20 11:05:44 +02:00
artoscinote
c977decd8a
Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu
Fix webhook sidebar position and fix texting in inventory [SCI-5950]
2021-08-20 11:05:15 +02:00
aignatov-bio
dc192ddbfb Fix webhook sidebar position and fix texting in invnetory [SCI-5950] 2021-08-19 14:23:53 +02:00
aignatov-bio
1b44d49983 Clear errors on cancel new webhook form [SCI-6015] 2021-08-19 13:42:42 +02:00
aignatov-bio
5ed4d9e65e Add edit bio eddie button to asset card [SCI-6018] 2021-08-19 13:28:35 +02:00
aignatov-bio
bbb6cd226b
Add permission check for webhooks sidebar button [SCI-6016] (#3493) 2021-08-19 12:04:52 +02:00
aignatov-bio
a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
Alex Kriuchykhin
5fa3fa4601
Merge pull request #3491 from okriuchykhin/ok_SCI_5983
Add timestamps to API serializers, allow inclusion of comments [SCI-5983]
2021-08-19 10:43:02 +02:00
artoscinote
80dfb04976
Merge pull request #3485 from okriuchykhin/ok_SCI_6002
Fix permission checks in reports controller [SCI-6002]
2021-08-18 15:27:49 +02:00
Martin Artnik
403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
Oleksii Kriuchykhin
33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
aignatov-bio
6e1d51e2f3
Fix bioeddie errors in console [SCI-5989] (#3487) 2021-08-16 18:29:55 +02:00
artoscinote
6f0a65f02f
Merge pull request #3484 from artoscinote/ma_SCI_5999
Rework molecule registration activities [SCI-5999]
2021-08-16 14:33:24 +02:00
Martin Artnik
5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
aignatov-bio
852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486)
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
2021-08-16 10:51:46 +02:00
Oleksii Kriuchykhin
2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00
Martin Artnik
56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
artoscinote
12bb44147c
Merge pull request #3482 from artoscinote/ma_SCI_5984
Optimize how printing jobs and statuses work [SCI-5984]
2021-08-13 09:25:42 +02:00
Martin Artnik
1d3e0db904 Optimize how printing jobs and statuses work [SCI-5984] 2021-08-12 16:57:25 +02:00
aignatov-bio
87416470f1
Fix empty state for bioEddie [SCI-5987] (#3481) 2021-08-12 15:20:21 +02:00
Martin Artnik
1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +02:00
artoscinote
a65d8ad365
Merge pull request #3477 from artoscinote/ma_SCI_5985
Fixed handling deletion for asset activity display [SCI-5985]
2021-08-12 12:23:23 +02:00
Martin Artnik
c3fef50d3e Fixed handling deletion for asset activity display [SCI-5985] 2021-08-12 12:18:12 +02:00
artoscinote
ad179298fc
Merge pull request #3476 from artoscinote/ma_SCI_5985
Fixed registering bioeddie molecule on step [SCI-5985]
2021-08-11 14:12:38 +02:00
Martin Artnik
143e491016 Fixed registering bioeddie molecule on step [SCI-5985] 2021-08-11 14:10:05 +02:00
artoscinote
67330ab27f
Merge pull request #3475 from artoscinote/ma_SCI_5979
Fix disabled refresh printers button [SCI-5979]
2021-08-11 13:22:51 +02:00
Martin Artnik
5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik
9a8a9c7b34 Fix disabled refresh printers button [SCI-5979] 2021-08-11 12:23:18 +02:00
artoscinote
1fc9027d1a
Merge pull request #3466 from aignatov-bio/ai-sci-5964-cancel-changes-after-exit-webhook-edit-mode
Cancel changes after exit webhook edit mode [SCI-5964]
2021-08-11 12:14:12 +02:00
aignatov-bio
5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +02:00