Commit Graph
17214 Commits
Author SHA1 Message Date
Jenkins for ownCloud e8f95743cc [tx-robot] updated from transifex 2017-06-29 02:22:16 +02:00
Roeland Jago DoumaandGitHub e240904a32 Merge pull request #33 from nextcloud-gmbh/update_doc
Point to NC doc repo
2017-06-28 16:44:31 +02:00
Roeland Jago Douma 58e0c6c630 Point to NC doc repo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-06-28 16:40:42 +02:00
Roeland Jago DoumaandGitHub 501394ec6f Merge pull request #32 from nextcloud-gmbh/oc_master
Oc master
2017-06-28 13:24:24 +02:00
Jenkins for ownCloud fd0b8f3583 [tx-robot] updated from transifex 2017-06-28 02:22:09 +02:00
Jenkins for ownCloud 2a52b087fd [tx-robot] updated from transifex 2017-06-27 02:22:10 +02:00
Jenkins for ownCloud c70cdd61ca [tx-robot] updated from transifex 2017-06-26 02:22:09 +02:00
Jenkins for ownCloud 5979db1270 [tx-robot] updated from transifex 2017-06-25 02:22:09 +02:00
Jenkins for ownCloud 0edc29dc72 [tx-robot] updated from transifex 2017-06-24 02:22:16 +02:00
Jenkins for ownCloud 5e4aaab91b [tx-robot] updated from transifex 2017-06-23 02:22:09 +02:00
Markus Goetz 59bbbd5e66 Jenkinsfile: Some comments 2017-06-22 15:42:56 +02:00
Markus Goetz 1e98ba27c6 CSyncSqliteTest: Fix test 2017-06-22 15:11:49 +02:00
Markus Goetz 2244b35a6d test_journal.db: Add checksumtype table 2017-06-22 15:11:49 +02:00
Christian Kamm 15ee7b39ac Merge remote-tracking branch 'origin/2.3' 2017-06-22 14:06:31 +02:00
Jenkins for ownCloud 6a298d180d [tx-robot] updated from transifex 2017-06-22 02:22:09 +02:00
Markus Goetz cb7d74a063 Jenkinsfile: Compile in debug because of all the asserts 2017-06-21 15:11:55 +02:00
Markus Goetz bc946053a3 Jenkinsfile: Compile in debug because of all the asserts 2017-06-21 15:02:26 +02:00
Markus Goetz bfe095b065 Jenkinsfile: Run verbose tests 2017-06-21 12:18:21 +02:00
Markus Goetz 30bcd45a14 Jenkinsfile: Run full testing 2017-06-21 12:13:01 +02:00
Markus Goetz cd5ad7db64 Jenkinsfile: Run full testing 2017-06-21 12:12:08 +02:00
Markus Goetz 1332e7d66a Jenkinsfile: 2.3.3 will ship with Qt 5.
This should fix the current CI run too
2017-06-21 11:59:24 +02:00
Markus Goetz f44d3914ef owncloudcmd: Explain --debug parameter 2017-06-21 10:01:32 +02:00
Jenkins for ownCloud 949e8e5f51 [tx-robot] updated from transifex 2017-06-21 02:22:08 +02:00
Christian KammandMarkus Goetz 1e78a14f1a Ignore ui: Add the sync journal patterns #5844
The ignore patterns for the journal files are hardcoded. Add them to
the UI to make them discoverable.
2017-06-20 13:35:34 +02:00
Christian KammandMarkus Goetz 4291ea47f7 Journal: Don't use a ._ path if it won't work #5633
When synchronizing a folder on a samba share, creating files that begin
with ._ is often forbidden. This prevented the client from creating
its ._sync_abcdef.db file.

Now, it'll check whether the preferred filename is creatable, and if
it isn't it'll use .sync_abcdef.db instead.

The disadvantage is that this alternative path won't be ignored by
older clients - that was the reason for the ._ prefix.
2017-06-20 13:35:34 +02:00
Jenkins for ownCloud b50706a7aa [tx-robot] updated from transifex 2017-06-20 02:22:12 +02:00
Jocelyn Turcotte b20f87eef3 shell/Windows: Update binaries to build 45 2017-06-19 12:11:11 +02:00
Frederik Juul ChristianiandJocelyn Turcotte bc2e1a53cb shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.
Since ResetEvent() is never called, the call to WaitForMultipleObjects()
can always return immediately once the event has been signaled.
2017-06-19 12:11:11 +02:00
Frederik Juul ChristianiandJocelyn Turcotte e7d4d12e16 Initialize stop variable.
Avoid stopping the worker thread immediately if the stop variable happens to be true.
2017-06-19 12:11:11 +02:00
Jenkins for ownCloud f348a7d4f4 [tx-robot] updated from transifex 2017-06-19 02:22:08 +02:00
Jenkins for ownCloud 9c82c36c71 [tx-robot] updated from transifex 2017-06-18 02:22:08 +02:00
Jenkins for ownCloud 480388133e [tx-robot] updated from transifex 2017-06-17 02:22:17 +02:00
Jocelyn Turcotte 5d24a2dc0f Remove debug messages by default from sync.engine
Other categories were already set properly.
2017-06-15 20:10:30 +02:00
Christian Kamm 8160963110 Compare the hash of files with identical mtime/size #5589
* For conflicts where mtime and size are identical:

  a) If there's no remote checksum, skip (unchanged)
  b) If there's a remote checksum that's a useful hash, create a
     PropagateDownload job and compute the local hash. If the hashes
     are identical, don't download the file and just update metadata.

* Avoid exposing the existence of checksumTypeId beyond the database
  layer. This makes handling checksums easier in general because they
  can usually be treated as a single blob.

  This change was prompted by the difficulty of producing file_stat_t
  entries uniformly from PROPFINDs and the database.
2017-06-15 13:54:16 +02:00
Christian Kamm d50d8b86cf SyncEngineTest: Add network override
This is useful for monitoring what kind of network requests are
sent to the fake server. Such as "did this sync cause an upload?"
and "was there a propfind for this path?". It can also inject
custom replies.
2017-06-15 13:53:57 +02:00
Christian Kamm b28e06608c SyncEngineTest: Send 'checksums' in FakePropfind 2017-06-15 13:53:57 +02:00
Christian Kamm cd411e5fb1 SyncEngineTest: Fix date locale related bug
The client is very picky about date strings it accepts. If dates are
formatted with a non-C locale (such as localized weekday names), it
fails to parse it and tests fail in subtle ways.
2017-06-15 13:53:57 +02:00
Jocelyn Turcotte 9daef50ce6 shell/Windows: Update binaries to build 45 2017-06-14 14:17:50 +02:00
Frederik Juul ChristianiandJocelyn Turcotte fae178f70b shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.
Since ResetEvent() is never called, the call to WaitForMultipleObjects()
can always return immediately once the event has been signaled.
2017-06-14 12:14:22 +02:00
Frederik Juul ChristianiandJocelyn Turcotte 744208f701 Initialize stop variable.
Avoid stopping the worker thread immediately if the stop variable happens to be true.
2017-06-14 12:14:21 +02:00
Olivier GoffartandOlivier Goffart 85d8ae6b93 AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
Issue #5819
2017-06-14 11:48:24 +02:00
Jenkins for ownCloud ff79cc9107 [tx-robot] updated from transifex 2017-06-14 02:22:19 +02:00
Olivier GoffartandOlivier Goffart 5100a2daf1 OAuth: cleanup debug messages
- Add category to the all messages (they did not have it was merged right after
the patch to add category everywhere, but this code did not have it.)

- Make sure there is no warnings in the normal flow. (The wizard does a request
without authentication to determine the auth type)
2017-06-13 12:08:24 +02:00
Olivier GoffartandOlivier Goffart 6e57b0219e Don't link dirrectly against openssl
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
2017-06-13 11:27:23 +02:00
Markus Goetz 3a002a1ddf Update ChangeLog 2017-06-12 18:46:57 +02:00
Christian KammandOlivier Goffart 4b0d956b3d OAuth: Fix a typo in the success message 2017-06-12 12:58:20 +02:00
Olivier GoffartandOlivier Goffart 85408961ba Wizard: Don't let the second to last page go back with OAuth2
We don't want to re-open the browser in that case.
2017-06-12 12:58:20 +02:00
Olivier GoffartandOlivier Goffart 04b6794318 OAuth: Error handling in the wizard
Issues: #5813 and #5811
2017-06-12 12:58:20 +02:00
Jenkins for ownCloud e86b6b2246 [tx-robot] updated from transifex 2017-06-09 02:22:10 +02:00
Olivier GoffartandOlivier Goffart 3314a472c3 SyncEngine: SelectiveSync: Remove local files of undelected folder despite other modified files
Issue #5783

When the directry that should be removed by selective sync contains changes,
we ignore the whole sub tree instead of only ignoreing new files.
We cannot ignore the whole directory, we need to ignore only the directory
that do not have files to remove
2017-06-08 14:53:54 +02:00