Commit Graph

12 Commits

Author SHA1 Message Date
Martin Raiber
19b17f8af2 Fixed segfault on failed connection 2012-05-12 16:44:49 +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
1b6c290baa Better error messages 2012-05-10 02:15:33 +02:00
Martin Raiber
fd8ebfdb15 Added throttling and some backup info output 2012-05-08 19:45:45 +02:00
Martin Raiber
7dbea1cdc1 Fixed file path prefixing 2012-05-01 00:24:46 +02:00
Martin Raiber
4b9a88f14f Allow server-side starting and stopping of backups 2012-04-25 15:59:20 +02:00
Martin Raiber
7239ccc3df Added file backup archival 2012-04-21 20:45:59 +02:00
Martin Raiber
eee1e1f0bb Further work on internet mode 2012-04-15 16:21:28 +02:00
Martin Raiber
295d5c0676 New bandwidth saving file difference download method 2012-04-05 00:55:20 +02:00
Martin Raiber
7586582ade Better authentication, Hashed file transfers, better logging in fileserver, more internet mode options 2012-03-10 01:54:39 +01:00
Martin Raiber
948337fe39 New Internet mode 2012-03-07 19:11:40 +01:00
Martin Raiber
fe33d9b31d Reorganized directory structure 2012-02-25 02:45:06 +01:00