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
17382 commits 69 branches 179 tags 165 MiB
Commit graph

17382 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrej 0efa1b96be Fix sharing permission for task sharing [SCI-10918] 2024-07-24 16:38:29 +02:00
ajugo 7091c09aff
Merge pull request #7744 from rekonder/aj_SCI_10864 
Add delete location action [SCI-10864]
 2024-07-24 15:29:19 +02:00
Andrej 9d541e28b2 Add delete location action [SCI-10864] 2024-07-24 15:28:23 +02:00
ajugo 5ee4308448
Merge pull request #7748 from rekonder/aj_SCI_10909 
Fix rendering of the title on the left menu [SCI-10909]
 2024-07-24 15:00:29 +02:00
Andrej 662d47caf6 Improve handling of auto mapping and clearing [SCI-10905] 2024-07-24 14:51:19 +02:00
aignatov-bio 05d35bfee5
Merge pull request #7750 from aignatov-bio/ai-sci-10914-update-icon-font 
Update font icons [SCI-10914]
 2024-07-24 14:47:42 +02:00
Anton 3a09459595 Update font icons 2024-07-24 14:46:51 +02:00
aignatov-bio d96ef5751e
Merge pull request #7749 from aignatov-bio/ai-sci-10866-box-storage-view 
Add box view [SCI-10866]
 2024-07-24 13:29:39 +02:00
Anton 612e6a8a24 Add box view [SCI-10866] 2024-07-24 13:25:20 +02:00
Andrej ae4b5cffe6 Fix rendering of title on left menu [SCI-10909] 2024-07-24 11:05:00 +02:00
Martin Artnik 6db98fee1a
Merge pull request #7747 from scinote-eln/develop 
July 2024 Release
 2024-07-24 11:00:32 +02:00
Martin Artnik c7d3fdf97b
Bump version to 1.36.0 2024-07-24 10:59:49 +02:00
Andrej 58a8535d33 Add disabled tag to repository colums [SCI-10911] 2024-07-24 10:29:02 +02:00
Martin Artnik e684e25b10
Merge pull request #7745 from artoscinote/ma_SCI_10912 
Improve blank stock importing [SCI-10912]
 2024-07-23 16:00:45 +02:00
Martin Artnik bfcf8208c8 Improve blank stock importing [SCI-10912] 2024-07-23 15:55:39 +02:00
ajugo c2b1df8019
Merge pull request #7743 from rekonder/aj_SCI_10863 
Speedup generating of storage locations tree for move modal [SCI-10863]
 2024-07-23 14:58:16 +02:00
Andrej 793dc22991 Speedup generating of storage locations tree for move modal [SCI-10863] 2024-07-23 14:53:10 +02:00
Martin Artnik aad78294da
Merge pull request #7742 from artoscinote/ma_SCI_10912 
On import, set blank stock values to zero instead of destroying [SCI-10912]
 2024-07-23 12:56:24 +02:00
Martin Artnik a135b6fb59 On import, set blank stock values to zero instead of destroying [SCI-10912] 2024-07-23 12:54:04 +02:00
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