scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
17387 commits 69 branches 179 tags 165 MiB
Commit graph

17387 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton 782256f655 Add toolbar for storage locations [SCI-10861] 2024-07-18 11:46:30 +02:00
Martin Artnik b7c30bbf0b Merge branch 'develop' into features/storage-locations 2024-07-18 11:45:16 +02:00
aignatov-bio 5c9eed307f
Merge pull request #7726 from KlemenSciNote/kb_SCI-10902_data-e2e-for-Pendo 
Add data-e2e attributes to item import modal [SCI-10902]
 2024-07-18 11:09:52 +02:00
Klemen Benedicic 724288d50a Add data-e2e attributes to item import modal [SCI-10902] 2024-07-18 10:56:15 +02:00
aignatov-bio 33626e0ddd
Merge pull request #7719 from aignatov-bio/ai-sci-10857-add-locations-page 
Add storage locations table [SCI-10857][SCI-10858]
 2024-07-17 14:50:51 +02:00
aignatov-bio 2e7add73d1
Merge pull request #7725 from aignatov-bio/ai-sci-10834-fix-scinote-edit 
Check local app for asset mount [SCI-10834]
 2024-07-17 14:45:24 +02:00
Anton d5b3158d45 Check local app for asset mount [SCI-10834] 2024-07-17 14:10:01 +02:00
Martin Artnik 79036cd3e8
Merge pull request #7724 from artoscinote/ma_SCI_10900 
Fix draft protocol title markup [SCI-10900]
 2024-07-17 13:01:45 +02:00
Martin Artnik ad8955e5c9 Fix draft protocol title markup [SCI-10900] 2024-07-17 13:00:01 +02:00
aignatov-bio eb03389065
Merge pull request #7723 from aignatov-bio/ai-sci-10834-fix-scinote-edit 
Fix scinote edit in attachments [SCI-10834]
 2024-07-17 12:40:38 +02:00
Anton a7ec6e0086 Fix scinote edit in attachments [SCI-10834] 2024-07-17 12:24:17 +02:00
Martin Artnik a9980c04c7
Merge pull request #7722 from artoscinote/ma_SCI_10893 
Fix import of stock units [SCI-10893]
 2024-07-17 12:04:58 +02:00
Martin Artnik 9403b4fd67 Fix import of stock units [SCI-10893] 2024-07-17 12:00:00 +02:00
Martin Artnik 69165c96a6
Merge pull request #7720 from artoscinote/ma_SCI_10890 
Fix repository row touch for checklist values [SCI-10890]
 2024-07-17 10:54:42 +02:00
ajugo adb7115312
Merge pull request #7721 from rekonder/aj_SCI_10884 
Fix cell value validation [SCI-10884]
 2024-07-17 10:46:34 +02:00
Andrej 40bbbf4863 Fix cell value validation [SCI-10884] 2024-07-17 10:24:02 +02:00
Martin Artnik 8aee1ce94a Fix repository row touch for checklist values [SCI-10890] 2024-07-17 10:22:44 +02:00
Anton 1090fc3cf8 Add storage locations table [SCI-10857] 2024-07-16 15:23:15 +02:00
ajugo c02653a45a
Merge pull request #7718 from rekonder/aj_SCI_10894 
Fix saving of repository state [SCI-10894]
 2024-07-16 13:59:24 +02:00
Andrej 56439bf5ec Fix saving of repository state [SCI-10894] 2024-07-16 13:32:21 +02:00
aignatov-bio 4f6e2adfc1
Merge pull request #7717 from aignatov-bio/ai-sci-10834-fix-scinote-edit-check 
Fix scinote edit check [SCI-10834]
 2024-07-16 11:55:12 +02:00
Anton 9604af8e4c Fix scinote edit check [SCI-10834] 2024-07-16 11:53:32 +02:00
Martin Artnik 9c1140c3b6
Merge pull request #7716 from artoscinote/ma_SCI_10896 
Also resize TinyMCE images for export reports [SCI-10896]
 2024-07-16 10:39:09 +02:00
Martin Artnik bb6cf73e7b Also resize TinyMCE images for export reports [SCI-10896] 2024-07-16 10:33:27 +02:00
aignatov-bio ef9fc0b020
Merge pull request #7715 from aignatov-bio/ai-sci-10887-protocol-info-on-task-page 
Fix overflow issue for protocol info [SCI-10887]
 2024-07-15 15:42:00 +02:00
aignatov-bio 81fdc4363c
Merge pull request #7714 from aignatov-bio/ai-sci-10841-add-html-support-for-left-menu 
Add html support for left menu [SCI-10841]
 2024-07-15 15:38:57 +02:00
Anton 7d6c75b622 Fix overflow issue for protocol info [SCI-10887] 2024-07-15 15:04:54 +02:00
aignatov-bio 8587bcad68
Merge pull request #7670 from aignatov-bio/ai-sci-10818-poc-instruction-in-inventory-export 
Instruction for inventory import [SCI-10846]
 2024-07-15 14:44:29 +02:00
Martin Artnik 83394b7e9e
Merge pull request #7713 from artoscinote/ma_SCI_10889 
Fix handling of blank rows and stock changes [SCI-10889]
 2024-07-15 14:41:10 +02:00
Anton 2e413b28af Add html support for left menu [SCI-10841] 2024-07-15 14:40:13 +02:00
Martin Artnik fb38cd2e72 Fix previewer initialization 2024-07-15 14:24:19 +02:00
Martin Artnik c811d191eb Fix handling of blank rows and stock changes [SCI-10889] 2024-07-15 14:20:02 +02:00
ajugo 668e3b0851
Merge pull request #7712 from rekonder/aj_SCI_10891 
Fix import for do not import option [SCI-10891]
 2024-07-15 13:35:59 +02:00
Andrej 24e1baefd6 Fix import for do not import option [SCI-10891] 2024-07-15 12:58:55 +02:00
Martin Artnik 5b69e5277c
Merge pull request #7709 from artoscinote/ma_SCI_10885 
Remove overflow-auto that breaks submenus [SCI-10885]
 2024-07-15 10:55:02 +02:00
aignatov-bio 694432ffa9
Merge pull request #7707 from aignatov-bio/ai-sci-10855-add-negative-numbers-to-stock 
Add negative stock values to import [SCI-10855]
 2024-07-15 10:30:13 +02:00
Martin Artnik 2d9c26ceb5
Merge pull request #7711 from rekonder/aj_SCI_10854 
Fix checklist importing [SCI-10854]
 2024-07-15 09:59:35 +02:00
Andrej d72862e25e Fix checklist importing [SCI-10854] 2024-07-15 09:56:18 +02:00
Martin Artnik 856bd4a57a Remove overflow-auto that breaks submenus [SCI-10885] 2024-07-12 14:21:40 +02:00
aignatov-bio d8a270d8f7
Merge branch 'develop' into ai-sci-10818-poc-instruction-in-inventory-export 2024-07-12 13:27:47 +02:00
Anton c17c15f3ad POC for instruction of inventory export [SCI-8865] 2024-07-12 13:27:05 +02:00
aignatov-bio 3925a3a169
Merge pull request #7706 from aignatov-bio/ai-sci-10824-fix-users-filter-long-username 
Fix users long username [SCI-10824]
 2024-07-12 13:24:05 +02:00
Anton 9c5b564bd0 Add negative stock values to import [SCI-10855] 2024-07-12 13:23:40 +02:00
Martin Artnik ba2ede1044
Merge pull request #7705 from artoscinote/ma_SCI_10878 
Fix duplicate import items check [SCI-10878]
 2024-07-12 13:00:29 +02:00
Anton 3245e444c6 Fix users long username [SCI-10824] 2024-07-12 12:54:51 +02:00
aignatov-bio 7b1b71cfff
Merge pull request #7704 from aignatov-bio/ai-sci-10812-fix-import-css-issues 
Small fixes for import [SCI-10812]
 2024-07-12 12:46:51 +02:00
Martin Artnik ec9bdbfd27 Fix duplicate import items check [SCI-10878] 2024-07-12 12:30:26 +02:00
Martin Artnik 14c9bf5799
Merge pull request #7703 from artoscinote/ma_SCI_10877 
Clear import modal state on modal open [SCI-10877]
 2024-07-12 10:57:39 +02:00
aignatov-bio b5d0837b93
Merge pull request #7681 from aignatov-bio/ai-sci-10785-add-toolbar-for-steps 
Add toolbar for steps and results [SCI-10785]
 2024-07-12 10:56:40 +02:00
Anton 981c5e4b25 Small fixes for import [SCI-10812] 2024-07-12 10:55:47 +02:00