scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
9914 commits 70 branches 179 tags 165 MiB
Commit graph

9914 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin fdbeedd5e6
Merge pull request #3520 from okriuchykhin/ok_SCI_5920 
Allow project viewing for team admins [SCI-5920]
 2021-09-07 12:19:17 +02:00
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
artoscinote 0ce6e29614
Merge pull request #3525 from artoscinote/ma_SCI_6039 
Added specific html class to printer settings section [SCI-6039]
 2021-09-02 09:54:00 +02:00
Martin Artnik 3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
Miha Mencin 8052d4c8d1
Bump version to 1.22.4 2021-09-01 09:40:20 +02:00
Miha Mencin 9df2754a55
Merge pull request #3522 from biosistemika/master 
Master
 2021-09-01 09:39:46 +02:00
Miha Mencin 554fb05738
Bump version to 1.22.3 2021-09-01 09:30:31 +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
Oleksii Kriuchykhin f591bac3b1 Allow project viewing for team admins [SCI-5920] 2021-08-31 14:21: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 9b50d208f0
Merge pull request #3515 from artoscinote/ma_SCI_6025 
Fix default label template [SCI-6025]
 2021-08-30 10:40:05 +02:00
Martin Artnik 57c6703f3c Fix default label template [SCI-6025] 2021-08-30 10:38:59 +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
Miha Mencin 7608151282
Merge pull request #3511 from artoscinote/ma_SCI_5968 
Added access token to protocols.io requests [SCI-5968]
 2021-08-30 09:26:51 +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
artoscinote a847f68de4
Merge pull request #3504 from artoscinote/ma_SCI_6025 
Amended label template, truncate item name before print [SCI_6025]
 2021-08-24 10:59:46 +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
Alex Kriuchykhin 7f122e56f2
Merge pull request #3490 from artoscinote/ma_SCI_5938 
Fixed creating notifications when users are inactive [SCI-5938]
 2021-08-18 10:56:53 +02:00
Martin Artnik 403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
artoscinote 07a458bab6
Merge pull request #3489 from artoscinote/ma_SCI_5999 
Move molecule edited on step activity to Task protocol group [SCI-5999]
 2021-08-18 10:16:24 +02:00
Oleksii Kriuchykhin 33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
Martin Artnik 308e565d58 Move molecule edited on step activity to Task protocol group [SCI-5999] 2021-08-18 09:54:05 +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
artoscinote b89acc9a7b
Merge pull request #3483 from artoscinote/ma_SCI_5998 
Fix printer template [SCI-5998]
 2021-08-16 09:28:45 +02:00
Oleksii Kriuchykhin 2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00