Commit Graph

496 Commits

Author SHA1 Message Date
Martin Raiber
71d2866d70 Reset bandwidth more often 2012-05-12 21:27:20 +02:00
Martin Raiber
07952b8fd1 Fixed linux build 2012-05-12 21:15:22 +02:00
Martin Raiber
879b926517 Fixed bug in new transfer mode 2012-05-12 18:49:32 +02:00
Martin Raiber
19b17f8af2 Fixed segfault on failed connection 2012-05-12 16:44:49 +02:00
Martin Raiber
fe8ef042c5 Merge remote branch 'origin/master' into next
Conflicts:
	Makefile.am_server
	configure.ac_server
	start_urbackup_server
2012-05-10 03:32:19 +02:00
Martin Raiber
e1a45b4b6e Merge branch 'master' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend 2012-05-10 03:28:05 +02:00
Martin Raiber
e89d322423 Remove _exit definition 2012-05-10 03:26:41 +02:00
Martin Raiber
42955a7e04 Merge branch 'master' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-10 03:24:32 +02:00
Martin Raiber
55d8222e4d Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next
Conflicts:
	configure.ac_server
	start_urbackup_server
	urbackupserver/server_hash.cpp
	urbackupserver/www/index.htm
2012-05-10 03:20:50 +02:00
Martin Raiber
98cf1943a0 Fixed linux build 2012-05-10 03:11:43 +02:00
Martin Raiber
6d4f8b373c Merge remote branch 'origin/master' into next
Conflicts:
	urbackup/ClientService.cpp
	urbackup/glob/glob.cpp
	urbackup/www/templates.js
	urbackup/www/templates/settings_inv_row.htm
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupserver/dllmain.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_get.h
	urbackupserver/server_hash.cpp
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/urbackupserver.vcxproj.filters
	urbackupserver/www/templates/settings_user.htm
	urbackupserver/www/translation.js
	urbackupserver/www/urbackup.js
2012-05-10 03:10:51 +02:00
Martin Raiber
0b63c6ccbf Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-10 02:16:00 +02:00
Martin Raiber
1b6c290baa Better error messages 2012-05-10 02:15:33 +02:00
Martin Raiber
e931bcc865 Handle dynamic volumes
Conflicts:

	urbackup/ClientService.cpp
2012-05-10 01:56:36 +02:00
Martin Raiber
b7d0214c34 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-08 20:37:09 +02:00
Martin Raiber
fd8ebfdb15 Added throttling and some backup info output 2012-05-08 19:45:45 +02:00
Martin Raiber
5b11a9f305 Fixed file client reconnecting 2012-05-06 01:56:51 +02:00
Martin Raiber
7d91c3ed5a Retry starting shadow copy if it failes due to a SNAPSHOP_SET_IN_PROGRESS error 2012-05-05 19:20:37 +02:00
Martin Raiber
06f26c08fe Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-05 19:03:37 +02:00
Martin Raiber
86a71b1fd4 Properly reinitialize hash function 2012-05-05 19:03:15 +02:00
Martin Raiber
0f7f0ddf03 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-04 00:20:46 +02:00
Martin Raiber
a58ef2e43f Optimized SQL 2012-05-04 00:20:20 +02:00
Martin Raiber
12ec21534e Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-03 23:59:16 +02:00
Martin Raiber
b726acd21d Asynchronous statistics generation 2012-05-03 23:58:51 +02:00
Martin Raiber
1bac3930d2 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-05-03 23:19:52 +02:00
Martin Raiber
33c4d13a7f Fixed web interface bugs 2012-05-03 23:19:29 +02:00
Martin Raiber
57fff57be4 Show image backups of offline clients 2012-05-03 23:17:25 +02:00
Martin Raiber
3b910471f4 Stop backups during image reconnect 2012-05-03 23:14:15 +02:00
Martin Raiber
e23bf024b3 Correct mail sender format 2012-05-02 12:25:35 +02:00
Martin Raiber
82f0f53145 Added an archive window 2012-05-01 00:25:14 +02:00
Martin Raiber
7dbea1cdc1 Fixed file path prefixing 2012-05-01 00:24:46 +02:00
Martin Raiber
29381ba04a Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-04-28 14:21:29 +02:00
Martin Raiber
5208061e95 Fixed template 2012-04-28 14:21:12 +02:00
Martin Raiber
d18573725b Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-04-28 13:58:06 +02:00
Martin Raiber
4b9a88f14f Allow server-side starting and stopping of backups 2012-04-25 15:59:20 +02:00
Martin Raiber
70b4bc4932 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-04-21 21:57:53 +02:00
Martin Raiber
8db5afbec3 Fixed bugs in chunked transfer mode 2012-04-21 21:57:12 +02:00
Martin Raiber
7239ccc3df Added file backup archival 2012-04-21 20:45:59 +02:00
Martin Raiber
744cbd7df6 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-04-18 14:11:42 +02:00
Martin Raiber
dbcf1eaf13 Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-04-18 14:11:03 +02:00
Martin Raiber
e927197894 Updated sqlite to ver 3.7.11 2012-04-18 14:10:08 +02:00
Martin Raiber
aa173743ec Fixed client build on Linux 2012-04-17 23:53:43 +02:00
Martin Raiber
7ec132ab4b Fixed client build on Linux 2012-04-16 01:18:36 +02:00
Martin Raiber
eee1e1f0bb Further work on internet mode 2012-04-15 16:21:28 +02:00
Martin Raiber
1ee9f9a233 Added compression for internet connection 2012-04-15 16:19:27 +02:00
Martin Raiber
295d5c0676 New bandwidth saving file difference download method 2012-04-05 00:55:20 +02:00
Martin Raiber
bfb8963c52 Fixed build 2012-04-03 23:34:33 +02:00
Martin Raiber
5c7658909a Incremented server version 2012-04-02 22:07:52 +02:00
Martin Raiber
58e4540640 Correctly set settings if the client did not modify settings yet 2012-03-29 16:05:08 +02:00
Martin Raiber
067f21a443 Changed pause behavior to not time out during image backups 2012-03-28 02:24:26 +02:00