Commit Graph
2380 Commits
Author SHA1 Message Date
Daniel Molkentin 804eaa700e Remove bogus debug output 2013-05-22 15:58:54 +02:00
Daniel Molkentin 646922665d 1.3.0beta1 2013-05-22 15:34:19 +02:00
Daniel Molkentin 62ad2f19e3 Setup Wizard: Make server/folder buttons work 2013-05-21 14:25:31 +02:00
Daniel Molkentin 14f55420f9 Remove obsolete connect statement 2013-05-21 14:20:56 +02:00
Daniel Molkentin d4ea0ba6ba Merge branch 'master' of git://github.com/gnumdk/mirall
Conflicts:
	CMakeLists.txt

As per PR 457
2013-05-20 16:54:49 +02:00
Daniel Molkentin c06f7b7ecb Update README.md
Fixes #182.
2013-05-20 11:00:29 +02:00
Daniel Molkentin 3a50eece9e More theming refactoring 2013-05-17 20:56:17 +02:00
Daniel Molkentin 44f0fb0242 Fix broken include 2013-05-17 20:12:31 +02:00
Daniel Molkentin c210e2b72f Remove obsolete miralltheme 2013-05-17 20:11:16 +02:00
Daniel Molkentin 7b5079f043 Amendment to previous commit 2013-05-17 18:27:07 +02:00
Daniel Molkentin be4027fb36 Remove deleted file from resources 2013-05-17 18:13:14 +02:00
Daniel Molkentin 0f03b47a46 Make new connection wizard themable 2013-05-17 18:05:22 +02:00
Daniel Molkentin c923e0803e Add SyncResult::SyncPrepare case to FileItemDialog 2013-05-17 12:33:02 +02:00
Daniel Molkentin bd74dbbfc5 doc: markup fixes 2013-05-17 12:02:40 +02:00
Daniel Molkentin a0599e75b7 Update build instructions for Mac OS 2013-05-17 11:42:19 +02:00
Klaas Freitag f334b6349b Add a call to quit to make the thread ending the loop 2013-05-16 17:35:40 +02:00
Olivier Goffart 07ce6cfa79 don't use member variable of the propagator 2013-05-16 14:50:36 +02:00
Olivier Goffart 9ce47c9675 make the propagator asynchronous 2013-05-16 13:54:22 +02:00
Klaas Freitag 2ff9fcfa1d Fix crash if _thread is not initialized before. 2013-05-16 13:26:05 +02:00
Olivier Goffart 40255d643c propagator-ng: adapt to the merge of rename_folders branch 2013-05-15 15:22:20 +02:00
Daniel Molkentin aa23e4698b Correct spelling of some mac os meta files
Fixes #619
2013-05-14 23:15:22 +02:00
Olivier Goffart b31200a6f2 propagator-ng: fix setting the mtime 2013-05-10 13:20:21 +02:00
Olivier Goffart 98cbb599b8 Fix handling of conflicting directories
We can safely ignore them in the propagator
2013-05-10 12:35:10 +02:00
Daniel Molkentin 302fdeb1f9 Use UTF-8 for basic auth
Slightly off-specs, and fails for non UTF-8 setups,
but the ownCloud server itself expects UTF-8 encoding.
2013-05-09 22:01:39 +02:00
Daniel Molkentin eea8542fc0 Quit app/abort sync gracefully. 2013-05-09 21:55:28 +02:00
Olivier Goffart ecd314cef5 Give the tmp file a proper hidden and excluded name 2013-05-08 14:31:52 +02:00
Olivier Goffart 0b1ecd0ac6 propagator-ng: Abort on fatal error 2013-05-08 13:30:30 +02:00
Olivier Goffart 852e30ef07 owncloudcmd: don't abort on unknown argument 2013-05-08 12:11:23 +02:00
Olivier Goffart 2193da0ab5 Fix a few FIXME 2013-05-07 17:47:29 +02:00
Olivier Goffart 7cd12e7dc5 remove some FIXME 2013-05-07 17:16:11 +02:00
Olivier Goffart 685bf395be propagator-ng: resume uploads
Currently i think it corrupt the files
2013-05-06 18:41:56 +02:00
Olivier Goffart 0636ae6f28 propagator-ng: be able to resume download 2013-05-06 16:59:11 +02:00
Olivier Goffart 7f8eba3700 propagator-ng: set the modtime on downloaded files 2013-05-06 12:09:21 +02:00
Olivier Goffart 02957aba45 propagator-ng: Emit the fileReceived signal 2013-05-05 12:46:40 +02:00
Klaas Freitag 946258ca59 Created a test file for ownCloudPropagator. Not much in yet. 2013-05-05 12:36:42 +02:00
Klaas Freitag 2e53e2e4e0 Really return true in case of error. 2013-05-05 12:34:38 +02:00
Klaas Freitag 721a8f79ab Improve error handling, add error string to each individual file item. 2013-05-05 11:47:19 +02:00
Olivier Goffart ecaf66db5d style: use _ in front of member variable 2013-05-05 11:32:12 +02:00
Olivier Goffart 0c775aba6d propagator-ng: get the etag also in the GET request 2013-05-05 11:32:12 +02:00
Olivier Goffart 71b238031f Fix compilation after previous rebase 2013-05-05 11:32:12 +02:00
Olivier Goffart 662bd4e5fe propagator-ng: handle conflict
Always download the file from the server.
And if they are equals, ignore the conflict
2013-05-05 11:17:42 +02:00
Olivier Goffart 5118054fa3 Enable the backup of conflicts files in owncloudcmd 2013-05-05 11:17:07 +02:00
Klaas Freitag c956d11183 More error handling of propagator, some cleanups. 2013-05-04 17:14:47 +02:00
Klaas Freitag 7df23a1b19 Proper error reporting of propagator - WIP 2013-05-04 17:14:47 +02:00
Klaas Freitag 72580d7213 move command line client into bin dir 2013-05-04 17:14:47 +02:00
Daniel Molkentin a36d79e993 Fix make install 2013-05-04 17:01:14 +02:00
Daniel Molkentin be5c1b2072 Fix build 2013-05-04 16:38:39 +02:00
Olivier Goffart 264cc73806 Implement renaming on windows
(Not actually tested)
2013-05-04 16:18:13 +02:00
Daniel Molkentin f0bd1ea48e Add connectionvalidator class 2013-05-04 16:01:45 +02:00
Daniel Molkentin 90d0460a42 Remove dummy artwork, dead switches 2013-05-04 15:55:04 +02:00