Juan Carlos Cornejo
fb53edfd41
Logs are now saved to file and cleared from the screen every 1000th sync
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
3f0ccf1748
Implemented a user required conflict resolution when files where edited
...
locally AND in the server. The files will not be updated until the user
selects which of the two files is the newest one. Note that at this
time, other clients may be updating the server. So the client should
take caution to select the proper new file.
The server file is downloaded to disk and prepended with _ocs_conflict.
so that the user can open both files and compare accordingly.
A message appears notifying the user of the conflict, and the clouds
turn red. They will not be reverted back to blue until all conflicts are
cleared.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
6265ed0ab9
Autohide window if SystemTray is available and we are fully configured.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
add4cf24e3
Implemented a file dialog for choosing the Sync Directory.
...
Disable and enable save button as appropriate.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
41c9e90852
Implemented a trick to allow only one instance of the application to
...
run. This should hopefully prevent corruption of the sync directory.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
07685110b9
Implemented file deletion. Now files are deleted on both sides when one
...
side deletes theirs. This does not yet implement file moving. If files
are moved, it will just reupload or download them because it will treat
them as new files.
A minor bug fix also. Now the watcher is removed for files that are
being downloaded or deleted. Then added again if appropriate. This
prevented the watcher from annoucing a change and attempting to upload
the changes to the server.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
5e3a475a87
Found a function online at
...
http://www.qtcentre.org/threads/36131-Attempting-to-use-Sqlite-backup-api-from-driver-handle-fails
on a post by chemmalion that allows one to save a memory sqlite3 database to file.
This is really neat because now the strain on the hardrive is gone!
This version loads the database on startup and saves it every 3 minutes to disk.
The database is saved upon closing the program as well.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
da7795437b
Major fixes in this version. Apparently there were a lot of bugs in
...
comparing files between the server. Now it is more reasonable.
Also, less use of the hardisk because now I implemented a
QFileSystemWatch instance. This is much better and lets me know of file
changes. Though, there is still a strain on the HD due to the constant
SQLite access that I use.
I can't figure out a nice way to find out what files were added (removed
will be fore later) without listing the entire directory and comparing
against the DB.
2012-02-15 08:55:12 +01:00
Juan Carlos Cornejo
cb1740ee4a
Initial commit.
...
This version does synchronization, but does not tolerate any file deletions.
It will chew your files up!!
May contain bugs!!
2012-02-15 08:55:12 +01:00
Andreas Schneider
9a12d219d3
vio: Add support for SSL scheme names.
...
If the scheme is https try to load the module without the s at the end
if there is no module.
2012-02-13 14:33:23 +01:00
Andreas Schneider
f4f22373ed
Remove TODO.
2012-02-04 14:27:48 +01:00
Andreas Schneider
63565b0f26
time: Fix clock_gettime().
2012-02-04 14:24:22 +01:00
Andreas Schneider
aa6bef0d77
config: Add missing config values.
2012-02-04 14:11:37 +01:00
Andreas Schneider
ca52cb0545
Update ChangeLog.
2012-02-04 13:57:55 +01:00
Andreas Schneider
c2bad8004d
smb: Require newer samba version.
2012-02-04 13:47:00 +01:00
Andreas Schneider
59d1432c4a
Update README.
2012-02-04 13:41:17 +01:00
Andreas Schneider
2ec6c98101
tests: Fix the csync util test.
2012-02-04 13:30:10 +01:00
Andreas Schneider
e8b0b34fe5
tests: Fix time test.
2012-02-04 13:24:56 +01:00
Andreas Schneider
19abbc04ff
csync: Use csync_gettime().
2012-02-04 13:24:53 +01:00
Andreas Schneider
1d609e5985
time: Add csync_gettime() function.
2012-02-04 13:09:07 +01:00
Andreas Schneider
331783baef
propagate: Remove dead and wrong assignments.
2012-02-04 12:54:15 +01:00
Andreas Schneider
8e89bfec2b
propagate: Fix dead assignment.
2012-02-04 12:47:39 +01:00
Andreas Schneider
82c2017a04
path: Fix dead assignment.
2012-02-04 12:44:15 +01:00
Andreas Schneider
eb2b3438ba
lock: Fix unlink in error path.
2012-02-04 12:41:55 +01:00
Andreas Schneider
9f802a83f3
propagate: Fix some blank lines.
2012-02-04 12:37:33 +01:00
Andreas Schneider
b99fd213b6
vio: Fix build errors.
2012-02-04 12:34:46 +01:00
Andreas Schneider
de2cb55f0e
propagate: Remove unused variables.
2012-02-04 12:28:51 +01:00
Andreas Schneider
6dca82a4a1
reconcile: Fix return value.
2012-02-04 12:26:27 +01:00
Andreas Schneider
4e5b29257e
include: Fix packed attribute for file structure.
2012-02-04 12:23:54 +01:00
Andreas Schneider
5a28200e8b
cmake: Increase minimun requried cmake version.
2012-02-04 12:23:30 +01:00
Andreas Schneider
1c52b90fa4
Pack the csync_file_stat structure.
2012-02-04 12:15:48 +01:00
Klaas Freitag
ad0be9f6ee
- Added info dialog with file listing
...
- Added overall status display on the tray icon plus tooltip
-> patches from Alvaro Soliverez
2012-01-23 22:10:01 +01:00
Andreas Schneider
d0888ffba8
cmake: Fix build on OSX.
2012-01-20 15:23:18 +01:00
Klaas Freitag
128223553c
added a windows compatible implementation
2012-01-20 10:21:49 +01:00
Dominik Schmidt
7e988d2e08
win32: fix static linking to libmirall/qwebdav
2012-01-19 14:10:18 +01:00
Klaas Freitag
e168eeae46
more useful user feedback about sync state, patch provided by Alvaro Soliverez
2011-12-29 09:31:45 +01:00
Klaas Freitag
bb2baeb1d2
Two patches sent by Alvaro Soliverez <asoliverez@kde.org>:
...
- fixed refresh of the folder list in the status dialog
- show enabled status in the status dialog
2011-12-25 21:55:29 +01:00
Klaas Freitag
0c9c2962c2
Enable/Disable button, patch submitted by Alvaro Soliverez
2011-12-12 17:47:30 +01:00
Klaas Freitag
c23c96cdc6
- add exclude patterns to sitecopy config, Patch contributed by Alvaro
...
Soliverez
2011-12-12 17:26:13 +01:00
Klaas Freitag
a3fa419f82
Bump version
2011-12-05 12:03:16 +01:00
Klaas Freitag
180c06b39e
Patch sent in by Alvaro Soliverez: Add a "upload" button to the
...
Status dialog to solve conflict situations from local -> cloud
2011-12-05 12:01:39 +01:00
Klaas Freitag
bf40e0aafc
- added icon defaults for systems without icon theming bnc#730834
...
- fixed some bugs with ownCloud status check fails
- bumped version to 0.1.2
2011-11-28 14:53:34 +01:00
Klaas Freitag
56a30af52d
virtual inheritance not supported, fix compile problem
2011-11-28 13:35:46 +01:00
Klaas Freitag
37d6fb6022
Version string added
2011-11-24 16:38:12 +01:00
Klaas Freitag
cb4c5e31b1
- fix ownCloud sourcepackage download from owncloud.org
...
- fix installation output in setup dialog
2011-11-24 16:26:24 +01:00
Klaas Freitag
cd281bc552
Correct COPYING file from FSF website, rpmlint found an old address
...
in the previous one.
2011-11-22 22:45:14 +01:00
Klaas Freitag
b9ce7d037f
- renamed icons to mirall instead of ownCloud
...
- install of desktop file icon added
2011-11-22 18:31:44 +01:00
Klaas Freitag
7b9bd33bea
Update to a consistent COPYING file
2011-11-22 17:35:22 +01:00
Klaas Freitag
782cda05dc
Merge branch 'master' of github.com:dragotin/mirall
2011-11-07 17:09:18 +01:00
Klaas Freitag
b7ca0ef36a
Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch
2011-11-07 17:09:02 +01:00
