Commit Graph

35 Commits

Author SHA1 Message Date
Martin
593e762e90 New function to read files whose size is not known beforehand
(cherry picked from commit 4a9ef9cb8ddcbe075a90000c411db131ad39033b)
2016-11-24 01:45:48 +01:00
Martin
bf43f5229f Improved string case conversion 2016-02-03 20:18:00 +01:00
Martin
9bab514e22 Removed UTF16 string (std::wstring) in most places. UTF8 everywhere! 2015-12-13 16:17:36 +01:00
Martin
0123fd1b14 Improved EscapeParamString 2015-12-11 12:30:36 +01:00
Martin
6447563c2e Merge remote-tracking branch 'urpc/next' into dev
Conflicts:
	.gitignore
	Interface/Database.h
	configure.ac_client
	configure.ac_server
	fileservplugin/CClientThread.cpp
	fileservplugin/CClientThread.h
	fileservplugin/FileServFactory.cpp
	fileservplugin/FileServFactory.h
	fileservplugin/IFileServFactory.h
	fsimageplugin/FSImageFactory.cpp
	fsimageplugin/FSImageFactory.h
	fsimageplugin/FileWrapper.cpp
	fsimageplugin/FileWrapper.h
	fsimageplugin/IFSImageFactory.h
	fsimageplugin/Makefile.am_client
	fsimageplugin/Makefile.am_server
	fsimageplugin/dllmain.cpp
	fsimageplugin/filesystem.cpp
	fsimageplugin/filesystem.h
	fsimageplugin/fs/ntfs.cpp
	fsimageplugin/fs/ntfs.h
	fsimageplugin/fs/ntfs_win.cpp
	fsimageplugin/fs/ntfs_win.h
	fsimageplugin/fs/unknown.cpp
	fsimageplugin/fs/unknown.h
	fsimageplugin/fsimageplugin.vcxproj.filters
	start_urbackup_client
	start_urbackup_server
	urbackupclient/ChangeJournalWatcher.cpp
	urbackupclient/ClientService.cpp
	urbackupclient/ClientServiceCMD.cpp
	urbackupclient/ImageThread.cpp
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupclient/client_restore.cpp
	urbackupclient/clientdao.cpp
	urbackupclient/dllmain.cpp
	urbackupclient/win_sysvol.cpp
	urbackupclient/win_sysvol.h
	urbackupcommon/fileclient/FileClient.cpp
	urbackupcommon/fileclient/FileClientChunked.cpp
	urbackupcommon/os_functions.h
	urbackupcommon/os_functions_lin.cpp
	urbackupcommon/os_functions_win.cpp
	urbackupcommon/settingslist.cpp
	urbackupserver/ImageBackup.cpp
	urbackupserver/SQLiteFileCache.cpp
	urbackupserver/ServerDownloadThread.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/dao/ServerBackupDao.h
	urbackupserver/dllmain.cpp
	urbackupserver/doc/admin_guide.tex
	urbackupserver/server_channel.cpp
	urbackupserver/server_channel.h
	urbackupserver/server_cleanup.cpp
	urbackupserver/server_dir_links.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_hash.cpp
	urbackupserver/server_hash.h
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/server_update_stats.cpp
	urbackupserver/server_writer.cpp
	urbackupserver/serverinterface/backups.cpp
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/serverinterface/usage.cpp
	urbackupserver/www/js/urbackup.js
	urbackupserver/www/templates.js
	urbackupserver/www/templates/settings_inv_row.htm
	urbackupserver/www/translations/urbackup.webinterface/ar_SA.po
2015-12-09 14:49:13 +01:00
plucid
7ceac9be75 Buildfixes for newer libraries
A few minor fixes are needed to compile with the VC++ 2013 headers and Boost 1.50 or later.

Include <algorithm> so std::min/max is available.

Get rid of unused 'int round(float)' which conflicts with 'float round(float)' in <cmath>.

boost::TIME_UTC is now boost::TIME_UTC_, as of 1.50.  Use an #if BOOST_VERSION to choose the proper name.
2015-02-05 01:02:35 -08:00
Martin
deb80364a6 Merge branch 'fileaccess' into fileentryindex
Conflicts:
	.gitignore
	common/miniz.c
	urbackupclient/ChangeJournalWatcher.cpp
	urbackupclient/ChangeJournalWatcher.h
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/dao/ServerBackupDao.h
	urbackupserver/dllmain.cpp
	urbackupserver/server_download.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_get.h
	urbackupserver/server_hash.cpp
	urbackupserver/server_hash.h
	urbackupserver/server_settings.h
	urbackupserver/serverinterface/create_zip.cpp
	urbackupserver/urbackupserver.vcxproj.filters
2014-10-11 14:17:42 +02:00
Martin Raiber
9483ae1042 Properly handle backslashes in paths on Linux servers 2014-09-20 17:22:25 +02:00
Martin
541c4af567 Change server permission management to ACL style 2014-09-14 22:29:56 +02:00
Martin
a5d8ee55b5 Don't do sql escaping in most places 2014-05-14 19:05:30 +02:00
Martin
9e561fe59f Treat ' ' as '+' in base64 decode function and removed parameter parsing function 2014-05-14 18:16:18 +02:00
Martin
32c50d60b3 Changed time functions to use 64bit integers and added ETA estimation 2014-05-09 22:36:02 +02:00
Martin
6db3dbeab2 Renamed parameter parsing function 2014-04-10 22:49:03 +02:00
Martin
3530f14bfa Server public key authentication on the client 2014-03-23 17:15:01 +01:00
Martin
1999d4f148 Hande endianess correctly 2014-02-23 21:50:19 +01:00
Martin Raiber
63e98740e3 Show client and operating system version on web interface 2013-06-27 18:43:09 +02:00
Martin
25b1edd9b5 Calculate file hashes on Internet client 2013-05-30 22:01:37 +02:00
Martin
35fc82588b Remove unkown files app 2013-04-17 22:36:51 +02:00
Martin
deb3eadc7e Correctly handle backup paths with ' in them 2013-01-26 21:10:13 +01:00
Martin Raiber
453ddb0b3a Fixed linux build 2012-11-04 18:00:55 +01:00
Martin Raiber
7a006e6d7d Merge branch 'next' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend into next 2012-09-06 16:24:52 +02:00
Martin Raiber
f031c22c6e Use better random function 2012-08-22 15:02:44 +02:00
Martin Raiber
01fd3e5511 Fixed linux build 2012-08-11 16:43:10 +02:00
Martin Raiber
f60e5ba3b3 Better data type for transferred bytes 2012-05-13 22:21:08 +02:00
Martin Raiber
fd8ebfdb15 Added throttling and some backup info output 2012-05-08 19:45:45 +02:00
Martin Raiber
7239ccc3df Added file backup archival 2012-04-21 20:45:59 +02:00
Martin Raiber
1e12eb4ee3 Added wide char trim 2011-12-05 22:16:47 +01:00
root
75ee37ee4b Merge branch 'master' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend 2011-09-28 10:15:44 -04:00
Martin Raiber
39bfadfeef Merge branch 'master' of ssh://urbackup.git.sourceforge.net/gitroot/urbackup/backend 2011-09-24 19:52:21 +02:00
Martin Raiber
b9b892981b Some mail changes 2011-09-24 19:50:23 +02:00
Martin Raiber
89a9e5cb7b Fixed linux build 2011-09-22 22:29:42 +02:00
Martin Raiber
67b67beb56 Fixed syntax error 2011-07-05 14:03:36 +02:00
Martin Raiber
7f620e86cb Fixed desanitizing of HTML input 2011-07-05 13:52:47 +02:00
Martin Raiber
bfec09eb26 Fixed 64bit linux compilation issues 2011-01-27 16:16:40 -05:00
uroni
89e10b3f04 Initial commit. 2011-01-06 17:43:38 +01:00