scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
12573 commits 70 branches 179 tags 165 MiB
Commit graph

12573 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio af9219b7ae
Assign item through repository item modal [SCI-8141] (#5237) 2023-04-25 14:30:14 +02:00
Soufiane f94d9cc0f2
Direct inventory item assignment to the current task from the item card BE [SCI-8142] (#5163) 
Implement controller action to directly assign item to task [SCI-8142]
 2023-04-25 14:00:55 +02:00
artoscinote 03ff08763b
Merge pull request #5226 from artoscinote/ma_SCI_8225 
Fix migration for archived protocols [SCI-8225]
 2023-03-30 13:29:01 +02:00
Martin Artnik 6163ac984a Fix migration for archived protocols [SCI-8225] 2023-03-30 13:22:25 +02:00
artoscinote e108740055
Merge pull request #5225 from artoscinote/ma_SCI_8228 
Handle deleted protocol activities [SCI-8228]
 2023-03-29 16:25:23 +02:00
Martin Artnik d86a93919b Handle deleted protocol activities [SCI-8228] 2023-03-29 16:20:53 +02:00
Oleksii Kriuchykhin 89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin 281489fa34 Bump version to 1.26.6.4 2023-03-29 10:37:46 +02:00
artoscinote be4f008f09
Merge pull request #5224 from sboursen-scinote/sb_SCI-7607-fix2 
Fix clear button style in dashboard filter [SCI-7607]
 2023-03-29 10:37:10 +02:00
sboursen-scinote 226a89e8bf Fix clear button style in dashboard filter [SCI-7607] 2023-03-29 10:34:13 +02:00
artoscinote 3173b9f96e
Merge pull request #5216 from artoscinote/ma_SCI_8202 
Fix print for linked protocols [SCI-8202]
 2023-03-29 09:58:49 +02:00
artoscinote edcc84788e
Merge pull request #5220 from artoscinote/ma_SCI_8217 
Fix new protocol default role, fix reload of protocol access modal [SCI-8217]
 2023-03-29 09:11:07 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Alex Kriuchykhin 887ff00dab
Merge pull request #5219 from okriuchykhin/ok_SCI_8216 
Fix step table renaming [SCI-8216]
 2023-03-28 16:06:08 +02:00
Oleksii Kriuchykhin ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
aignatov-bio 6c3afee428
Merge pull request #5218 from aignatov-bio/ai-sci-8214-small-css-fixes-for-task-protocol 
Fix css for task protocol [SCI-8214]
 2023-03-28 15:24:01 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
Alex Kriuchykhin 43cdcd7aa2
Merge pull request #5217 from okriuchykhin/ok_SCI_8216 
Fix saving of big tables on steps [SCI-8216]
 2023-03-28 13:34:41 +02:00
Oleksii Kriuchykhin 0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Martin Artnik e819c730e7 Fix print for linked protocols [SCI-8202] 2023-03-28 12:08:55 +02:00
Alex Kriuchykhin e3a0f3c55f
Merge pull request #5215 from artoscinote/ma_SCI_8212 
Properly handle repository snapshots in reports [SCI-8212]
 2023-03-28 10:39:46 +02:00
Martin Artnik f48350c6ea Properly handle repository snapshots in reports [SCI-8212] 2023-03-28 10:37:24 +02:00
Alex Kriuchykhin 16c61b31b9
Merge pull request #5210 from artoscinote/ma_SCI_8131 
Add missing translation [SCI-8131]
 2023-03-28 10:35:56 +02:00
ajugo c0977799f3
Fix recent works for protocol [SCI-8204] (#5211) 2023-03-27 16:00:40 +02:00
ajugo 0ff5cdf9a8
Fix CSS for pdf/docx preview and some minor CSS fixes [SCI-8198] (#5204) 2023-03-27 15:31:27 +02:00
Martin Artnik 1f5fa19d80 Add missing translation [SCI-8131] 2023-03-27 15:26:59 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
artoscinote b9b785c122
Merge pull request #5208 from artoscinote/ma_SCI_8196 
Fix search for new access grant [SCI-8196]
 2023-03-27 13:14:38 +02:00
Alex Kriuchykhin f5b43f248f
Merge pull request #5205 from artoscinote/ma_SCI_8200 
Update public user assignments on public role change [SCI-8200]
 2023-03-27 13:13:09 +02:00
Alex Kriuchykhin 3d8717e994
Merge pull request #5186 from okriuchykhin/ok_SCI_8177 
Improve error handling in protocol archive/restore actions [SCI-8177]
 2023-03-27 13:11:11 +02:00
Martin Artnik efcda1e057 Update public user assignments on public role change [SCI-8200] 2023-03-27 13:11:00 +02:00
Martin Artnik cb21b9f29b Fix search for new access grant [SCI-8196] 2023-03-27 12:46:14 +02:00
Alex Kriuchykhin 2bcb9d0639
Merge pull request #5207 from artoscinote/ma_SCI_8131 
Add error flash when assignment update fails [SCI-8131]
 2023-03-27 12:43:40 +02:00
Martin Artnik 9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
Alex Kriuchykhin f99326507d
Merge pull request #5202 from aignatov-bio/ai-sci-8195-fix-error-in-protocol-global-search 
Fix link in protocol global search [SCI-8195]
 2023-03-27 11:47:04 +02:00
Alex Kriuchykhin 69445f26e8
Merge pull request #5203 from okriuchykhin/ok_SCI_6931 
Update protocols migration for linked protocols [SCI-6931]
 2023-03-27 11:45:43 +02:00
Oleksii Kriuchykhin 9885dc0f29 Update protocols migration for linked protocols [SCI-6931] 2023-03-27 11:39:09 +02:00
artoscinote 5c1a5b5dc7
Merge pull request #5201 from sboursen-scinote/sb_SCI-7607-fix 
Add border to cancel button [SCI-7607]
 2023-03-27 11:18:27 +02:00
artoscinote ba57617384
Merge pull request #5195 from artoscinote/ma_SCI_8188 
Revert global modal changes [SCI-8188]
 2023-03-27 11:15:46 +02:00
sboursen-scinote e4d5732967 Add border to cancel button [SCI-7607] 2023-03-27 11:14:54 +02:00
Anton 2883b17467 Fix link in protocol global search [SCI-8195] 2023-03-27 10:50:09 +02:00
artoscinote fd1aa01730
Merge pull request #5198 from sboursen-scinote/sb_SCI-8032-fix 
Fix pixel perfect alignment in dropdown [SCI-8032]
 2023-03-27 10:20:35 +02:00
sboursen-scinote 107d602521 Fix pixel perfect alignment in dropdown [SCI-8032] 2023-03-25 03:01:45 +01:00
Alex Kriuchykhin 678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131 
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
 2023-03-24 13:58:57 +01:00
Martin Artnik 27713bbd8a Revert global modal changes [SCI-8188] 2023-03-24 13:47:40 +01:00
Martin Artnik ed469b8e11 Remove manage users permission from team admin [SCI-8131] 2023-03-24 13:32:46 +01:00
Martin Artnik b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes 
Fix tables css [SCI-8185]
 2023-03-24 13:14:38 +01:00
Alex Kriuchykhin e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment 
Update front end permission check for version comment [SCI-8160]
 2023-03-24 13:14:03 +01:00
Anton 9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00