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

17216 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KlemenSciNote a2cbd28f2d
Merge pull request #7755 from KlemenSciNote/kb_SCI-10920_data-e2e-protocol-templates 
Add data-e2e to protocol versions modal [SCI-10920]
 2024-07-30 13:48:49 +02:00
Martin Artnik cb619cb3fa Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-07-30 13:45:03 +02:00
Klemen Benedicic 0cac65063c Update step text title and content data-e2e [SCI-10920] 2024-07-30 13:24:43 +02:00
Klemen Benedicic 788c11f06e Merge branch 'develop' into kb_SCI-10920_data-e2e-protocol-templates 2024-07-30 12:56:51 +02:00
ajugo 5695150e98
Merge pull request #7762 from rekonder/aj_SCI_10930 
Remove edit ability for read-only inventories [SCI-10930]
 2024-07-30 12:45:44 +02:00
Andrej a00708ea5b Remove edit ability for read only inventories [SCI-10930] 2024-07-30 12:09:44 +02:00
Martin Artnik ab2f5c16b4
Merge pull request #7758 from scinote-eln/features/ui-tweaks 
Features/UI tweaks
 2024-07-29 10:38:30 +02:00
Klemen Benedicic bb7e85b19d Add data-e2e to protocol versions modal [SCI-10920] 2024-07-25 13:52:31 +02:00
Andrej 10e3790566 Fix space for add step button in protocols [SCI-10910] 2024-07-24 17:08:34 +02:00
Andrej 0efa1b96be Fix sharing permission for task sharing [SCI-10918] 2024-07-24 16:38:29 +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
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
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
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
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
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
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 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