Klaas Freitag
7452f1956e
Added owncloud credentials page
2011-09-30 12:51:56 +02:00
Klaas Freitag
3f860709bc
fix slash mixmax in url assembling for remote key in sitecopyrc
2011-09-30 12:04:17 +02:00
dragotin
3b04c4725b
Merge pull request #1 from cartman/master
...
A typo fix and make mirall reparse configuration when configuration is changed externally
2011-09-30 03:02:39 -07:00
İsmail Dönmez
682325f977
Reparse configuration files when folders added/removed
2011-09-30 11:49:19 +02:00
İsmail Dönmez
37c6276197
Merge branch 'master' of git://github.com/dragotin/mirall
2011-09-30 11:46:56 +02:00
Klaas Freitag
96eaeb2c62
read oc url from config file.
2011-09-30 10:24:01 +02:00
Klaas Freitag
9043e69d27
- write mirall config file
...
- check on valid parameters in owncloud wizard.
2011-09-29 19:05:49 +02:00
Klaas Freitag
b7c7b8a566
- handle empty password in .sitecopyrc.
...
- check for the owncloud admin script and warn if its not there.
2011-09-29 17:17:50 +02:00
Klaas Freitag
e8dcfe4a3c
Installation of local computer and ftp based works.
2011-09-29 16:36:27 +02:00
Klaas Freitag
68b966256e
WIP: OC installation wizard integration
2011-09-28 18:14:48 +02:00
İsmail Dönmez
20bed61446
Fix typo
2011-09-28 12:14:14 +02:00
Klaas Freitag
292965c6a3
Wizard for owncloud configuration
2011-09-27 19:10:01 +02:00
Klaas Freitag
ace9e9d690
Error counting added
2011-09-27 08:15:30 +02:00
Klaas Freitag
defda477c4
status dialog work
2011-09-26 21:46:26 +02:00
Klaas Freitag
b3eecf54a5
improved error handling
2011-09-26 18:19:01 +02:00
Klaas Freitag
0000caa632
- various code cleanups
...
- fix alias usage in sitecopy config file
2011-09-26 16:20:53 +02:00
Klaas Freitag
627a2691ad
Statusdialog added
2011-09-26 15:00:12 +02:00
Klaas Freitag
83613f4576
Add a sitecopy backend to mirall, some GUI cleanups
2011-09-26 13:12:00 +02:00
Duncan Mac-Vicar P
87ac6cae2b
add support for the conflict copy feature available on csync git
2011-09-13 14:18:47 +02:00
Christian Jann
ffd7d5b247
better idea to align the INSTRUCTIONs printf(%-20s,...)
2011-04-12 19:42:08 +02:00
Christian Jann
9c40ecafc4
csync.reconciler: show the correct type: "file" or "dir"
2011-04-12 17:59:25 +02:00
Christian Jann
deb620b5be
align everything correctly (easier to read)
...
prefix "CSYNC_": no extra information -> removed
we could even remove "INSTRUCTION_" or change it to "INST_"
2011-04-12 17:09:39 +02:00
Christian Jann
a8071bfd14
csync.propagator/csync.reconciler first print instruction type,
...
than print the path and align everything correctly (easier to read)
2011-04-12 17:06:18 +02:00
Christian Jann
f65612ff2e
hide instruction NONE messages when log level is set to debug,
...
only show these messages on log level trace
2011-04-12 13:20:50 +02:00
Christian Jann
aad3e146fc
set instruction after conflict backup for the statedb merger to NONE
2011-04-12 10:09:41 +02:00
Duncan Mac-Vicar P
7f8d1b633c
Update README
2011-04-08 13:35:24 +02:00
Duncan Mac-Vicar P
9569ff1dc6
link Qt to the static library
2011-04-08 12:03:09 +02:00
Duncan Mac-Vicar P
a75cf60c80
0.0.2
2011-04-08 11:39:35 +02:00
Duncan Mac-Vicar P
67b6e77979
handle errors to the UI
2011-04-08 11:36:53 +02:00
Duncan Mac-Vicar P
b0efc506cd
increase poll timer to 1 minute
2011-04-08 10:51:18 +02:00
Duncan Mac-Vicar P
d1ee08d442
add a mutex for the csync threads
2011-04-08 10:49:28 +02:00
Duncan Mac-Vicar P
0ba4fac32f
for csync, accept smb:// urls as well
2011-04-08 10:49:26 +02:00
Duncan Mac-Vicar P
58270990ed
force the initial sync even if the list is empty as this point
2011-04-08 10:48:22 +02:00
Duncan Mac-Vicar P
0aa5f51bb5
Use csync as default
2011-04-08 09:58:16 +02:00
Duncan Mac-Vicar P
3ce5932bbd
g
...
Basic implementation of a CSyncFolder
Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default.
2011-04-07 19:04:07 +02:00
Duncan Mac-Vicar P
83eeeb4216
Simplify how the event queue works. Now it is just a timer
...
that gets restarted on every new event, and the processing starts
when no events reset the timer for the event interval.
2011-04-06 22:35:08 +02:00
Christian Jann
1fbe6b6c96
Better way to fix bug "Found a bug but no bugtracker"
2011-04-06 17:09:05 +02:00
Christian Jann
92dc16a59e
Increase version numbers.
2011-04-06 17:08:52 +02:00
Christian Jann
c848d8ffd7
added conflict-copy option to csync client
2011-04-06 17:08:30 +02:00
Christian Jann
2627275da5
updated .gitignore
2011-04-06 17:08:14 +02:00
Christian Jann
9864baa0c8
fixed small error:
...
csync/first/a~
was renamed to:
csync/first/~a_conflict-20110326-190457~
but it should be:
csync/first/a_conflict-20110326-190457~
2011-04-06 17:08:01 +02:00
Christian Jann
d842119065
improved logging
2011-04-06 17:07:20 +02:00
Duncan Mac-Vicar P
25315dfdec
fix warning
2011-04-06 17:03:10 +02:00
Christian Jann
e4d8e793f6
added new conflict resolution to libcsync
...
- use the latest version of the two files under its original filename
in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
using the same file extension with appended marker (e.g. "conflict")
and timestamp in both destinations
(e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
on the side where the conflict has occurred and gets synced to the other side
on the second sync.
2011-04-06 16:57:24 +02:00
Christian Jann
29616c0b2e
ignore kdevelop project files
2011-04-06 16:56:27 +02:00
Christian Jann
09980fcf5a
fix hundreds of these warnings:
...
csync.c:272:75: warning: ISO C99 requires rest arguments to be used
2011-04-06 16:56:05 +02:00
Christian Jann
f76d9fbcc3
added kate's suffix for backupfiles to .gitignore
2011-04-06 16:55:14 +02:00
Duncan Mac-Vicar P
a4c5996f47
Make the folders network state aware
2011-04-06 15:57:18 +02:00
Duncan Mac-Vicar P
65c41b6368
add simple network location infrastructure
2011-04-06 15:22:40 +02:00
Duncan Mac-Vicar P
5162b9def2
missing goal
2011-04-06 13:50:31 +02:00
