Commit Graph

Select branches

Hide Pull Requests

master

stable-3.3

stable-3.3-lnk

stable-3.4

2.6.2-buildtest1

csync-0.50.0

e2e-tech-preview-1

techpreview-v1

techpreview-v2

v0.0.2

v1.1.0

v1.1.0-beta1

v1.1.2

v1.2.0

v1.2.1

v1.2.2

v1.2.3

v1.2.4

v1.2.5

v1.3.0

v1.3.0-beta1

v1.3.0-beta2

v1.3.0-beta3

v1.3.0-beta4

v1.4.0

v1.4.0-beta1

v1.4.0-beta2

v1.4.0-rc1

v1.4.1

v1.4.2

v1.5.0

v1.5.0-beta1

v1.5.0-beta1-2nd

v1.5.0-beta2

v1.5.0-beta3

v1.5.1

v1.5.1-rc1

v1.5.2

v1.5.3

v1.5.3-rc1

v1.6.0

v1.6.0-beta1

v1.6.0-beta2

v1.6.0-rc1

v1.6.0-rc2

v1.6.0-rc3

v1.6.1

v1.6.1-rc1

v1.6.2

v1.6.2-rc1

v1.6.2-rc2

v1.6.2-themefix

v1.6.3

v1.6.3-rc1

v1.6.4

v1.6.4-rc1

v1.6.4-rc2

v1.7.0

v1.7.0-alpha1

v1.7.0-beta1

v1.7.0-beta2

v1.7.0-beta3

v1.7.0-beta4

v1.7.0-rc1

v1.7.0beta1

v1.7.0beta2

v1.7.1-beta1

v1.7.1-rc1

v1.8.0

v1.8.0-beta1

v1.8.0-beta1a

v1.8.0-beta2

v1.8.0-rc1

v1.8.0rc1

v1.8.1

v1.8.1-beta1

v1.8.1-rc1

v1.8.1-rc2

v1.8.2

v1.8.2-beta1

v1.8.2-rc1

v1.8.3

v1.8.3-rc1

v1.8.3-rc2

v1.8.3-rc3

v2.0.0

v2.0.0-beta2

v2.0.0-rc2

v2.0.1

v2.0.2

v2.0.2-oem

v2.0.2-rc1

v2.0.2-rc2

v2.1.0

v2.2.3

v2.2.4

v2.3.0

v2.3.0-rc3

v2.3.1

v2.3.1-rc1

v2.3.2

v2.3.2-rc1

v2.3.3

v2.3.3-rc1

v2.3.4

v2.4.0

v2.4.0-alpha1

v2.4.0-beta1

v2.4.0-rc1

v2.4.0-rc2

v2.4.1

v2.4.1-rc1

v2.4.2

v2.4.2-rc1

v2.4.3

v2.4.3-rc1

v2.5.0

v2.5.0-alpha

v2.5.0-alpha1

v2.5.0-beta1

v2.5.0-beta2

v2.5.0-oem

v2.5.0-rc1

v2.5.0-rc2

v2.5.1

v2.5.2

v2.5.2-rc1

v2.5.3

v2.5.3-rc1

v2.5.3-rc2

v2.6.0

v2.6.0-fix1

v2.6.0-rc1

v2.6.1

v2.6.1-rc1

v2.6.2

v2.6.2-rc1

v2.6.3

v2.6.4

v2.6.5

v2.7.0-beta1

v2.7.0-beta2

v2.7.0-beta3

v2.7.0-rc1

v3.0.0

v3.0.1

v3.0.2

v3.0.3

v3.1.0

v3.1.0-rc1

v3.1.0-rc2

v3.1.1

v3.1.2

v3.1.3

v3.2.0

v3.2.0-rc1

v3.2.0-rc2

v3.2.0-rc3

v3.2.1

v3.2.2

v3.2.3

v3.2.4

v3.3.0

v3.3.0-rc1

v3.3.0-rc2

v3.3.1

v3.3.2

v3.3.3

v3.3.4

v3.3.5

v3.3.6

v3.3.6-lnk

v3.4.0-do-not-use

v3.4.0-rc1

v3.4.0-rc2

v3.4.1

v3.4.2

Mono Color

• b99fd213b6 vio: Fix build errors. Andreas Schneider 2012-02-04 12:34:46 +01:00
• de2cb55f0e propagate: Remove unused variables. Andreas Schneider 2012-02-04 12:28:51 +01:00
• 6dca82a4a1 reconcile: Fix return value. Andreas Schneider 2012-02-04 12:26:27 +01:00
• 4e5b29257e include: Fix packed attribute for file structure. Andreas Schneider 2012-02-04 12:23:54 +01:00
• 5a28200e8b cmake: Increase minimun requried cmake version. Andreas Schneider 2012-02-04 12:23:30 +01:00
• 1c52b90fa4 Pack the csync_file_stat structure. Andreas Schneider 2011-09-07 23:04:21 +02:00
• ad0be9f6ee - Added info dialog with file listing - Added overall status display on the tray icon plus tooltip -> patches from Alvaro Soliverez Klaas Freitag 2012-01-23 22:10:01 +01:00
• d0888ffba8 cmake: Fix build on OSX. Andreas Schneider 2011-10-17 19:07:52 +02:00
• 128223553c added a windows compatible implementation Klaas Freitag 2012-01-20 10:21:49 +01:00
• 7e988d2e08 win32: fix static linking to libmirall/qwebdav Dominik Schmidt 2012-01-19 14:10:18 +01:00
• e168eeae46 more useful user feedback about sync state, patch provided by Alvaro Soliverez Klaas Freitag 2011-12-29 09:31:45 +01:00
• 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 Klaas Freitag 2011-12-25 21:55:29 +01:00
• 0c9c2962c2 Enable/Disable button, patch submitted by Alvaro Soliverez Klaas Freitag 2011-12-12 17:47:30 +01:00
• c23c96cdc6 - add exclude patterns to sitecopy config, Patch contributed by Alvaro Soliverez Klaas Freitag 2011-12-12 17:26:13 +01:00
• a3fa419f82 Bump version Klaas Freitag 2011-12-05 12:03:16 +01:00
• 180c06b39e Patch sent in by Alvaro Soliverez: Add a "upload" button to the Status dialog to solve conflict situations from local -> cloud Klaas Freitag 2011-12-05 12:01:39 +01:00
• 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 Klaas Freitag 2011-11-28 14:53:34 +01:00
• 56a30af52d virtual inheritance not supported, fix compile problem Klaas Freitag 2011-11-28 13:35:46 +01:00
• 37d6fb6022 Version string added Klaas Freitag 2011-11-24 16:38:12 +01:00
• cb4c5e31b1 - fix ownCloud sourcepackage download from owncloud.org - fix installation output in setup dialog Klaas Freitag 2011-11-24 16:25:15 +01:00
• cd281bc552 Correct COPYING file from FSF website, rpmlint found an old address in the previous one. Klaas Freitag 2011-11-22 22:45:14 +01:00
• b9ce7d037f - renamed icons to mirall instead of ownCloud - install of desktop file icon added Klaas Freitag 2011-11-22 18:31:44 +01:00
• 7b9bd33bea Update to a consistent COPYING file Klaas Freitag 2011-11-22 17:35:22 +01:00
• 782cda05dc Merge branch 'master' of github.com:dragotin/mirall Klaas Freitag 2011-11-07 17:09:18 +01:00
• b7ca0ef36a Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch Klaas Freitag 2011-11-07 17:09:02 +01:00
• cd4528324c error handling: sitecopy not installed Klaas Freitag 2011-11-04 11:41:49 +01:00
• 869152424c Polished the ui, stop syncing during user actions. Klaas Freitag 2011-11-03 16:06:40 +01:00
• b7f5b8c2d8 Fix authentication loop if ownCloud does not accept the basic auth header Klaas Freitag 2011-11-02 15:07:34 +01:00
• e660fe25b1 Use the new owncloud-admin version Klaas Freitag 2011-11-02 14:44:53 +01:00
• aa8ba76e3c deleted unused files Klaas Freitag 2011-10-26 14:00:28 +02:00
• 4c002a127f added webdav support utilizing qtwebdav-qnetworkmanager Klaas Freitag 2011-10-26 13:59:06 +02:00
• de8d7bb87c Added open ownCloud button to status dialog Klaas Freitag 2011-10-20 11:48:41 +02:00
• 267d74b381 More polish and bugfixing Klaas Freitag 2011-10-20 10:26:40 +02:00
• 71873df369 Use icons depending on the backend Klaas Freitag 2011-10-19 13:10:43 +02:00
• 9c27edc6b6 - polished the folder wizard - bugfixes - added user warnings if remote root dir is picked. Klaas Freitag 2011-10-19 11:53:12 +02:00
• 9d3a0e8596 Implemented folder fetching. Klaas Freitag 2011-10-18 10:22:24 +02:00
• 90f722e2da - fix alias bug in folderwizard - call restart before showing folderwizard - ask for admin credentials for ftp install Klaas Freitag 2011-10-14 18:13:34 +02:00
• 95eadf2cb9 some more smaller fixes Klaas Freitag 2011-10-14 16:39:53 +02:00
• 4911a528c4 Error publishing in the status dialog Klaas Freitag 2011-10-13 16:41:24 +02:00
• a2c564306f Enable secure connection via sitecopy Klaas Freitag 2011-10-13 13:58:46 +02:00
• cb359ba89d removal of folders added Klaas Freitag 2011-10-13 13:55:52 +02:00
• ced69489a5 WIP status dialog Klaas Freitag 2011-10-12 16:58:54 +02:00
• c4b24ab952 Show warning on wrong remote folder Klaas Freitag 2011-10-12 15:14:39 +02:00
• 91b12c7eb3 Show a warning text in folder wizard Klaas Freitag 2011-10-11 15:39:25 +02:00
• 91bf272c9b Don't allow to pick local directories or aliases twice. Klaas Freitag 2011-10-11 14:23:32 +02:00
• ecc3a9edd5 remote folder check for oC finished Klaas Freitag 2011-10-07 16:01:58 +02:00
• f4c5b9adbb added check for the owncloud folder - WIP Klaas Freitag 2011-10-06 16:55:28 +02:00
• f3123b6c02 - simplified the folder wizard - live check of the ownCloud connect Klaas Freitag 2011-10-06 10:54:54 +02:00
• 60c304667f added online check Klaas Freitag 2011-10-05 17:49:03 +02:00
• 2dec870eaa Use nice empty icon Klaas Freitag 2011-10-05 15:56:56 +02:00
• f582c19c67 - fixed some Ownclouds -> ownCloud - start wizard if mirall config missing Klaas Freitag 2011-10-05 15:48:30 +02:00
• e0f8499484 Setup of local folder with initial sync Klaas Freitag 2011-10-05 12:11:10 +02:00
• 5a42aa3028 Added some gpl headers to sourcefiles Klaas Freitag 2011-09-30 17:42:28 +02:00
• c9de9810e2 Fix url parameter, add http Klaas Freitag 2011-09-30 15:35:19 +02:00
• 35aee0de00 Create the local sync folder successfully Klaas Freitag 2011-09-30 14:19:26 +02:00
• 7452f1956e Added owncloud credentials page Klaas Freitag 2011-09-30 12:51:56 +02:00
• 3f860709bc fix slash mixmax in url assembling for remote key in sitecopyrc Klaas Freitag 2011-09-30 12:04:17 +02:00
• 3b04c4725b Merge pull request #1 from cartman/master dragotin 2011-09-30 03:02:39 -07:00
• 682325f977 Reparse configuration files when folders added/removed İsmail Dönmez 2011-09-30 11:49:19 +02:00
• 37c6276197 Merge branch 'master' of git://github.com/dragotin/mirall İsmail Dönmez 2011-09-30 11:46:56 +02:00
• 96eaeb2c62 read oc url from config file. Klaas Freitag 2011-09-30 10:24:01 +02:00
• 9043e69d27 - write mirall config file - check on valid parameters in owncloud wizard. Klaas Freitag 2011-09-29 19:05:49 +02:00
• b7c7b8a566 - handle empty password in .sitecopyrc. - check for the owncloud admin script and warn if its not there. Klaas Freitag 2011-09-29 17:17:50 +02:00
• e8dcfe4a3c Installation of local computer and ftp based works. Klaas Freitag 2011-09-29 16:36:27 +02:00
• 68b966256e WIP: OC installation wizard integration Klaas Freitag 2011-09-28 18:14:48 +02:00
• 20bed61446 Fix typo İsmail Dönmez 2011-09-28 12:14:14 +02:00
• 292965c6a3 Wizard for owncloud configuration Klaas Freitag 2011-09-27 19:10:01 +02:00
• ace9e9d690 Error counting added Klaas Freitag 2011-09-27 08:15:30 +02:00
• defda477c4 status dialog work Klaas Freitag 2011-09-26 21:46:26 +02:00
• b3eecf54a5 improved error handling Klaas Freitag 2011-09-26 18:19:01 +02:00
• 0000caa632 - various code cleanups - fix alias usage in sitecopy config file Klaas Freitag 2011-09-26 16:20:53 +02:00
• 627a2691ad Statusdialog added Klaas Freitag 2011-09-26 15:00:12 +02:00
• 83613f4576 Add a sitecopy backend to mirall, some GUI cleanups Klaas Freitag 2011-09-26 13:12:00 +02:00
• 87ac6cae2b add support for the conflict copy feature available on csync git Duncan Mac-Vicar P 2011-09-13 14:18:47 +02:00
• ffd7d5b247 better idea to align the INSTRUCTIONs printf(%-20s,...) Christian Jann 2011-04-12 19:42:08 +02:00
• 9c40ecafc4 csync.reconciler: show the correct type: "file" or "dir" Christian Jann 2011-04-12 17:59:25 +02:00
• deb620b5be align everything correctly (easier to read) prefix "CSYNC_": no extra information -> removed we could even remove "INSTRUCTION_" or change it to "INST_" Christian Jann 2011-04-12 17:09:39 +02:00
• a8071bfd14 csync.propagator/csync.reconciler first print instruction type, than print the path and align everything correctly (easier to read) Christian Jann 2011-04-12 17:06:18 +02:00
• f65612ff2e hide instruction NONE messages when log level is set to debug, only show these messages on log level trace Christian Jann 2011-04-12 13:20:50 +02:00
• aad3e146fc set instruction after conflict backup for the statedb merger to NONE Christian Jann 2011-04-12 10:09:41 +02:00
• 7f8d1b633c Update README Duncan Mac-Vicar P 2011-04-08 13:35:24 +02:00
• 9569ff1dc6 link Qt to the static library Duncan Mac-Vicar P 2011-04-08 12:03:09 +02:00
• a75cf60c80 0.0.2 v0.0.2 Duncan Mac-Vicar P 2011-04-08 11:39:35 +02:00
• 67b6e77979 handle errors to the UI Duncan Mac-Vicar P 2011-04-08 11:36:53 +02:00
• b0efc506cd increase poll timer to 1 minute Duncan Mac-Vicar P 2011-04-08 10:51:18 +02:00
• d1ee08d442 add a mutex for the csync threads Duncan Mac-Vicar P 2011-04-08 10:49:28 +02:00
• 0ba4fac32f for csync, accept smb:// urls as well Duncan Mac-Vicar P 2011-04-08 10:49:26 +02:00
• 58270990ed force the initial sync even if the list is empty as this point Duncan Mac-Vicar P 2011-04-08 10:48:22 +02:00
• 0aa5f51bb5 Use csync as default Duncan Mac-Vicar P 2011-04-08 09:58:16 +02:00
• 3ce5932bbd g Basic implementation of a CSyncFolder Duncan Mac-Vicar P 2011-04-07 19:04:07 +02:00
• 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. Duncan Mac-Vicar P 2011-04-06 22:35:08 +02:00
• 1fbe6b6c96 Better way to fix bug "Found a bug but no bugtracker" Christian Jann 2011-04-01 16:10:31 +02:00
• 92dc16a59e Increase version numbers. Christian Jann 2011-03-30 13:18:02 +02:00
• c848d8ffd7 added conflict-copy option to csync client Christian Jann 2011-03-30 13:01:11 +02:00
• 2627275da5 updated .gitignore Christian Jann 2011-03-30 12:49:31 +02:00
• 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~ Christian Jann 2011-03-26 20:14:05 +01:00
• d842119065 improved logging Christian Jann 2011-04-06 17:05:31 +02:00
• 25315dfdec fix warning Duncan Mac-Vicar P 2011-04-06 17:03:10 +02:00
• 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. Christian Jann 2011-04-06 16:43:04 +02:00
• 29616c0b2e ignore kdevelop project files Christian Jann 2011-03-23 19:47:03 +01:00