Commit Graph

18 Commits

Author SHA1 Message Date
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
Martin
54abe2d0e3 Fixed typos and added a new section for the VHD assembling 2015-08-22 18:08:24 +02:00
Martin
fd4579500d Merge branch 'next' into fileaccess
Conflicts:
	urbackupclient/ClientService.cpp
	urbackupclient/ClientService.h
	urbackupcommon/settingslist.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/doc/admin_guide.tex
	urbackupserver/fileclient/FileClient.cpp
	urbackupserver/fileclient/FileClientChunked.cpp
	urbackupserver/server_download.cpp
	urbackupserver/server_get.cpp
	urbackupserver/server_get.h
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/www/templates.js
2014-09-13 20:15:24 +02:00
Martin Raiber
1b6aa8c7ca Updated admin manual 2014-08-28 16:32:12 +02:00
Martin
cc9cd16729 New installation chapter 2014-08-10 22:43:40 +02:00
Martin
61a8f72c3c Explain current limitation that "status" right has to be set 2014-08-04 23:56:03 +02:00
Martin
2ac45bd06b Access files directly from "tray icon" without logging in. Works by saving the user access rights for each backup 2014-07-26 16:07:43 +02:00
Martin
d129fad255 Updated admin manual for 1.4 2014-05-30 20:41:55 +02:00
Martin
5a4d7d03f8 Added missing right documentation 2014-04-15 22:50:03 +02:00
Martin
66e77441a1 Fixed two mistakes in admin guide 2014-03-06 21:51:24 +01:00
Martin
9441bafe79 Only allow administrators to change paths and settings 2014-02-16 18:11:43 +01:00
Martin
246a08d40d List of used ports 2014-01-12 22:48:49 +01:00
Martin Raiber
6241dcd943 Updated docs to version 1.3 2013-11-09 23:24:37 +01:00
Martin
5685447ad5 Updated server documentation to 1.2 2013-05-19 19:47:30 +02:00
Martin
8bb29f4d60 Update admin guide 2012-12-09 23:27:38 +01:00
Martin Raiber
a8f48d2568 Fixed German translation 2012-10-22 22:54:46 +02:00
Martin Raiber
104e2625ff Updated documentation for 1.0 2012-10-22 00:26:41 +02:00
Martin Raiber
fe33d9b31d Reorganized directory structure 2012-02-25 02:45:06 +01:00