scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
17395 commits 69 branches 179 tags 166 MiB
Commit graph

17395 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Artnik e7b4fd0151
Merge pull request #7809 from artoscinote/ma_SCI_10988 
Properly handle experiments with hidden tasks in navigator [SCI-10988]
 2024-08-21 11:09:35 +02:00
ajugo b380a009d8
Merge pull request #7808 from rekonder/aj_SCI_10997 
Fix inventory item counter on inventory page [SCI-10997]
 2024-08-21 11:09:16 +02:00
Martin Artnik 531cdbf23c Properly handle experiments with hidden tasks in navigator [SCI-10988] 2024-08-21 11:06:02 +02:00
Andrej dd42485cd4 Fix inventory item counter on inventory page [SCI-10997] 2024-08-20 17:28:53 +02:00
ajugo 59ca89fce1
Merge pull request #7807 from rekonder/aj_SCI_10995 
Fix collapsing of results [SCI-10995]
 2024-08-20 16:41:24 +02:00
Andrej 7e0cd6bd10 Fix collapsing of results [SCI-10995] 2024-08-20 16:26:32 +02:00
dependabot[bot] 5ff3dad416
Bump elliptic from 6.5.4 to 6.5.7 (#7804) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.4 to 6.5.7.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7)

---
updated-dependencies:
- dependency-name: elliptic
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-20 14:54:31 +02:00
Alex Kriuchykhin e561594a47
Fix permissions checking user assignments scopes [SCI-10991] (#7805) 2024-08-20 14:47:32 +02:00
Martin Artnik 3c877625ed
Merge pull request #7802 from okriuchykhin/ok_SCI_10991_v2 
Fix listing of globally shared inventories [SCI-10991]
 2024-08-20 12:15:51 +02:00
dependabot[bot] ff30b5b669
Bump fugit from 1.8.1 to 1.11.1 (#7801) 
Bumps [fugit](https://github.com/floraison/fugit) from 1.8.1 to 1.11.1.
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/floraison/fugit/compare/v1.8.1...v1.11.1)

---
updated-dependencies:
- dependency-name: fugit
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-20 11:29:09 +02:00
Oleksii Kriuchykhin 0cd2493f8b Fix listing of globally shared inventories [SCI-10991] 2024-08-20 11:26:57 +02:00
Martin Artnik 512b03a48b
Merge pull request #7800 from okriuchykhin/ok_SCI_10991 
Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994]
 2024-08-19 18:00:43 +02:00
Oleksii Kriuchykhin 9eee05f906 Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994] 2024-08-19 17:37:04 +02:00
Martin Artnik 495618abe4 Merge branch 'develop' into features/repository-permissions-rework 2024-08-14 15:06:18 +02:00
Martin Artnik 83057e7c5e
Merge pull request #7798 from scinote-eln/develop 
August 2024 Release
 2024-08-14 09:29:07 +02:00
Martin Artnik ca4ecf4b97
Bump version to 1.36.1 2024-08-14 09:28:03 +02:00
Martin Artnik 257ae029b6
Lock version of puppeteer [SCI-10981] (#7797) 2024-08-13 13:46:08 +02:00
Martin Artnik f175c340ae
Merge pull request #7796 from artoscinote/ma_SCI_10980 
Don't show content toolbar if no inserts are available [SCI-10980]
 2024-08-13 13:37:41 +02:00
Martin Artnik 2370cfaf15 Don't show content toolbar if no inserts are available [SCI-10980] 2024-08-13 13:24:37 +02:00
Martin Artnik 82ebac9cc1
Merge pull request #7792 from okriuchykhin/ok_SCI_10972 
Prevent repository access to users without repository READ permission on team level [SCI-10972]
 2024-08-12 13:05:19 +02:00
Martin Artnik ce4f79e645
Merge pull request #7794 from artoscinote/ma_SCI_10975 
Fix stock field in item card for disabled stock management [SCI-10975]
 2024-08-12 12:51:34 +02:00
Martin Artnik 551c23e709 Fix stock field in item card for disabled stock management [SCI-10975] 2024-08-12 12:50:03 +02:00
Martin Artnik 0b059899b5
Merge pull request #7793 from artoscinote/ma_SCI_10970 
Don't fail report if a TinyMCE image variant fails to generate [SCI-10970]
 2024-08-12 12:31:57 +02:00
Martin Artnik 7f25e8e474 Don't fail report if a TinyMCE image variant fails to generate [SCI-10970] 2024-08-12 12:28:55 +02:00
Oleksii Kriuchykhin ac32b5b04a Prevent repository access to users without repository READ permission on team level [SCI-10972] 2024-08-12 10:54:35 +02:00
aignatov-bio 8c713c9cd9
Merge pull request #7790 from aignatov-bio/ai-sci-10961-add-reminders-to-storage-locations 
Add reminders to storage locations [SCI-10961]
 2024-08-08 11:59:09 +02:00
Anton fb8d7e5741 Add reminders to storage locations [SCI-10961] 2024-08-08 11:58:27 +02:00
Martin Artnik 3a6888b276
Merge pull request #7788 from aignatov-bio/ai-sci-10968-fix-insert-content-toolbar 
Hide action toolbar on collapsed result [SCI-10968]
 2024-08-08 10:07:16 +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
aignatov-bio 62fde0fb47
Merge pull request #7787 from aignatov-bio/ai-sci-10965-archived-task-card-issue 
Fix button style on archive cards [SCI-10965]
 2024-08-07 12:04:13 +02:00
Anton 8d942d857f Hide action toolbar on collapsed result [SCI-10968] 2024-08-07 11:53:00 +02:00
Anton ee16df9014 Fix button style on archive cards [SCI-10965] 2024-08-07 11:39:43 +02:00
aignatov-bio 28333e94ed
Merge pull request #7786 from aignatov-bio/ai-sci-10960-fix-bold-tooltip 
Fix shared task tooltip [SCI-10960]
 2024-08-07 11:22:42 +02:00
Martin Artnik c43a730972 Fix Grover config [SCI-10931] 2024-08-06 17:42:58 +02:00
Martin Artnik f64ea95989 Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-08-06 17:41:04 +02:00
aignatov-bio 76269a096c
Merge pull request #7785 from aignatov-bio/ai-sci-10959-fix-css-for-storage-locations 
Fix css for storage locations [SCI-10959]
 2024-08-06 15:40:18 +02:00
Anton 3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +02:00
aignatov-bio f2ed356f85
Merge branch 'features/storage-locations' into ai-sci-10959-fix-css-for-storage-locations 2024-08-06 15:16:03 +02:00
Anton 0dd371abea Fix css for stroge locations [SCI-10959] 2024-08-06 15:13:21 +02:00
KlemenSciNote 3f508d325f
Merge pull request #7784 from KlemenSciNote/kb_SCI-10963_e2e-fix-protocol-status-button-attribute 
Fix task protocol status button data-e2e [SCI-10963]
 2024-08-06 14:20:24 +02:00
Klemen Benedicic df81db30a8 Fix task protocol status button data-e2e [SCI-10963] 2024-08-06 14:00:17 +02:00
Alex Kriuchykhin bc4b010fa2
Optimize repository export jobs [SCI-10940] (#7783) 2024-08-06 13:26:14 +02:00
Martin Artnik 4f7000a68f
Merge pull request #7782 from scinote-eln/revert-7678-ma_SCI_10809 
Revert "Timeout slow libreoffice preview generation [SCI-10809]"
 2024-08-06 10:59:03 +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
KlemenSciNote 05948ff9ec
Merge pull request #7781 from KlemenSciNote/kb_SCI-10943_data-e2e-storage-locations 
Add data-e2e to storage locations for Pendo [SCI-10943]
 2024-08-06 10:54:32 +02:00
KlemenSciNote 83eee9c72b
Merge pull request #7777 from KlemenSciNote/kb_SCI-10956_data-e2e-protocol-templates 
Add data-e2e to publish, delete draft and linked tasks modals [SCI-10956]
 2024-08-06 10:53:51 +02:00
Klemen Benedicic b964a41e88 Merge branch 'features/storage-locations' into kb_SCI-10943_data-e2e-storage-locations 2024-08-06 09:22:12 +02:00
Klemen Benedicic 666b8badcf Add data-e2e on storage locations for Pendo [SCI-10943] 2024-08-06 09:03:00 +02:00
Martin Artnik 85c5da7c7a
Bump version to 1.36.0.1 2024-08-05 13:48:23 +02:00
aignatov-bio 3c1691ab2c
Merge pull request #7780 from aignatov-bio/ai-sci-10946-add-private-rows-to-storage-locations 
Add private items to storage location [SCI-10946]
 2024-08-05 12:44:33 +02:00