jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity
Files
b80ce5103d0eb2bbeb1fa8ad98e546fc8c9e5d91
jami-daemon/src
History
Sébastien Blin b80ce5103d conversationrepository: avoid recursive merge 
There is no need as we always merge two branches so we can avoid
a lot of recursive operations. Moreover, this seems to cause some
weird locks

To be honest I'm not sure about the usage of this argument, doc is
still a bit unclear:

    Maximum number of times to merge common ancestors to build a
    virtual merge base when faced with criss-cross merges.
    When this limit is reached, the next ancestor will simply be used
    instead of attempting to merge it. The default is unlimited.

GitLab: #871
Change-Id: I9c22208626e7f6ff489e91b72a580238a6137499
2023-07-19 15:02:11 -04:00
..
client
media_codec: groupe AccountCodecInfo and SystemCodecInfo
2023-07-13 09:52:05 -04:00
config
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
connectivity
jamiaccount: setAccountDetails should update connection manager's config
2023-07-11 06:40:16 -04:00
im
jamiaccount: correctly pass deviceId to onMessageSent
2023-05-25 13:29:34 -04:00
jami
WhiteLabeling: Store incoming UI configuration in account details
2023-06-25 08:46:39 -04:00
jamidht
conversationrepository: avoid recursive merge
2023-07-19 15:02:11 -04:00
media
call: fix video not starting
2023-07-17 23:13:31 -04:00
plugin
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
sip
call: add support to SIP REFER
2023-07-13 17:23:24 -03:00
account_config.cpp
account_config: fix defaultModerators serialization
2023-07-07 14:49:06 -04:00
account_config.h
WhiteLabeling: Store incoming UI configuration in account details
2023-06-25 08:46:39 -04:00
account_factory.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
account_factory.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
account_schema.h
WhiteLabeling: Store incoming UI configuration in account details
2023-06-25 08:46:39 -04:00
account.cpp
media_codec: groupe AccountCodecInfo and SystemCodecInfo
2023-07-13 09:52:05 -04:00
account.h
media_codec: groupe AccountCodecInfo and SystemCodecInfo
2023-07-13 09:52:05 -04:00
archiver.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
archiver.h
misc: fix build on gcc13
2023-04-26 13:01:08 -04:00
base64.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
base64.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
buildinfo.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
call_factory.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
call_factory.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
call_set.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
call.cpp
recorder: unbind add/remove streams from the toggle
2023-03-16 13:20:19 -04:00
call.h
media_codec: groupe AccountCodecInfo and SystemCodecInfo
2023-07-13 09:52:05 -04:00
CMakeLists.txt
DRT: swarm components
2023-04-13 09:16:19 -04:00
compiler_intrinsics.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
conference_protocol.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
conference_protocol.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
conference.cpp
swarm-call: fix start call in audio only
2023-02-06 15:34:23 -05:00
conference.h
build/cmake: add unit tests
2023-06-20 14:36:37 -04:00
data_transfer.cpp
data_transfer: remove invalid file if larger than requested
2023-06-26 15:28:26 -04:00
data_transfer.h
data_transfer: fix vcard file transfer
2023-03-02 09:10:01 -05:00
debug_utils.h
contrib: ffmpeg 6.0
2023-03-14 15:49:31 -04:00
enumclass_utils.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
fileutils.cpp
misc: remove USE_STD_FILESYSTEM
2023-06-05 16:28:50 -04:00
fileutils.h
fileTransfer: copy file if both hard and softlink failed
2023-06-05 16:28:50 -04:00
gittransport.cpp
DRT: implement Distributed Routing Table
2023-04-13 09:16:19 -04:00
gittransport.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
logger.cpp
logger: use OutputDebugString when running in a debugger
2023-05-25 13:37:38 -04:00
logger.h
contrib: update opendht
2023-06-28 11:27:35 -04:00
Makefile.am
build: link archive before ssl
2023-04-26 14:39:33 -04:00
manager.cpp
call: add support to SIP REFER
2023-07-13 17:23:24 -03:00
manager.h
build/cmake: add unit tests
2023-06-20 14:36:37 -04:00
map_utils.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
meson.build
audio: remove unused dcblocker
2023-06-09 23:54:57 -04:00
noncopyable.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
observer.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
preferences.cpp
audio: enable agc by default
2023-06-02 14:41:06 -04:00
preferences.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
rational.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
registration_states.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
ring_api.cpp
dbus: stop daemon when last instance detached
2023-06-15 09:31:00 -04:00
ring_types.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
scheduled_executor.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
scheduled_executor.h
misc: fix build on gcc13
2023-04-26 13:01:08 -04:00
string_utils.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
string_utils.h
misc: fix build on gcc13
2023-04-26 13:01:08 -04:00
threadloop.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
threadloop.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
uri.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
uri.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
vcard.cpp
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
vcard.h
misc: Update copyright years to 2023
2023-02-06 01:46:45 -05:00
windirent.h
clang: change AlignConsecutiveAssignments to false
2020-08-11 16:15:24 -04:00
winsyslog.c
logger: Improve logging system
2021-08-12 19:08:45 -04:00
winsyslog.h
logger: Improve logging system
2021-08-12 19:08:45 -04:00