Commit Graph

5298 Commits

Author SHA1 Message Date
Martin
bf1e9cfcc1 Use image backup not supported from capabilities to show image supported on status screen 2020-02-05 23:04:13 +01:00
Martin
9efbea984e Enable image in capabilities 2020-02-05 23:02:14 +01:00
Martin
50ffe794cd Support for reading MBR on Linux 2020-02-05 20:41:52 +01:00
Martin
24d6669f38 Option to get bitmap via partclone 2020-02-05 20:41:10 +01:00
Martin
282a13e2b9 Merge branch '2.4.x' into 2.5.x
# Conflicts:
#	configure.ac_client
#	configure.ac_server
#	fileservplugin/CTCPFileServ.cpp
#	urbackupcommon/settingslist.cpp
#	urbackupserver/dllmain.cpp
#	urbackupserver/server_settings.cpp
#	urbackupserver/server_settings.h
#	urbackupserver/serverinterface/settings.cpp
#	urbackupserver/www/js/urbackup.js
2020-02-04 23:29:41 +01:00
Martin
3ee61e7ffe Fix check if image backup is already queued
(cherry picked from commit 8e94e4f0f7e6a2840a0bfc8a27cd31aa72de5f19)
(cherry picked from commit 8301a51eeadf22a6f7cbb5a096274d25714e33f2)
(cherry picked from commit 4ef0d22abc)
2020-02-04 23:22:18 +01:00
Martin
c21cb66912 Handle "all_nonusb" setting in image snapshot group
(cherry picked from commit 8414c2f67dbad864eb2fe7618f0c42dab040fe9d)
(cherry picked from commit 6ba3567c8e)
2020-02-04 23:21:56 +01:00
Martin
6f0776ed21 Fix SOCK_CLOEXEC removal
(cherry picked from commit ad6ef2fb7a)
2020-02-04 23:21:35 +01:00
Martin
f8a7e36bba Fix storing alert state when serialization has null bytes
(cherry picked from commit 5b55451252)
2020-02-04 23:21:02 +01:00
Martin
ba32a971fc Add accept4 fallback
(cherry picked from commit e84b49ad79)

# Conflicts:
#	socket_header.h
2020-02-04 23:20:53 +01:00
Martin
84118e6d74 Fix build issue
(cherry picked from commit b986db8d35)
2020-02-04 23:20:18 +01:00
Martin
5503f8e793 Fix build issue
(cherry picked from commit 32a97b6bc4)
2020-02-04 23:20:15 +01:00
Martin
bfbf5caf3d Fix build issue
(cherry picked from commit 09ad07c128)
2020-02-04 23:20:11 +01:00
Martin
453f35cf06 Fix rare race condition that makes indexing hange after reconnect
(cherry picked from commit bb360d7247)
2020-02-04 23:20:08 +01:00
Martin
9d311e9ec5 Work-around non-working SOCK_CLOEXEC
(cherry picked from commit 2a948af1780041af77386ec83865c30158dcda76)

# Conflicts:
#	Server.cpp
#	ServiceAcceptor.cpp
#	fileservplugin/CTCPFileServ.cpp
#	fileservplugin/CUDPThread.cpp
(cherry picked from commit 4722bc347d)

# Conflicts:
#	fileservplugin/CTCPFileServ.cpp
2020-02-04 23:19:40 +01:00
Martin
271110ab67 Add accept4 fallback
(cherry picked from commit 468782094f)

# Conflicts:
#	socket_header.h
2020-02-04 23:18:40 +01:00
Martin
5d878632e5 Fix backup_dirs_optional display + saving
(cherry picked from commit ed27df4972)

# Conflicts:
#	urbackupserver/www/js/urbackup.js
2020-02-04 23:17:06 +01:00
Martin
0e01b34628 Substract sparse extents before checking if file fits on storage
(cherry picked from commit 6a73f2832d)
2020-02-04 23:16:16 +01:00
Martin
6cfc34f9f7 Fix merge module path
(cherry picked from commit 8b32769b88)
2020-02-04 23:15:44 +01:00
Martin
46466a27dd Upgrade to Visual Studio 2019
(cherry picked from commit 9c9db8c47b)
2020-02-04 23:15:41 +01:00
Martin
b28e9ebe27 Upgrade to Visual Studio 2019
(cherry picked from commit 7030a49136)
2020-02-04 23:15:38 +01:00
Martin
44e9932b48 Upgrade to Visual Studio 2019
(cherry picked from commit efbd9e4242)
2020-02-04 23:15:35 +01:00
Martin
574e126b01 Upgrade to Visual Studio 2019
(cherry picked from commit 5d6456e2f0)
2020-02-04 23:15:32 +01:00
Martin
20b01d0463 Upgrade miniz
(cherry picked from commit d1f3611661)
2020-02-04 23:15:29 +01:00
Martin
306067864f Upgrade to Visual Studio 2019
(cherry picked from commit d6df6377ef)
2020-02-04 23:15:26 +01:00
Martin
012ea61e5e Fix waiting in condition
(cherry picked from commit bb18941f55)
2020-02-04 23:15:09 +01:00
Martin
588026f06c Upgrade miniz
(cherry picked from commit 13dc92b9ed)
2020-02-04 23:14:59 +01:00
Martin
8b32769b88 Fix merge module path 2020-01-29 22:39:40 +01:00
Martin
9c9db8c47b Upgrade to Visual Studio 2019 2020-01-29 16:19:06 +01:00
Martin
7030a49136 Upgrade to Visual Studio 2019 2020-01-29 16:12:33 +01:00
Martin
efbd9e4242 Upgrade to Visual Studio 2019 2020-01-29 16:06:42 +01:00
Martin
5d6456e2f0 Upgrade to Visual Studio 2019 2020-01-29 14:13:40 +01:00
Martin
d1f3611661 Upgrade miniz 2020-01-29 13:54:34 +01:00
Martin
d6df6377ef Upgrade to Visual Studio 2019 2020-01-29 13:54:19 +01:00
Martin
bb18941f55 Fix waiting in condition 2020-01-29 13:53:10 +01:00
Martin
13dc92b9ed Upgrade miniz 2020-01-29 13:52:17 +01:00
Martin
6a73f2832d Substract sparse extents before checking if file fits on storage 2020-01-22 12:52:57 +01:00
Martin
f6e91a70d0 Add translator 2020-01-22 12:04:39 +01:00
Martin
b90c8bc051 Fix language name 2020-01-22 12:04:25 +01:00
Martin
2d9fcb0022 Setting to only allow access to settings after the user enters a text 2020-01-19 22:56:09 +01:00
Martin
ed27df4972 Fix backup_dirs_optional display + saving 2020-01-19 22:31:50 +01:00
Martin
468782094f Add accept4 fallback 2020-01-17 17:18:03 +01:00
Martin
ad6ef2fb7a Fix SOCK_CLOEXEC removal 2020-01-17 17:16:04 +01:00
Martin
5b55451252 Fix storing alert state when serialization has null bytes 2020-01-17 16:50:27 +01:00
Martin
dbde857bac Add accept4 fallback 2020-01-17 16:22:48 +01:00
Martin
e84b49ad79 Add accept4 fallback 2020-01-17 16:18:34 +01:00
Martin
b986db8d35 Fix build issue 2020-01-17 15:09:30 +01:00
Martin
32a97b6bc4 Fix build issue 2020-01-17 14:23:15 +01:00
Martin
09ad07c128 Fix build issue 2020-01-17 14:21:49 +01:00
Martin
bb360d7247 Fix rare race condition that makes indexing hange after reconnect 2020-01-17 12:41:57 +01:00