Jocelyn Turcotte [Wed, 14 Jun 2017 12:17:50 +0000 (14:17 +0200)]
shell/Windows: Update binaries to build 45
Frederik Juul Christiani [Tue, 13 Jun 2017 09:23:08 +0000 (11:23 +0200)]
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.
Frederik Juul Christiani [Tue, 13 Jun 2017 08:28:12 +0000 (10:28 +0200)]
Initialize stop variable.
Avoid stopping the worker thread immediately if the stop variable happens to be true.
Olivier Goffart [Tue, 13 Jun 2017 11:49:26 +0000 (13:49 +0200)]
AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
Issue #5819
Olivier Goffart [Tue, 13 Jun 2017 08:24:26 +0000 (10:24 +0200)]
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)
Olivier Goffart [Tue, 13 Jun 2017 07:58:20 +0000 (09:58 +0200)]
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
Markus Goetz [Mon, 12 Jun 2017 16:46:57 +0000 (18:46 +0200)]
Update ChangeLog
Christian Kamm [Mon, 12 Jun 2017 09:50:36 +0000 (11:50 +0200)]
OAuth: Fix a typo in the success message
Olivier Goffart [Wed, 7 Jun 2017 14:49:38 +0000 (16:49 +0200)]
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.
Olivier Goffart [Wed, 7 Jun 2017 14:19:34 +0000 (16:19 +0200)]
OAuth: Error handling in the wizard
Issues: #5813 and #5811
Olivier Goffart [Tue, 6 Jun 2017 14:00:41 +0000 (16:00 +0200)]
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
Christian Kamm [Thu, 8 Jun 2017 11:02:34 +0000 (13:02 +0200)]
Merge branch '2.3'
Olivier Goffart [Tue, 6 Jun 2017 12:45:27 +0000 (14:45 +0200)]
ownsql: fix build on jenkins
sqlite3_system_errno was only added in sqlite 3.12
(cherry picked from commit
e2e56f45af059299d942f237ecf9cefbba0c43be)
Christian Kamm [Tue, 6 Jun 2017 10:59:57 +0000 (12:59 +0200)]
Add extra logging for SQLITE_CANTOPEN errors #5633
(cherry picked from commit
05c1dcef9b35a18d358ab307922eceff312e3304)
Jenkins for ownCloud [Thu, 8 Jun 2017 00:22:10 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 7 Jun 2017 00:22:13 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 6 Jun 2017 12:19:24 +0000 (14:19 +0200)]
OAuth: Fix the secret to the one from commit
05fd985f9f in the oauth2 repository
https://github.com/owncloud/oauth2/commit/
05fd985f9fb58d7d2305ce2db6fe24fe6fc08c79
Olivier Goffart [Mon, 29 May 2017 11:00:43 +0000 (13:00 +0200)]
FolderStatusModel: fix assert in Qt when the list of subfolder is empty
Fix an assert that happens in beginInsertRows when opening a folder
and that folder is empty.
This can only be reproduced with a debug build of Qt.
Olivier Goffart [Tue, 6 Jun 2017 12:45:27 +0000 (14:45 +0200)]
ownsql: fix build on jenkins
sqlite3_system_errno was only added in sqlite 3.12
Christian Kamm [Tue, 6 Jun 2017 10:59:57 +0000 (12:59 +0200)]
Add extra logging for SQLITE_CANTOPEN errors #5633
Christian Kamm [Tue, 6 Jun 2017 08:45:15 +0000 (10:45 +0200)]
Fix maintenance mode detection #5755
The server sends "maintenance": "true" which isn't a json boolean...
Jenkins for ownCloud [Mon, 5 Jun 2017 00:22:03 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Jun 2017 00:22:02 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 2 Jun 2017 00:22:13 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 28 Mar 2017 08:31:38 +0000 (10:31 +0200)]
Authentication with OAuth2
When the OAuth2 app (https://github.com/owncloud/oauth2) is enabled,
We will open a browser and perform the OAuth2 authentication
Issue: #4798 and https://github.com/owncloud/platform/issues/17
Markus Goetz [Thu, 1 Jun 2017 08:37:01 +0000 (10:37 +0200)]
ChangeLog: More things that were done until now
Julius Härtl [Mon, 27 Mar 2017 09:12:28 +0000 (11:12 +0200)]
Set proper application name, icon name for freedesktop notifications
Use application name defined in OEM build configuration
Jenkins for ownCloud [Wed, 31 May 2017 00:22:17 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 22 May 2017 15:54:57 +0000 (17:54 +0200)]
Application: debug implies logdebug
Dominik Schmidt [Fri, 26 May 2017 11:25:43 +0000 (13:25 +0200)]
Remove obsolete FindQtKeychain for Qt4
Dominik Schmidt [Fri, 26 May 2017 11:24:54 +0000 (13:24 +0200)]
Fix build on Debian 7 (CMake pre 2.8.12)
Christian Kamm [Mon, 29 May 2017 10:05:22 +0000 (12:05 +0200)]
Download: Retrigger folder discovery on 404
See owncloud/enterprise#1966
If the server and the client's database go out of sync, there could be
persistent 404 errors. This change ensures that the problem corrects
itself eventually by triggering a remote discovery of the file's
parent folders.
It does not address the root cause that might have lead to the
divergence.
Olivier Goffart [Mon, 29 May 2017 08:48:21 +0000 (10:48 +0200)]
Don't call QElapsedTimer::restart on uninitialized timer
That's an undefined behavior.
Since we don't use the return value anyway, we should just use start()
Jenkins for ownCloud [Thu, 25 May 2017 00:22:08 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 May 2017 00:22:16 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 23 May 2017 00:22:15 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Mon, 22 May 2017 12:41:06 +0000 (14:41 +0200)]
Sharing: Disable 'set password' button when password is empty #5788
Christian Kamm [Mon, 22 May 2017 12:15:53 +0000 (14:15 +0200)]
Share dialog: Use default icon if available #5781
Christian Kamm [Thu, 18 May 2017 09:39:13 +0000 (11:39 +0200)]
Share link: Fix disabled API/sharing #5778
* Don't hide the displayed error directly after showing it
* Don't try to fetch shares when sharing isn't possible
Christian Kamm [Thu, 18 May 2017 08:26:12 +0000 (10:26 +0200)]
Share Dialog: Remove unused hline
Christian Kamm [Thu, 18 May 2017 10:41:28 +0000 (12:41 +0200)]
Share link: Fix parsing integer ids #5777
Older ownCloud servers like 8.2.0 used to use integer ids.
This broke when switching to QJson because toString() on JSON
values is strict and returns "" for integers.
Christian Kamm [Fri, 19 May 2017 07:49:24 +0000 (09:49 +0200)]
Sharing dialog: Ensure error labels are expanding #5774
Christian Kamm [Fri, 19 May 2017 07:48:47 +0000 (09:48 +0200)]
Share dialog: Hide the icon when unused
Previously this used up some space when there was no icon, leading
to an oddly indented header.
Christian Kamm [Thu, 27 Apr 2017 11:58:26 +0000 (13:58 +0200)]
Credentials: Simplify credential flow #5728
And as a side effect: don't ask for user password when we can't
connect to the server in the first place.
Christian Kamm [Mon, 22 May 2017 07:32:11 +0000 (09:32 +0200)]
Account: forget credentials on delete #5752
Christian Kamm [Mon, 22 May 2017 07:13:23 +0000 (09:13 +0200)]
Sharing: Show warning that link shares are public #5785 #5747
Backport of
3872e060ba33913e43714776a1afce787e772351
Christian Kamm [Mon, 22 May 2017 08:10:12 +0000 (10:10 +0200)]
Settings: Ensure the 'about' label isn't cut off #5760
Christian Kamm [Mon, 22 May 2017 08:00:28 +0000 (10:00 +0200)]
Merge branch '2.3'
Christian Kamm [Mon, 22 May 2017 07:59:13 +0000 (09:59 +0200)]
mirall.desktop.in: Remove superfluous lines #5767
Jenkins for ownCloud [Mon, 22 May 2017 00:22:15 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 May 2017 00:22:14 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 May 2017 00:22:15 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 19 May 2017 23:18:15 +0000 (01:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 19 May 2017 00:22:22 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 18 May 2017 00:22:27 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Wed, 17 May 2017 11:10:19 +0000 (13:10 +0200)]
Merge remote-tracking branch 'origin/2.3'
Jocelyn Turcotte [Tue, 16 May 2017 15:42:57 +0000 (17:42 +0200)]
Add the account name and folder when starting the sync
This should help clearly delimiting them in the log for multi-account setups.
This information is already available elsewhere in the log in any case.
Issue #5672
Christian Kamm [Wed, 17 May 2017 10:31:49 +0000 (12:31 +0200)]
Reformatting: Add .git-blame-ignore-revs
For git hyper-blame support
Christian Kamm [Wed, 17 May 2017 08:55:42 +0000 (10:55 +0200)]
Apply clang-format
Christian Kamm [Wed, 17 May 2017 08:54:57 +0000 (10:54 +0200)]
Reformatting: Reformat some lines that would become really long
Christian Kamm [Fri, 28 Apr 2017 08:03:49 +0000 (10:03 +0200)]
Reformatting: Adjust trailing comments
These would otherwise be line-wrapped by clang-format,
and then consecutive reformattings remove the aligned
comment indentation
Example:
int a; // too long comment
->
int a; // too long
// comment
->
int a; // too long
// comment
Christian Kamm [Fri, 28 Apr 2017 07:41:52 +0000 (09:41 +0200)]
Add .clang-format style
From http://code.qt.io/cgit/qt/qtrepotools.git/tree/config/_clang-format
Jenkins for ownCloud [Wed, 17 May 2017 00:22:16 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Mon, 15 May 2017 12:46:09 +0000 (14:46 +0200)]
Selective sync: Skip excluded folders when reading db
When a new folder becomes selective-sync excluded, we already mark it
and all its parent folders with _invalid_ etags to force rediscovery.
That's not enough however. Later calls to csync_statedb_get_below_path
could still pull data about the excluded files into the remote tree.
That lead to incorrect behavior, such as uploads happening for folders
that had been explicitly excluded from sync.
To fix the problem, statedb_get_below_path is adjusted to not read the
data about excluded folders from the database.
Currently we can't wipe this data from the database outright because we
need it to determine whether the files in the excluded folder can be
wiped away or not.
See owncloud/enterprise#1965
Jenkins for ownCloud [Tue, 16 May 2017 00:22:31 +0000 (02:22 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 12 May 2017 08:21:07 +0000 (10:21 +0200)]
Wizard: Skip result page with acceptance instead of closing #5764
Jenkins for ownCloud [Fri, 12 May 2017 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Thu, 11 May 2017 13:36:47 +0000 (15:36 +0200)]
Promote a few more logs to info/warning
Markus Goetz [Thu, 11 May 2017 10:18:58 +0000 (12:18 +0200)]
macOS: Fix usage of qCDebug in .mm file
Jocelyn Turcotte [Tue, 9 May 2017 15:04:04 +0000 (17:04 +0200)]
Add the possiblility to enable debug logging categories
Add a checkbox in the log window as well as a --logdebug command-line
option that should have the same effect.
Issue #5647
Jocelyn Turcotte [Fri, 31 Mar 2017 14:13:01 +0000 (16:13 +0200)]
Also pass csync logs through QMessageLogger
This allows using logging rules and custom message patterns with csync.
This also pass the a relative verbosity to the message logger.
Issue #5647
Jocelyn Turcotte [Thu, 30 Mar 2017 11:46:20 +0000 (13:46 +0200)]
Upgrade some qCDebug to qCInfo or qCWarning
Use qCInfo for anything that has general value for support and
development. Use qCWarning for any recoverable error and qCCritical
for anything that could result in data loss or would identify a serious
issue with the code.
Issue #5647
Jocelyn Turcotte [Tue, 9 May 2017 12:24:11 +0000 (14:24 +0200)]
Use Qt logging categories for logging
This gives more insight about the logs and allow setting fine-tuned
logging rules. The categories are set to only output Info by default
so this allows us to provide more concise logging while keeping the
ability to extract more information for a specific category when
developping or debugging customer issues.
Issue #5647
Jocelyn Turcotte [Tue, 28 Mar 2017 13:56:07 +0000 (15:56 +0200)]
Improve the logging message pattern
Add the log level and category name in the output. Only output the
thread ID and function name for qCDebug statements as they are not
necessary for general use and make the log harder to read.
Also make sure that the message pattern is set when NO_MSG_HANDLER is
used. Using an environment variable should have priority over it anyway.
Jocelyn Turcotte [Tue, 28 Mar 2017 18:55:29 +0000 (20:55 +0200)]
Remove the unused folderwatcher_qt implementation
Matthew Setter [Tue, 7 Mar 2017 14:35:37 +0000 (15:35 +0100)]
Add explanation of how to replace local sync folder to FAQ
This fixes owncloud/documentation/issues/2923.
(cherry picked from commit
6580af65c1cd02ed632522f7ed128dfda3200be7)
Markus Goetz [Thu, 11 May 2017 10:03:52 +0000 (12:03 +0200)]
ChangeLog: 2.4 until now
Christian Kamm [Mon, 8 May 2017 10:39:08 +0000 (12:39 +0200)]
Detect maintenance mode #4485
When we first detect a 503 (probably from a PROPFIND) and enter the
ServiceUnavailable state, we new trigger a status.php query that will
switch the state to MaintenanceMode if necessary.
Jenkins for ownCloud [Thu, 11 May 2017 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 8 May 2017 18:57:18 +0000 (20:57 +0200)]
Sharing: Fix UI glitch when sharing is disabled
Markus Goetz [Thu, 4 May 2017 09:31:24 +0000 (11:31 +0200)]
Sharing: Optionally show warning that links are public
For https://github.com/owncloud/enterprise/issues/1914
Jenkins for ownCloud [Wed, 10 May 2017 00:18:36 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Tue, 9 May 2017 16:23:01 +0000 (18:23 +0200)]
Merge branch 2.3 into master
Markus Goetz [Tue, 9 May 2017 11:12:22 +0000 (13:12 +0200)]
Update release_template.md
Markus Goetz [Tue, 9 May 2017 10:23:52 +0000 (12:23 +0200)]
VERSION.cmake: This is 2.3.3 now
Christian Kamm [Tue, 9 May 2017 08:37:40 +0000 (10:37 +0200)]
Remove stray debug output
Jenkins for ownCloud [Tue, 9 May 2017 00:18:36 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Mon, 8 May 2017 17:17:30 +0000 (19:17 +0200)]
Use QTemporaryDir in TestOwnSql
This will improve the cleanup and possibly help for #5366.
Jocelyn Turcotte [Mon, 8 May 2017 16:36:11 +0000 (18:36 +0200)]
Jenkinsfile: Also use 4 parallel jobs for linux builds
Jocelyn Turcotte [Mon, 8 May 2017 16:19:29 +0000 (18:19 +0200)]
Favor QtKeychain installed together with Qt
By default we will look in /usr/lib, which would prevent us from
using a different path for Qt as QtKeychain depends on Qt itself.
Markus Goetz [Mon, 8 May 2017 18:34:57 +0000 (20:34 +0200)]
Update release_template.md
Markus Goetz [Mon, 8 May 2017 15:01:37 +0000 (17:01 +0200)]
Update release_template.md
Markus Goetz [Mon, 8 May 2017 14:17:07 +0000 (16:17 +0200)]
Update release_template.md
Markus Goetz [Mon, 8 May 2017 13:50:09 +0000 (15:50 +0200)]
ChangeLog: 2.3.2
Christian Kamm [Wed, 26 Apr 2017 10:41:30 +0000 (12:41 +0200)]
Remove 3rdparty qjson #5710
Christian Kamm [Wed, 26 Apr 2017 10:40:32 +0000 (12:40 +0200)]
Port PollJob responses to Qt5's QJson #5710
Christian Kamm [Wed, 26 Apr 2017 10:15:33 +0000 (12:15 +0200)]
Switch JsonApiJob to Qt5's QJson #5710
Christian Kamm [Wed, 26 Apr 2017 09:38:10 +0000 (11:38 +0200)]
Sharing: Switch from QtJson to Qt5's QJson #5710
Olivier Goffart [Fri, 28 Apr 2017 11:16:19 +0000 (13:16 +0200)]
Discovery: Increase the MAX_DEPTH and show deep folder as ignored
Before this patch, to deep folder would just be ignored, without any feedback.
This patch makes it so deep folder are properly shown as ignored in the UI.
Also increase the MAX_DEPTH
Issue: #1067
Markus Goetz [Wed, 26 Apr 2017 18:03:55 +0000 (20:03 +0200)]
Selective Sync: Open sub folder context menu #5596