Roeland Jago Douma
b7d0e5672a
Merge branch 'master' into upstream/pr/6616
2018-10-31 13:51:34 +01:00
Nextcloud bot
a39d4777fd
[tx-robot] updated from transifex
2018-10-31 01:49:53 +00:00
Roeland Jago Douma
cb4450864e
Merge pull request #656 from nextcloud/upstream/pr/6672
...
Settings: Attempt to fix rename issue on old macOS
2018-10-30 23:04:34 +01:00
Roeland Jago Douma
ef3aeb65cc
Merge pull request #658 from nextcloud/upstream/pr/6698
...
OAuth: Fix infinite loop when the refresh token is expired
2018-10-30 23:04:09 +01:00
Roeland Jago Douma
aca75ee982
Merge pull request #403 from nextcloud/upstream/pr/6372
...
Partial local discovery: Fix scheduling logic
2018-10-30 23:03:16 +01:00
Roeland Jago Douma
326c872ba7
Merge pull request #663 from nextcloud/upstream/pr/6707
...
Windows: Release handle/fd when file open fails #6699
2018-10-30 22:40:44 +01:00
Roeland Jago Douma
dd39887f2b
Merge pull request #641 from nextcloud/upstream/pr/6621
...
TestOAuth: Don't have global static QObject
2018-10-30 22:38:51 +01:00
Roeland Jago Douma
8df9746005
Merge branch 'master' into upstream/pr/6372
2018-10-30 22:37:30 +01:00
Roeland Jago Douma
668c53a0af
Allow to use the login flow with a self signed certificate
...
The QWebEngine uses a different certificate store/system. So we can't
just pass wour accepted certificates in there.
As a work around we now trust the url we set by definition. As this has
to already be approved before we access this.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 22:23:10 +01:00
kevin147147
30032f9c0c
i18n for general settings ui
2018-10-30 17:32:52 +01:00
Nextcloud bot
f2bc5c0482
[tx-robot] updated from transifex
2018-10-30 01:52:44 +00:00
J-P Nurmi
1d3d261e38
Setup wizard: implement an animated and interactive slide show
2018-10-29 19:10:27 +01:00
Nextcloud bot
c40793257d
[tx-robot] updated from transifex
2018-10-29 01:51:50 +00:00
Roeland Jago Douma
85b9f94a36
Merge pull request #748 from caugner/qtkeychain-0.9.1
...
qtkeychain: 0.8.0 -> 0.9.1
2018-10-28 19:45:17 +01:00
Roeland Jago Douma
8688fabee3
Merge branch 'master' into qtkeychain-0.9.1
2018-10-28 19:20:16 +01:00
Nextcloud bot
e88b81c6c9
[tx-robot] updated from transifex
2018-10-27 00:51:13 +00:00
Claas Augner
2344db8937
qtkeychain: 0.8.0 -> 0.9.1
2018-10-26 18:49:03 +02:00
Nextcloud bot
58302e9fc0
[tx-robot] updated from transifex
2018-10-26 00:50:27 +00:00
J-P Nurmi
f48aabf344
Build fix: remove an unused QtSvg/QSvgRenderer include
...
Slipped in in 156605c
2018-10-25 21:32:43 +02:00
Roeland Jago Douma
8acc5573ff
Merge pull request #667 from nextcloud/upstream/pr/6592
...
SettingsDialog: Show the page for the newly created account
2018-10-25 08:23:51 +02:00
Roeland Jago Douma
6224f6a1fa
Merge branch 'master' into upstream/pr/6592
2018-10-25 07:44:04 +02:00
Nextcloud bot
44bc637237
[tx-robot] updated from transifex
2018-10-25 00:49:57 +00:00
Julius Härtl
99d4f81892
Merge branch 'master' into upstream/pr/6592
2018-10-24 22:38:11 +02:00
Julius Härtl
98bedf1031
Merge pull request #659 from nextcloud/upstream/issues/6696-6610
...
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
2018-10-24 22:25:16 +02:00
storca
ef8e029cbf
Merge branch 'master' into patch-1
2018-10-24 18:10:35 +02:00
Roeland Jago Douma
eb31e9205c
Merge branch 'master' into upstream/issues/6696-6610
2018-10-24 16:50:39 +02:00
Roeland Jago Douma
c8204f1725
Merge pull request #640 from nextcloud/upstream/pr/6617
...
OAuth: Remove the timeout
2018-10-24 16:49:59 +02:00
Roeland Jago Douma
174f99728f
Merge branch 'master' into upstream/pr/6617
2018-10-24 16:27:31 +02:00
Roeland Jago Douma
dcdf6d966d
Merge pull request #717 from tuxmaster5000/gitignore
...
Add cmake temporary stuff
2018-10-24 13:22:56 +02:00
Roeland Jago Douma
3e79ebed60
Merge pull request #661 from nextcloud/upstream/pr/6712
...
nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643
2018-10-24 13:22:22 +02:00
Roeland Jago Douma
5237a2c3e2
Merge branch 'master' into upstream/pr/6712
2018-10-24 08:59:29 +02:00
Roeland Jago Douma
6e0d636989
Merge pull request #595 from nextcloud/upstream/pr/6485
...
Show a tray message when a folder watcher becomes unreliable #6119
2018-10-24 08:59:15 +02:00
Roeland Jago Douma
d246c1e8b9
Merge branch 'master' into upstream/pr/6485
2018-10-24 08:27:11 +02:00
Roeland Jago Douma
96541d8ab8
Merge pull request #657 from nextcloud/upstream/pr/6688
...
Support higher resolution theme icons
2018-10-24 08:23:41 +02:00
Roeland Jago Douma
091c4fd9b0
Merge branch 'master' into upstream/pr/6688
2018-10-24 07:29:10 +02:00
Nextcloud bot
8098566140
[tx-robot] updated from transifex
2018-10-24 00:50:56 +00:00
Roeland Jago Douma
21dc97b809
Merge pull request #644 from nextcloud/upstream/pr/6632
...
Reconcile: When detecting a local move, keep the local mtime
2018-10-23 23:13:58 +02:00
Julius Härtl
23883b2b60
Merge branch 'master' into patch-1
2018-10-23 23:11:21 +02:00
Julius Härtl
0f9b8daa57
Merge branch 'master' into upstream/pr/6712
2018-10-23 23:09:26 +02:00
Dominik Schmidt
cddb9aa8ba
Support higher resolution theme icons
2018-10-23 23:07:17 +02:00
Roeland Jago Douma
24606c0105
Merge branch 'master' into upstream/pr/6632
2018-10-23 22:51:12 +02:00
Roeland Jago Douma
3384f7e28b
Merge pull request #660 from nextcloud/upstream/pr/6674
...
Data-Fingerprint: Fix backup detection when fingerprint is empty
2018-10-23 22:50:54 +02:00
Roeland Jago Douma
6b7328bb87
Merge branch 'master' into upstream/pr/6632
2018-10-23 22:48:34 +02:00
Roeland Jago Douma
f3529e3dd7
Merge branch 'master' into upstream/pr/6674
2018-10-23 21:43:13 +02:00
Roeland Jago Douma
305952e32e
Merge pull request #634 from nextcloud/upstream/issue/6581
...
Ensure GETFileJob notices finishing #6581
2018-10-23 21:26:21 +02:00
Roeland Jago Douma
c37186cc56
Merge branch 'master' into upstream/issue/6581
2018-10-23 21:08:51 +02:00
Roeland Jago Douma
4e866123c5
Merge pull request #635 from nextcloud/upstream/issue/6522
...
OAuth2: Try to refresh the token even if the credentials weren't ready.
2018-10-23 21:07:04 +02:00
Roeland Jago Douma
35c0c9c0b1
Merge branch 'master' into upstream/issue/6522
2018-10-23 20:13:28 +02:00
Roeland Jago Douma
d3bc9fbdf3
Merge pull request #639 from nextcloud/upstream/pr/6605
...
UpdateInfo: Remove unused code
2018-10-23 13:05:27 +02:00
Roeland Jago Douma
0cf2970134
Merge branch 'master' into upstream/pr/6605
2018-10-23 12:32:16 +02:00
