Olivier Goffart
7f0735a955
Account: don't use the Theme from the account
...
The Theme will be moved to GUI
The server URL is anyway overriden by the wizard or the accountmanager
2015-06-15 17:39:28 +02:00
Olivier Goffart
ce0a0e3f0d
Credential: move the implementation to the gui
2015-06-15 17:39:28 +02:00
Olivier Goffart
6e337ad242
Move Account::settings to AccountState::settings
...
It is only used by the GUI. Also return a unique_ptr to make the ownership clearer
2015-06-15 17:39:28 +02:00
Olivier Goffart
bea8896012
Merge remote-tracking branch 'origin/master' into new-ui
2015-06-14 10:39:30 +02:00
Olivier Goffart
1dabdc7df1
discoveryphase: initialize DiscoveryMainThread::_currentGetSizeResult
2015-06-12 14:43:18 +02:00
Olivier Goffart
11c8415cd6
Coverity do not support non-static data initializer
...
Fixes #3337
2015-06-12 13:57:17 +02:00
Olivier Goffart
cc3543dbd2
Confirm feature: The UI part in the selective sync view
...
Folder that are over the threshold will appear in red in the
selective sync view and will be deselected by default
2015-06-11 15:46:01 +02:00
Olivier Goffart
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
Olivier Goffart
139b28b471
Merge branch 'master' into new-ui
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderman.cpp
2015-06-10 15:57:55 +02:00
Olivier Goffart
16786eed54
Merge pull request #3281 from owncloud/confirm
...
Confirm feature (sync engine part only)
2015-06-10 13:39:52 +02:00
Olivier Goffart
e135d4cccf
Merge remote-tracking branch 'origin/1.8'
2015-06-10 13:42:02 +02:00
Olivier Goffart
6df7551bdd
DiscoveryPhase: Fix the unlikely case the server resturns utf-8 in permissions
...
UTF-8 size might be bigger than the size of the QString
In that case we would end up with a non-nill terminated permissions.
2015-06-08 15:40:06 +02:00
Olivier Goffart
1b9d82679c
OwnSQL: fix initialisation of variables
2015-06-08 15:30:39 +02:00
Klaas Freitag
fc2ceb88fb
Rename thread to SyncEngine Thread to avoid confusion about Neon.
2015-06-06 10:49:47 +02:00
Christian Kamm
ee08b3759d
SyncScheduling: Avoid new resyncs on local mkdir.
...
(cherry picked from commit bacf6166c1
2015-06-05 10:27:28 +02:00
Christian Kamm
bacf6166c1
SyncScheduling: Avoid new resyncs on local mkdir.
2015-06-04 15:02:24 +02:00
Christian Kamm
2ed329e025
Improve reporting of server error messages. #3220
...
In particular the 'unsupported client version' error message
is now visible to the user when trying to connect to a
server that no longer supports the current client version.
2015-06-04 10:07:24 +02:00
Christian Kamm
4c10f1e40c
Wizard: Show server error message if possible. #3220
2015-06-03 16:33:09 +02:00
Olivier Goffart
02ffbf8989
confirm feature: fix typos spotted by ckamm
2015-06-03 15:20:42 +02:00
Christian Kamm
89376e14d6
Nicer fix for the security issue #3283 .
2015-06-03 11:37:26 +02:00
Christian Kamm
e32bd5a59f
Merge remote-tracking branch 'origin/1.8'
2015-06-03 11:36:52 +02:00
Klaas Freitag
75b38d1a2f
Abort the request and reset the QNAM if user does not ACK a new cert.
...
This is supposed to fix bug #3283
2015-06-02 12:21:49 +02:00
Christian Kamm
2435ba7e7d
Windows: Fix unit test build.
2015-05-27 14:59:28 +02:00
Olivier Goffart
507206367f
Merge branch 'master' into new-ui
2015-05-26 14:56:08 +02:00
Olivier Goffart
9e17ddffae
Confirm feature: document the white/black/unconfirmed lists
2015-05-26 14:41:29 +02:00
Olivier Goffart
a621223cc8
SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation
2015-05-26 14:41:01 +02:00
Olivier Goffart
7bb2834d8b
Confirm feature (The sync engine part)
2015-05-26 12:34:07 +02:00
Olivier Goffart
10d9e53159
Confirm feature: Use selective sync in the database
2015-05-26 12:34:07 +02:00
Olivier Goffart
2c67692958
JournalDb: add a table in the db for the selective sync
2015-05-26 12:33:54 +02:00
Olivier Goffart
5cb10bf6a1
PropfindJob: fix parsing of properties that have a sub element
...
The default argument of readElementText is ErrorOnUnexpectedElement which
abort the parsing of remaining elements
2015-05-26 12:33:54 +02:00
Olivier Goffart
54a42e401b
More compilation fixes after the merge
2015-05-26 12:33:19 +02:00
Olivier Goffart
6b27d2e703
Merge remote-tracking branch 'origin/1.8'
2015-05-26 12:28:31 +02:00
Klaas Freitag
6c46713701
include qtconcurrentrun header rather than QtConcurrent for Qt4
2015-05-22 14:46:29 +02:00
Olivier Goffart
3754e6c781
Disable the curruption workaround on mac and windows
...
The binaries we ship have a patched Qt
2015-05-22 14:19:44 +02:00
Olivier Goffart
6b9e123816
Merge remote-tracking branch 'origin/checksum_1.8' into 1.8
2015-05-22 10:32:37 +02:00
Olivier Goffart
fb2295fcec
Merge branch 'recall' into 1.8
2015-05-22 10:32:26 +02:00
Christian Kamm
1c84d01584
Windows: Fix build of tests.
2015-05-22 09:17:24 +02:00
Olivier Goffart
3fcce08a22
recall: move the recall code in a namespace
2015-05-21 16:23:54 +02:00
Olivier Goffart
289800c1ba
Recall: make it work even if it is not in the root directory
2015-05-21 16:06:53 +02:00
Olivier Goffart
9a02a0f3a8
Recall feature: Fix some style issues
2015-05-21 16:06:52 +02:00
Jakub Moscicki
4e79093f84
recall file prototype
2015-05-21 16:06:52 +02:00
Klaas Freitag
d2fff2c3e3
Theme: Allow to change the transmission checksum through theming.
2015-05-21 15:59:24 +02:00
Klaas Freitag
8f277e46d6
TransmissionChecksumming: Remove SyncFileItem dependency.
2015-05-21 15:51:48 +02:00
Klaas Freitag
c33d962712
TransmissonChecksumValidator: Add documentation.
2015-05-21 14:32:08 +02:00
Klaas Freitag
3870915118
TransmissionChecksumValidator: Reduce verbosity.
2015-05-21 14:31:39 +02:00
Klaas Freitag
b05ca526a4
In case of empty checksum type, emit validated.
2015-05-21 14:31:18 +02:00
Klaas Freitag
4e28a24af3
Let checksumType() read the config to destinguish checksum type.
2015-05-21 14:30:21 +02:00
Klaas Freitag
dec3bd4a02
Some more minor cleanups based on the pull request review.
2015-05-20 22:44:12 +02:00
Klaas Freitag
64ce0cd7a2
Improved implementation efficiency of checksum calculation.
...
Based on Oliviers suggestions the file read routine now reuses
one buffer to read the entire file.
Other cleanups.
2015-05-20 21:42:08 +02:00
Klaas Freitag
5b5a636cc1
Make TransmissionChecksumValidator child of the job for auto delete.
...
That way no explicit memory management is needed as the allocation
is freed when the job (parent) is deleted automatically.
2015-05-20 16:54:04 +02:00
