Commit graph

17363 commits

Author SHA1 Message Date
aignatov-bio
ae0bf4bb0d
Merge pull request #7737 from aignatov-bio/ai-sci-10862-add-duplicate-action-to-location
Add duplicate action to locations [SCI-10862]
2024-07-23 11:27:44 +02:00
aignatov-bio
0893774cc5
Merge branch 'features/storage-locations' into ai-sci-10862-add-duplicate-action-to-location 2024-07-23 11:27:36 +02:00
Anton
1c3cc71174 Add duplicate action to locations [SCI-10862] 2024-07-23 11:24:27 +02:00
Martin Artnik
82557d31d6
Merge pull request #7741 from artoscinote/ma_SCI_10908
Fix creating RepositoryStockConsumptionValues in repository snapshots [SCI-10908]
2024-07-23 10:34:56 +02:00
Martin Artnik
357e7bc7f7 Fix creating RepositoryStockConsumptionValues in repository snapshots [SCI-10908] 2024-07-23 10:30:07 +02:00
ajugo
c8a3db554d
Merge pull request #7740 from rekonder/aj_SCI_10863
Fix in memory loading of storage location tree [SCI-10863]
2024-07-23 09:47:51 +02:00
Andrej
d725e278c1 Fix in memory loading of storage location tree [SCI-10863] 2024-07-23 09:44:57 +02:00
ajugo
a973acaf0c
Merge pull request #7739 from rekonder/aj_SCI_10863
Add move modal for storage locations [SCI-10863]
2024-07-23 09:43:09 +02:00
Andrej
2f53772f61 Add move modal for storage locations [SCI-10863] 2024-07-23 09:41:19 +02:00
Martin Artnik
4e0a3958a4
Merge pull request #7738 from artoscinote/ma_SCI_10907
Fix comment send button Firefox issue [SCI-10907]
2024-07-22 13:58:15 +02:00
Martin Artnik
59c6259318 Fix comment send button Firefox issue [SCI-10907] 2024-07-22 13:55:54 +02:00
Martin Artnik
9c3e1d1946
Merge pull request #7736 from artoscinote/ma_SCI_10906
Fix user assignment deletion for public projects [SCI-10906]
2024-07-22 11:25:46 +02:00
Martin Artnik
7f2d4cba3e Merge branch 'develop' into features/ui-tweaks 2024-07-22 10:59:12 +02:00
Martin Artnik
09dc6c3ec6 Fix user assignment deletion for public projects [SCI-10906] 2024-07-22 10:50:36 +02:00
Alex Kriuchykhin
8f8bd353bc
Add Brakeman code static analysis tool (#7734) 2024-07-22 10:30:28 +02:00
aignatov-bio
e56e9b7dac
Merge pull request #7733 from aignatov-bio/ai-sci-10860-add-create-edit-modal-for-storage-locations
Add create/edit modal for storage locations [SCI-10860]
2024-07-19 14:00:01 +02:00
Anton
d0c07d6a3d Add create/edit modal for storage locations [SCI-10860]/ 2024-07-19 13:58:43 +02:00
Martin Artnik
842b8af6ac Properly set last_modified_by when consuming stock [SCI-10904] 2024-07-19 13:10:36 +02:00
Martin Artnik
82ce3db5a0
Merge pull request #7732 from artoscinote/ma_SCI_10904
Properly set last_modified_by when consuming stock [SCI-10904]
2024-07-19 09:33:14 +02:00
Martin Artnik
acbbe1daf6 Properly set last_modified_by when consuming stock [SCI-10904] 2024-07-19 09:30:47 +02:00
Martin Artnik
b1d8bc2d2a
Merge pull request #7731 from artoscinote/ma_SCI_10893
Preserve RepositoryTimeValue date component on import [SCI-10983]
2024-07-18 16:29:55 +02:00
Martin Artnik
6282478361 Preserve RepositoryTimeValue date component on import [SCI-10983] 2024-07-18 15:56:24 +02:00
ajugo
089dbc084b
Merge pull request #7730 from rekonder/aj_SCI_10903
Fix reloading of marvinjs attachments [SCI-10903]
2024-07-18 15:32:59 +02:00
Andrej
9116ef7456 Fix reloading of marvinjs attachments [SCI-10903] 2024-07-18 15:30:18 +02:00
Martin Artnik
4f88a5581d Implement sub-location count column [SCI-10859] 2024-07-18 13:05:59 +02:00
aignatov-bio
60ce8aa425
Merge pull request #7728 from aignatov-bio/ai-sci-10861-add-storage-locations-toolbar
Add toolbar for storage locations [SCI-10861]
2024-07-18 11:53:36 +02:00
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