Commit graph

10820 commits

Author SHA1 Message Date
Olivier 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 Kamm
4b0d956b3d OAuth: Fix a typo in the success message 2017-06-12 12:58:20 +02:00
Olivier 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 Goffart
04b6794318 OAuth: Error handling in the wizard
Issues: #5813 and #5811
2017-06-12 12:58:20 +02:00
Olivier 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
Christian Kamm
aeeb408c74 Merge branch '2.3' 2017-06-08 13:02:34 +02:00
Olivier Goffart
18c39197e5 ownsql: fix build on jenkins
sqlite3_system_errno was only added in sqlite 3.12

(cherry picked from commit e2e56f45af)
2017-06-08 12:53:45 +02:00
Christian Kamm
7eb8219419 Add extra logging for SQLITE_CANTOPEN errors #5633
(cherry picked from commit 05c1dcef9b)
2017-06-08 12:52:58 +02:00
Jenkins for ownCloud
2f915af690 [tx-robot] updated from transifex 2017-06-08 02:22:10 +02:00
Jenkins for ownCloud
272898a792 [tx-robot] updated from transifex 2017-06-07 02:22:13 +02:00
Olivier Goffart
63c40b45e4 OAuth: Fix the secret to the one from commit 05fd985f9f in the oauth2 repository
05fd985f9f
2017-06-06 14:49:34 +02:00
Olivier Goffart
c17a678385 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.
2017-06-06 14:49:03 +02:00
Olivier Goffart
e2e56f45af ownsql: fix build on jenkins
sqlite3_system_errno was only added in sqlite 3.12
2017-06-06 14:47:11 +02:00
Christian Kamm
05c1dcef9b Add extra logging for SQLITE_CANTOPEN errors #5633 2017-06-06 12:59:57 +02:00
Christian Kamm
cc5fe558ba Fix maintenance mode detection #5755
The server sends "maintenance": "true" which isn't a json boolean...
2017-06-06 10:45:41 +02:00
Jenkins for ownCloud
68ee08440e [tx-robot] updated from transifex 2017-06-05 02:22:03 +02:00
Jenkins for ownCloud
b02b99003a [tx-robot] updated from transifex 2017-06-03 02:22:02 +02:00
Jenkins for ownCloud
e3306abbcb [tx-robot] updated from transifex 2017-06-02 02:22:13 +02:00
Olivier Goffart
3d93527a8e 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
2017-06-01 10:39:33 +02:00
Markus Goetz
8a19f2ac65 ChangeLog: More things that were done until now 2017-06-01 10:37:01 +02:00
Julius Härtl
b7fa50be4c Set proper application name, icon name for freedesktop notifications
Use application name defined in OEM build configuration
2017-06-01 10:01:05 +02:00
Jenkins for ownCloud
61d05fa4d7 [tx-robot] updated from transifex 2017-05-31 02:22:17 +02:00
Markus Goetz
42751f87d9 Application: debug implies logdebug 2017-05-29 22:05:26 +02:00
Dominik Schmidt
0fc3df45ce Remove obsolete FindQtKeychain for Qt4 2017-05-29 21:44:25 +02:00
Dominik Schmidt
78dede2ac4 Fix build on Debian 7 (CMake pre 2.8.12) 2017-05-29 21:44:25 +02:00
Christian Kamm
577a2715bd 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.
2017-05-29 21:41:10 +02:00
Olivier Goffart
f88431adbf 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()
2017-05-29 10:51:05 +02:00
Jenkins for ownCloud
56de50de28 [tx-robot] updated from transifex 2017-05-25 02:22:08 +02:00
Jenkins for ownCloud
a48785ee5e [tx-robot] updated from transifex 2017-05-24 02:22:16 +02:00
Jenkins for ownCloud
3be73ad1ca [tx-robot] updated from transifex 2017-05-23 02:22:15 +02:00
Christian Kamm
03aa7e3044 Sharing: Disable 'set password' button when password is empty #5788 2017-05-22 14:41:06 +02:00
Christian Kamm
91f6cae168 Share dialog: Use default icon if available #5781 2017-05-22 14:15:53 +02:00
Christian Kamm
ddd584077c 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
2017-05-22 10:59:57 +02:00
Christian Kamm
8201f0b6ea Share Dialog: Remove unused hline 2017-05-22 10:59:57 +02:00
Christian Kamm
f2b5fcd706 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.
2017-05-22 10:54:30 +02:00
Christian Kamm
950439e5b8 Sharing dialog: Ensure error labels are expanding #5774 2017-05-22 10:52:52 +02:00
Christian Kamm
f24cdf5a05 Share dialog: Hide the icon when unused
Previously this used up some space when there was no icon, leading
to an oddly indented header.
2017-05-22 10:52:52 +02:00
Christian Kamm
d3b00532b1 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.
2017-05-22 10:52:18 +02:00
Christian Kamm
b7ed0fce2a Account: forget credentials on delete #5752 2017-05-22 10:49:11 +02:00
Christian Kamm
c1d2a9ab92 Sharing: Show warning that link shares are public #5785 #5747
Backport of 3872e060ba33913e43714776a1afce787e772351
2017-05-22 10:28:16 +02:00
Christian Kamm
87a7642381 Settings: Ensure the 'about' label isn't cut off #5760 2017-05-22 10:11:09 +02:00
Christian Kamm
57d965aeba Merge branch '2.3' 2017-05-22 10:00:28 +02:00
Christian Kamm
9b4e00c3fc mirall.desktop.in: Remove superfluous lines #5767 2017-05-22 09:59:13 +02:00
Jenkins for ownCloud
97a4302b58 [tx-robot] updated from transifex 2017-05-22 02:22:15 +02:00
Jenkins for ownCloud
bac5121221 [tx-robot] updated from transifex 2017-05-21 02:22:14 +02:00
Jenkins for ownCloud
3462b1d1a3 [tx-robot] updated from transifex 2017-05-20 02:22:15 +02:00
Jenkins for ownCloud
54cc1cdcf7 [tx-robot] updated from transifex 2017-05-20 01:18:15 +02:00
Jenkins for ownCloud
0fd678e9a6 [tx-robot] updated from transifex 2017-05-19 02:22:22 +02:00
Jenkins for ownCloud
580762b4e6 [tx-robot] updated from transifex 2017-05-18 02:22:27 +02:00