Commit Graph

11 Commits

Author SHA1 Message Date
Martin Raiber
0299edd5ec Fixed bug in chunked transfer mode 2012-07-02 17:03:56 +02:00
Martin Raiber
2ce2ae71b0 Fixed errors when internet mode is disabled 2012-05-17 02:16:39 +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
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
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
7dbea1cdc1 Fixed file path prefixing 2012-05-01 00:24:46 +02:00
Martin Raiber
8db5afbec3 Fixed bugs in chunked transfer mode 2012-04-21 21:57:12 +02:00
Martin Raiber
eee1e1f0bb Further work on internet mode 2012-04-15 16:21:28 +02:00
Martin Raiber
a9fcbd5767 Changed behaviour on hardlink error 2012-03-16 19:28:11 +01:00
Martin Raiber
ec592dc908 Fixed small errors; Reduced log messages 2012-03-16 19:26:36 +01:00
Martin Raiber
fe33d9b31d Reorganized directory structure 2012-02-25 02:45:06 +01:00