alkem-io / server

14%

develop: 14%

LAST BUILD ON BRANCH conflicts

branch: conflicts

CHANGE BRANCH

x

Reset

• conflicts
• 0.89.0-rc
• 7305
• DonnaDuiker-patch-1
• SimoneZaza-patch-1
• SimoneZaza-patch-2
• StorageAgg-parent-displayName
• account
• account-storage-aggregator
• accountAuth
• accountCreateSaveAwait
• accountMigrationCredentialsFix
• activity-feed
• activity-filter-fix
• activity-filter-fix++
• activity-filter-new-fixes
• add-data-migration-for-vc-interaciton
• add-ingest-space-mutation
• add-license-lookup
• add-powerpoint-mimetypes
• agent-info
• agentInfoCache
• ai-config-fixes
• ai-event-bus-fixes
• ai-event-bus-initial-setup
• alkemio-1368
• alkemio-1456/async-guidance-and-cleanup
• alkemio-1456/async-proper-cleanup
• alkemio-1456/async-vc-engine-invokation
• assignLicensePlans
• atomic-creation
• auth
• auth-fix
• auth-fixes
• auth-more
• auth-reset-queue
• authFix
• authMessage
• authOptimization
• authRestAiServer
• authSaveAccount
• authTypes
• authentication-type
• authorization-lookup
• authorizationResetLogging
• auto-save
• backup-fix
• backup-scripts
• boostrap
• bootstrap2
• bug-fixes-knowledgebase
• build-fix
• bump
• callout-templates
• chat-guidance
• circular
• cleanup-roles-migration
• client-3879
• client-4101
• client-4180
• client-4194
• client-4287
• client-4347
• client-4360
• client-4476
• client-4534
• client-4539
• client-4539-discussion
• client-4565
• client-4588
• client-4621
• client-4673
• client-4673-from-develop
• client-4690a
• client-4744
• client-4744-ns-b
• client-4753
• client-4768
• client-4789
• client-4789-fix
• client-4799
• client-4836
• client-4947
• client-4982
• client-5011
• client-5014
• client-5019
• client-5158
• client-5188
• client-5214
• client-5290
• client-5308
• client-5317
• client-5331
• client-5387
• client-5390
• client-5405-sort-collections
• client-5477
• client-5502
• client-5505
• client-5557
• client-5571
• client-5625
• client-5626
• client-5644
• client-5645
• client-5649
• client-5747
• client-5748
• client-5777
• client-5815
• client-5902
• client-5903-fix-where
• client-5914
• client-5921
• client-5923
• client-5923-update
• client-5969
• client-6018
• client-6080
• client-6092
• client-6108
• client-6109
• client-6219
• client-6238
• client-6256
• client-6256-variables
• client-6283-ws-inactivity
• client-6293
• client-6293-2
• client-6305
• client-6306
• client-6329
• client-6437
• client-6437-2
• client-6440
• client-6520-vc-thread-limitations
• client-6567
• client-6625
• client-6647
• client-6690
• client-6801
• client-6801-args
• client-6844
• client-6876
• client-6977
• client-6989-sentry
• client-6999
• client-7011
• client-7023
• client-7255b
• client-7296
• client-7327
• client-7357
• client-7357b
• client-7363-vc-knowledge-update
• client-7465
• client-7500
• client-7535
• client-7598
• client-7634
• client-blogVariable
• client-missingDefaultInnovationFlowMutation
• coderabbit
• coderabbit-yml-tests
• commit-fixes
• community-add-member
• communityPolicyParentCred
• communityPriv
• communityPrivileges
• compose
• config
• config-vcs
• conflict
• contribution-events
• createdDate
• createdUpdatedDate
• data-integrity
• data-integrity-b
• dataloader-auto-resolve
• dataloader-auto-resolver2
• dataloader-order
• db-fix
• debug-kratos-do-not-delete
• decompress-inapp
• delete-kratos-identity
• delete-vc
• develop
• doc-setup-update
• doc-update
• docker-depends
• docs-location
• documentAUthorization
• documentLookup
• documents-auth
• dont-override-persona-service-bok-id
• entitlements
• excalidraw-amqp
• expire-pat
• feature-account-spaces
• feature-multiple-spaces-in-account
• fetch-sockets
• fetch-sockets-dev
• fieldsRequired
• file-service
• files
• filter-orphan-spaces
• filter-orphans
• fix-access-collaboration-calloutset-license
• fix-active-sub-on-account
• fix-active-subscription
• fix-anonymous-visual
• fix-archived-ch-opp
• fix-assign-license-plan
• fix-assign-subspace-license
• fix-auth
• fix-auth-privileges
• fix-bootstrap
• fix-broken-accounts-migration
• fix-callout-create
• fix-callout-templates
• fix-calloutNameID-edge-case
• fix-contributors
• fix-create-vc-license
• fix-dashboard-access
• fix-delete-whiteboard
• fix-deleted-vc
• fix-demo-space-search-visibility
• fix-demo-space-visibility
• fix-dev-migration
• fix-engines
• fix-file-upload
• fix-get-context-collection-id
• fix-initial-avatar
• fix-json
• fix-knowledge-mapping
• fix-knowledge-space-lookup
• fix-leave-community
• fix-migration-generate
• fix-migrations
• fix-my-account
• fix-my-whiteboard-update
• fix-org
• fix-platform-auth-reset
• fix-policy
• fix-private-applications
• fix-privilege-self-user
• fix-profile-type
• fix-scripts
• fix-search
• fix-search-performance
• fix-search-post
• fix-storageagg-query
• fix-tagset-template-subspace
• fix-updateCalloutVisibility
• fix-upload-reference
• fix-user-deletion
• fix-user-group
• fix-vc-auth
• fix-vc-creation
• fix-vc-updated-filter
• fix-vcs
• fix-wallet-manager
• fix-whiteboard-content
• fix-whiteboardTemplateAuthType
• fix/faster-auth
• fixes
• format-vc-answer-soruces-as-markdown
• generic-auth-loading
• globalSupportOrgUpdate
• grant-communityAddMember-to-support
• graphiql
• guards
• guidance-engine-fixes
• guidance_v4
• image-documents
• improve-subscription-performance
• in-app-contributor
• increase-pdf-size
• infra-1040
• infra-1159
• infra-1355-probes
• infra-910
• infra-910-b
• infra-ops-1071
• infra-ops-1122
• infra-ops-765
• infra-ops-942
• infrastructure-operations-1123
• infrastructure-operations-1229
• ingest-docs-and-spreadsheets
• ingest-space-63/ingest-knowledge-base
• ingestion
• initial-schema
• innovation-hub-account
• innovationFlowTemplate
• innovationHubCreate
• introduce-alkemio-vc-engine-for-generic-and-assistant
• invitation_pending
• invitationsPrivateSubspaces
• ipfs-duplex-upload
• issue-templates
• kratos-config-fix
• licensePlanType
• licenseRevoke
• lifecycleInit
• limit-history-and-add-vc-personality
• log.error
• logger
• logging
• logging-auth-docs
• lookup-authorization
• lookup-storage
• lookupByName
• lookupSpace2
• manifests
• master
• master-changes
• master-to-develop-0.95
• matrix-44
• matrixAdapterAPI
• me-refactor
• memberJoined
• migrate-chroma-collection-names
• migration-baseline
• migration-empty-engine-fix
• migration-fix
• migration-fix-2
• migration-ih-storagebuckets
• migration-safely-drop-fk
• missing-decorator
• missing-in-app
• msgFix
• multi-whiteboards
• my-dashboard
• my-root-spaces
• mysql-cluster
• nameID
• nameid-generation
• no_own_activity_error_fix
• notif-321-invite-vc
• notif-3932-create-space
• notifications-258
• notifications-268
• notifications-283
• notifications-286
• notifications-315
• notifications-328
• notifications-368
• optimize-auth
• optimize-spaces
• optionalNameID
• orgRoleSet
• orgVerification
• orgizationAuth
• packages
• patch
• patch-fix-get-context-collection-id
• patch-postsWithoutComments
• patch-vcs
• patch-virtual-contributor-auth
• performance-recent-journeys
• properly-load-ai-persona-service-id
• quickstart
• recentJourney-error-fix
• redis-timeout
• refactor
• release-0.95
• release-discussion-url
• release-v0.99-patch1
• release-vc-mvp
• release-whiteboard-templates
• release-whiteboards
• release/async-vc
• release/homepage
• release/oathkeeper
• release/release-8
• release/release-9
• release/search-callouts
• release/search-posts
• remove-defaults-check
• remove-ipfs
• remove-license-visibility
• reverse-new-callout-sort-order
• revert-unwanted-changes-in-quickstart-services
• roleExternalInvites
• roles
• run-space-ingest-trough-compose
• safe-migration
• search
• search-inde
• search-poc
• search-types
• search-updates
• searchFix
• secure-elastic
• server-1409-integrate-external-openai
• server-2061
• server-2164
• server-2329
• server-2329-fix
• server-2778
• server-2863
• server-2881
• server-2950
• server-2958
• server-2989
• server-3026
• server-3067
• server-3095
• server-3097
• server-3103
• server-3106
• server-3111
• server-3113
• server-3123
• server-3125
• server-3129
• server-3140
• server-3156
• server-3166
• server-3170
• server-3172
• server-3176
• server-3184
• server-3187
• server-3188
• server-3190
• server-3194
• server-3200
• server-3212
• server-3222
• server-3222-me-query
• server-3225
• server-3235
• server-3237
• server-3238
• server-3243
• server-3246
• server-3248
• server-3251
• server-3257
• server-3259
• server-3260
• server-3264
• server-3265
• server-3268
• server-3278b
• server-3283
• server-3298
• server-3304
• server-3306
• server-3314
• server-3314-b
• server-3317
• server-3319
• server-3323
• server-3333
• server-3335
• server-3335-ff
• server-3339
• server-3339-merge
• server-3346
• server-3356
• server-3366
• server-3366-auth
• server-3370
• server-3389
• server-3390
• server-3400
• server-3407
• server-3409
• server-3430
• server-3439
• server-3443
• server-3445
• server-3451
• server-3464
• server-3469
• server-3498
• server-3508
• server-3510
• server-3514
• server-3514-b
• server-3516
• server-3520
• server-3523
• server-3532
• server-3535
• server-3547
• server-3552
• server-3556
• server-3557-b
• server-3565-sve
• server-3568
• server-3568b
• server-3568b-dep
• server-3569
• server-3574
• server-3575
• server-3583
• server-3588
• server-3589
• server-3605
• server-3615
• server-3617
• server-3623
• server-3629
• server-3630
• server-3631
• server-3631-fix-parent-data-retrieval
• server-3631-refetch-grouped-activity
• server-3631-separate-grouping
• server-3635
• server-3650
• server-3652
• server-3656
• server-3662
• server-3666
• server-3669
• server-3674
• server-3685
• server-3695
• server-3708
• server-3711
• server-3731
• server-3733
• server-3738
• server-3740
• server-3741
• server-3761
• server-3762
• server-3763
• server-3766
• server-3767
• server-3777
• server-3779
• server-3780
• server-3782
• server-3810
• server-3813
• server-3815
• server-3827
• server-3832
• server-3835
• server-3842
• server-3851
• server-3852
• server-3857
• server-3860
• server-3870
• server-3895
• server-3900
• server-3903
• server-3908
• server-3909
• server-3911
• server-3916
• server-3928
• server-3934
• server-3940
• server-3949
• server-3951
• server-3954
• server-3962
• server-3963
• server-3993
• server-3994
• server-4004
• server-4010
• server-4010-ai-persona-meta
• server-4036
• server-4037
• server-4046
• server-4059
• server-4070
• server-4073
• server-4083
• server-4088
• server-4097
• server-4099
• server-4102
• server-4103
• server-4103-b
• server-4104
• server-4105
• server-4108
• server-4114
• server-4121
• server-4122
• server-4126
• server-4127
• server-4144
• server-4149
• server-4150
• server-4151-migration-fix
• server-4158
• server-4161
• server-4167
• server-4169
• server-4176
• server-4178
• server-4188
• server-4201b
• server-4203
• server-4222
• server-4223-vc-invite-fix
• server-4225
• server-4227
• server-4232
• server-4235
• server-4240
• server-4247
• server-4247b
• server-4248
• server-4251
• server-4253
• server-4255
• server-4257
• server-4271
• server-4282
• server-4287
• server-4288
• server-4295
• server-4299b
• server-4302
• server-4305
• server-4305b
• server-4327
• server-4333
• server-4333b
• server-4337
• server-4342
• server-4347
• server-4349
• server-4351
• server-4358
• server-4373
• server-4385
• server-4387
• server-4401-ingest-space-feedback
• server-4401-ingest-space-feedback-exchange-recreation
• server-4402
• server-4402b
• server-4405-tempStorage
• server-4409
• server-4409b
• server-4416
• server-4417
• server-4425
• server-4431
• server-4436
• server-4437
• server-4445
• server-4448
• server-4448b
• server-4449
• server-4463
• server-4464
• server-4467
• server-4469
• server-4479
• server-4481
• server-4502
• server-4517
• server-4523
• server-4524
• server-4535
• server-4545
• server-4563
• server-4568b
• server-4582
• server-4585
• server-4616
• server-4619
• server-4628
• server-4649
• server-4650
• server-4673
• server-4677
• server-4697
• server-4710-spaceAuth
• server-4742
• server-4745
• server-4756
• server-4758
• server-4759
• server-4772
• server-4790
• server-4791-space-default-private
• server-4805
• server-4808
• server-4810
• server-4812/fix-creation
• server-4812/fix-deletion
• server-4817
• server-4821
• server-4823
• server-4852
• server-4861
• server-4861-sb
• server-4873
• server-4895
• server-4900
• server-4903
• server-4912
• server-4921
• server-4923
• server-5031
• server-5057
• server-5109
• server-5166
• server-5168
• server-5302
• server-5449
• server-5547
• server-5827
• server-6477
• server-7472
• server-942
• server-wb
• session-extend
• session-extend-dev
• socket-io-redis
• space-creation
• space-nameID
• spaceAdminCreateVC
• spaceLibraryDefaults
• spaceLookup
• spaceQueryFix
• sql-modes
• storage
• storage-flag
• storageBucketAuth
• sub-default-callouts
• subspace-fixes
• subspace-templates-fixes-3
• subspaceTemplates
• subspaces-fixes
• subspacetemplates-fixes-2
• tagset-fix
• tasks
• templates
• templates-updated
• test-270
• test-270-fix-post-nameID
• test-290
• timezone
• tokenDecodingFeedback
• unused-auth-cleanup
• unused-class
• update-callouts
• update-corpus
• update-guidance-engine
• update-vc-interactions-with-subscriptions-web-6649-6650
• update-version
• update-wb-collaboration-service
• userPreferencesPrivilege
• userRegPatch
• userRegistration
• uuid-validation
• vc-1314-rework-virtual-persona-contributor-model
• vc-creation-fix
• vc-flag
• vc-no-unique-names
• vc-patch
• vcInvitations
• version
• version-bump
• virtual-contributor-mentions
• virtual-contributor-migrations
• virtual-contributor-vc-sender
• virtualContributor
• volta
• vp-profile-fix
• wb-48
• wb-fix
• wb-master
• wb-mode
• wb-save
• wb-templates-not-saving
• whiteboard-collaboration-service-8
• whiteboard-previews-fix
• whiteboard-rt-contributor
• whiteboardRtDouble
• whiteboardRtPrivilege
• whiteboards