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

3592 commits

Author SHA1 Message Date
Martin Artnik a85fc77261 Merge branch 'develop' into features/storage-locations 2024-08-26 11:12:04 +02:00
Martin Artnik fa2ef02c3e
Merge pull request #7789 from scinote-eln/hotfix/1.36.0.1 
Hotfix/1.36.0.1
 2024-08-07 13:36:40 +02:00
Martin Artnik c43a730972 Fix Grover config [SCI-10931] 2024-08-06 17:42:58 +02:00
Anton 3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +02:00
Anton 0dd371abea Fix css for stroge locations [SCI-10959] 2024-08-06 15:13:21 +02:00
Martin Artnik b6af1031f5
Revert "Timeout slow libreoffice preview generation [SCI-10809] (#7678)" 
This reverts commit 1265f29a9e.
 2024-08-06 10:58:50 +02:00
Anton 83d9c88546 Add filters to storage locations [SCI-10927] 2024-08-02 14:01:41 +02:00
Martin Artnik 1265f29a9e
Timeout slow libreoffice preview generation [SCI-10809] (#7678) 2024-08-02 10:24:03 +02:00
Martin Artnik 52f9a8411c Merge branch 'release/1.35.0' into develop 2024-08-01 15:40:09 +02:00
Anton 124810e07e Add locations to item card [SCI-10923] 2024-08-01 15:07:43 +02:00
Anton 49ddeb7403 Merge branch 'develop' into features/storage-locations 2024-07-31 12:19:31 +02:00
ajugo 51717c343e
Merge pull request #7761 from rekonder/aj_SCI_10794 
Add state saving for result [SCI-10794]
 2024-07-30 13:56:37 +02:00
Andrej 3b2748ae71 Add state saving for result [SCI-10794] 2024-07-30 09:33:27 +02:00
Anton 2da397cc76 Add assign/unassign modal and move modal [SCI-10870] 2024-07-29 16:06:21 +02:00
Andrej e4fb5d71df Add permissions for storage location and rename box to container [SCI-10882] 2024-07-29 09:46:45 +02:00
Anton 50928f6948 Add toolbar to container table [SCI-10868] 2024-07-25 12:06:56 +02:00
Andrej 9d541e28b2 Add delete location action [SCI-10864] 2024-07-24 15:28:23 +02:00
Anton 612e6a8a24 Add box view [SCI-10866] 2024-07-24 13:25:20 +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
Andrej 2f53772f61 Add move modal for storage locations [SCI-10863] 2024-07-23 09:41:19 +02:00
Martin Artnik 7f2d4cba3e Merge branch 'develop' into features/ui-tweaks 2024-07-22 10:59:12 +02:00
Anton d0c07d6a3d Add create/edit modal for storage locations [SCI-10860]/ 2024-07-19 13:58:43 +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
Anton 1090fc3cf8 Add storage locations table [SCI-10857] 2024-07-16 15:23:15 +02:00
Martin Artnik fb38cd2e72 Fix previewer initialization 2024-07-15 14:24:19 +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
Martin Artnik 096d1fca92 Implement soft locked repository [SCI-10880] 2024-07-11 15:41:13 +02:00
Martin Artnik 34e9c9f4e8
Merge pull request #7696 from artoscinote/ma_SCI_10853 
Change import activites and flash messages [SCI-10853]
 2024-07-11 15:04:55 +02:00
Andrej 181b55b1a1 Fix importing items when input format is incorrect [SCI-10874] 2024-07-11 11:43:37 +02:00
Andrej d6c3468002 Implement storage location backend [SCI-10465] 2024-07-11 09:48:49 +02:00
Martin Artnik 6a4d50e44a Change import activites and flash messages [SCI-10853] 2024-07-10 15:46:24 +02:00
Anton 3eacee9ca0 Small inventory fixes [SCI-10835][SCI-10847][SCI-10844] 2024-07-10 12:44:35 +02:00
Andrej aca6af0517 Fix default state for relationship column [SCI-10871] 2024-07-10 09:29:28 +02:00
Martin Artnik 6087a06034 Merge branch 'features/inventory-import-improvements' into develop 2024-07-08 10:07:30 +02:00
Anton afe96a3b65 Add toolbar for steps and results [SCI-10785] 2024-07-04 13:25:53 +02:00
Andrej 191ae52a73 Add disabled state for task sharing button [SCI-10784] 2024-07-03 16:53:57 +02:00
Alex Kriuchykhin da98f627e4
Add config option for disabling whitelisting external services in CSP and option for disabling links preload in headers [SCI-10795] (#7677) 2024-07-03 13:34:26 +02:00
aignatov-bio 7ed8bf730f
Merge pull request #7666 from rekonder/aj_SCI_10813 
Add error messages to import items modal [SCI-10813]
 2024-07-03 12:34:45 +02:00
aignatov-bio 8c121d47df
Merge pull request #7674 from aignatov-bio/ai-sci-10825-add-highlight-to-rows-during-import 
Add highlight for rows during import [SCI-10825]
 2024-07-03 12:33:04 +02:00
Anton be71d12b13 Add highlight for rows during import [SCI-10825] 2024-07-02 13:06:02 +02:00
Anton c4dd2e4728 Fix dashboard task creation [SCI-8865] 2024-07-02 12:28:49 +02:00
Anton 0057de4e49 Fix wording [SCI-10789] 2024-07-02 11:39:55 +02:00
Andrej ae5ea1f0cb Add error messages to import items modal [SCI-10813] 2024-06-28 09:30:20 +02:00
ajugo 9a05c154d0
Merge pull request #7663 from aignatov-bio/ai-sci-10808-exclude-default-columns-from-automapping 
Exclude default columns from mapping [SCI-10808]
 2024-06-27 10:43:49 +02:00
Anton 32c8af1280 Exclude default columns from mapping [SCI-10808] 2024-06-26 15:24:29 +02:00
Martin Artnik cb2f0b1bcd Merge branch 'release/1.30.0' 2024-06-26 11:42:17 +02:00
Anton 323e40dd2e Small fixes for inventory import [SCI-10797][SCI-10791] 2024-06-24 13:22:57 +02:00