Commit Graph

127 Commits

Author SHA1 Message Date
Martin
5fbb571411 REad file hashes from metadata + refactoring 2015-12-19 21:47:58 +01:00
Martin
350fda76c6 Fixed user view creation and added setting to web interface 2015-12-15 00:48:54 +01:00
Martin
54c68591c2 A few web interface improvements 2015-12-14 20:25:06 +01:00
Martin
9bab514e22 Removed UTF16 string (std::wstring) in most places. UTF8 everywhere! 2015-12-13 16:17:36 +01:00
Martin
e90cb501ae Multiple virtual clients per real client 2015-12-09 22:53:57 +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
Martin
cdd9c0ae76 Merge branch 'dev' of server.raiber.de:~/urbackup_backend into dev
Conflicts:
	urbackupserver/dllmain.cpp
2015-12-04 21:45:04 +01:00
Martin
57e6febc0d Stronger user password hashing with PBKDF2-SHA256(10000) 2015-12-04 21:43:58 +01:00
Martin Raiber
52d7d169dd Fixed file listing via command line 2015-11-02 22:43:33 +01:00
Martin
0bf2a6361f Separate functions for read and write transactions 2015-10-26 18:51:30 +01:00
Martin
5fe4723c97 Separate functions for read and write transactions 2015-10-26 18:42:39 +01:00
Martin
d7538f2f47 Option to not follow symbolic links on Linux
(cherry picked from commit a0343960a9)

Conflicts:
	urbackupclient/client.cpp
	urbackupclient/client.h
	urbackupcommon/settingslist.cpp
	urbackupserver/server_settings.cpp
	urbackupserver/server_settings.h
	urbackupserver/serverinterface/settings.cpp
	urbackupserver/www/js/urbackup.js
	urbackupserver/www/templates.js
	urbackupserver/www/templates/settings_inv_row.htm
2015-08-08 18:34:50 +02:00
Martin
345d182568 License change from GPLv3+ to AGPLv3+ 2015-08-01 22:58:40 +02:00
Martin
a0343960a9 Option to not follow symbolic links on Linux 2015-07-12 22:11:23 +02:00
Martin
52b9e403b5 Setting to run backups without background priority on Windows 2015-07-12 21:55:56 +02:00
Martin
24e7922764 Fixed file access from tray icon 2015-01-04 20:24:16 +01:00
Martin Raiber
77b21368a3 Updated translation 2014-12-26 17:09:23 +01:00
Martin Raiber
d47dd35315 Test with test user on saving LDAP settings 2014-12-26 17:01:03 +01:00
Martin
eada97fb5e Synthetic full image backups 2014-12-20 01:24:02 +01:00
Martin
2bec823048 Use global settings if client specific settings are/remain identical to the global ones 2014-12-17 22:30:19 +01:00
Martin
68052cb22d Login via LDAP/AD 2014-12-06 20:39:55 +01:00
Martin
07f31ad57d Simultaneous file and image backups and heavy refactoring 2014-11-30 19:34:02 +01:00
Martin
542f2efa3a Integrated "cowraw" image file format into web interface 2014-11-17 22:27:40 +01:00
Martin Raiber
9eb1d91fcf Merge remote-tracking branch 'urpc/next' into fileentryindex
Conflicts:
	fsimageplugin/cowfile.cpp
	urbackupclient/ChangeJournalWatcher.cpp
	urbackupclient/ChangeJournalWatcher.h
	urbackupclient/dllmain.cpp
	urbackupserver/dao/ServerBackupDao.cpp
	urbackupserver/dao/ServerBackupDao.h
	urbackupserver/server_get.h
	urbackupserver/server_image.cpp
	urbackupserver/server_writer.cpp
	urbackupserver/server_writer.h
2014-11-02 16:19:11 +01:00
Martin Raiber
89da837d7f Merge remote-tracking branch 'urpc/raw-cow-image' into fileentryindex
Conflicts:
	.gitignore
	Makefile.am_server
	urbackupcommon/settingslist.cpp
	urbackupserver/www/templates.js
2014-11-02 15:45:26 +01:00
Martin Raiber
3d9bdce6ae Fixed cow image file format 2014-10-31 23:23:49 +01:00
Martin Raiber
278fe0bbea Try to automatically set the /etc/urbackup/backupfolder file 2014-10-31 19:20:21 +01:00
Martin
11cd5be490 Properly propagate global setting changes to client settings 2014-10-25 18:24:23 +02:00
Martin
de413cfe5b Correctly unescape settings 2014-10-18 16:06:37 +02: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
cdcf7dab1a Replacing file entry cache with external file entry index 2014-10-10 18:29:26 +02:00
Martin
2f7534c5b2 * Don't re-add all file entries on every incremental Internet file backup.
* New option to disable the periodical re-adding of file entries.
* Properly re-add file entries from symbolically linked directories
2014-09-17 20:58:17 +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
573097453d New setting to verify the client side hashes on the server after the file backup 2014-09-05 19:25:08 +02:00
Martin Raiber
7d6c5738ac Fixed archive window not displaying and "forever" not being allowed in some cases 2014-08-28 16:31:58 +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
eb11c7e63b Converted the "compress image backup" switch to a select box, because further image format options are planned 2014-07-25 19:56:52 +02:00
Martin
624dc77591 Don't download new server version information in the browser. Do it nightly instead. 2014-06-13 20:38:28 +02:00
Martin
73c0685f95 Setting to disable the "Exit" menu item and to always connect to the internet server 2014-05-24 19:06:52 +02:00
Martin
cc05a512e1 Add file entries every min_file_incr times for each file.
The client may not be trusted => Setting to force the server to read and calculate the respective file hashes instead of trusting the client
2014-05-14 22:57:59 +02:00
Martin
18e0e2f1cf Better settings exchange 2014-04-15 22:39:33 +02:00
Martin
6db3dbeab2 Renamed parameter parsing function 2014-04-10 22:49:03 +02:00
Martin
be31492476 Added image compression setting to the web interface 2014-04-08 20:02:24 +02:00
Martin
b70cc08e48 * Handle changes of the backupfolder correctly
* Lazy load database queries
* Bug fixes for symlink pooling
2014-04-01 20:47:29 +02:00
Martin
76550fcfda Use symbolic links of unchanged folders to speed up incremental file backups on non-btrfs filesystems 2014-03-29 22:07:33 +01:00
Martin
81c2cef172 Updated copyright notice 2014-02-22 15:22:42 +01:00
Martin
335400f990 Order clients by name on the web interface 2014-01-16 22:32:41 +01:00
Martin Raiber
9d083f778b Separate backup windows for full/incremental image/file backups 2013-10-22 19:25:25 +02:00
Martin
f6fc5facb0 New right "client_settings" which when removed disables changing client settings 2013-10-10 22:33:08 +02:00
Martin
8eb94a1367 Separate settings for allowing client-side starting of incremental and full backups 2013-10-03 21:22:57 +02:00
Martin
9d87efdff0 Separate settings for client download and update 2013-09-19 16:02:11 +02:00
Martin
25b1edd9b5 Calculate file hashes on Internet client 2013-05-30 22:01:37 +02:00
Martin
04d0faf60f End-to-end file backup verification for debugging purposes 2013-05-26 15:42:46 +02:00
Martin
3048cde99e Soft client quota 2013-05-25 18:35:27 +02:00
Martin
da2e6e00e3 Merge branch 'next' into feature-quota
Conflicts:
	.gitignore
2013-05-22 18:42:48 +02:00
Martin
b9a97ada57 Suspend index while copying 2013-05-21 21:07:49 +02:00
Martin
a62790a628 Added MDB file cache 2013-05-16 18:53:37 +02:00
Martin
d747e1b93f Renamed setting "internet_server_name" to "internet_server" for compatibility reasons 2013-04-26 19:00:49 +02:00
Martin
07a08c0b7e "internet_server" was not set correctly from web interface 2013-04-25 21:22:42 +02:00
Martin
480de8e6f7 Global soft filesystem quota 2013-04-14 11:23:01 +02:00
Martin
e86ae61f81 Implemented advanced settings 2013-03-01 22:22:54 +01:00
Martin
9d76c33b10 Added some advanced settings 2013-02-24 20:22:47 +01:00
Martin Raiber
70ee6b8df2 Settings for switching on/off temporary files 2012-11-10 03:18:58 +01:00
Martin Raiber
ab2d6fb83e Added silent updates 2012-09-06 16:21:27 +02:00
Martin Raiber
bc4027a310 Allow users to change their own passwords 2012-07-30 20:30:21 +02:00
Martin Raiber
9cf8887c70 Correctly continue interrupted file transfers on internet connection 2012-06-12 20:47:43 +02:00
Martin Raiber
5c50ddb072 Reorganized internet settings and added a few 2012-05-16 21:55:49 +02:00
Martin Raiber
1fc6106a2b Added global throttling 2012-05-13 02:28:44 +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
fd8ebfdb15 Added throttling and some backup info output 2012-05-08 19:45:45 +02:00
Martin Raiber
82f0f53145 Added an archive window 2012-05-01 00:25:14 +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
d32ef39d5a More internet settings 2012-03-10 01:58:56 +01:00
Martin Raiber
ad07ba2235 Added include file pattern
Conflicts:

	urbackupserver/dllmain.cpp
	urbackupserver/server_settings.cpp
	urbackupserver/urbackupserver.vcxproj.filters
2012-03-10 01:32:06 +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