Roeland Jago Douma
ef15534c64
Merge branch 'master' into margins
2018-11-04 19:40:40 +01:00
Roeland Jago Douma
0c535872cb
Merge branch 'master' into feature/migrate_http_to_webflow
2018-11-04 13:47:04 +01:00
J-P Nurmi
028979d752
ActivityWidget: remove double margins
...
To align margins with the account settings tab, so the content doesn't
jump when switching tabs.
2018-11-03 23:03:54 +01:00
J-P Nurmi
1e1d116052
SettingsDialog: remove an unused button box
...
This makes the bottom margin aligned with horizontal margins, and
eliminates a warning on startup:
[unknown QObject::connect: Cannot connect (null)::clicked() to OCC::SettingsDialog::accept()
2018-11-03 22:49:48 +01:00
Roeland Jago Douma
045bba0161
Migrate http auth to webflow
...
This moves all the basic http auth over to the webflow mechanism.
This thus also makes sure that if the password changes a webflow page
pops up. And thus will directly move them over to apptokens then.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-03 12:37:53 +01:00
Roeland Jago Douma
af8a2819be
Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config
...
Copy over config file to new location on windows
2018-11-02 21:01:22 +01:00
Roeland Jago Douma
0f767ed995
Increase durations a bit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:10:57 +01:00
Roeland Jago Douma
e6f1d7632a
Merge branch 'master' into slideshow
2018-11-02 10:43:01 +01:00
Roeland Jago Douma
40c36a9ed3
Merge pull request #756 from jpnurmi/add-button
...
Make the "Add Folder Sync Connection" button act like a button
2018-11-02 10:39:00 +01:00
Roeland Jago Douma
67714d33db
Merge pull request #744 from jpnurmi/remove-qtsvg-include
...
Build fix: remove an unused QtSvg/QSvgRenderer include
2018-11-02 10:31:01 +01:00
Roeland Jago Douma
e01cb108e1
Merge pull request #754 from kevin147147/patch-1
...
theming for general settings ui
2018-11-02 10:08:18 +01:00
Roeland Jago Douma
3e634dad70
Merge pull request #764 from Awesome-Technologies/user_group_widget
...
Fix warning in ShareUserGroupWidget
2018-11-02 10:05:14 +01:00
Roeland Jago Douma
188a1a6e24
Copy over config file to new location on windows
...
Fixes #766
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-01 15:02:31 +01:00
Roeland Jago Douma
899fca12ba
Merge pull request #721 from storca/patch-1
...
Inform user that configuration is not writable
2018-11-01 11:44:37 +01:00
Roeland Jago Douma
0f1395fdf0
Merge pull request #758 from nextcloud/self-signed-login-flow
...
Allow to use the login flow with a self signed certificate
2018-11-01 11:43:54 +01:00
Manuel Stahl
c9f720b68d
Fix warning in ShareUserGroupWidget
...
Change-Id: I63091c67cd56dce241f04ed6badc090bb25cad5f
2018-11-01 10:26:19 +01:00
Roeland Jago Douma
bb4c180c89
Merge branch 'master' into upstream/wizard
2018-11-01 08:32:12 +01:00
Roeland Jago Douma
3b5d8f0277
Merge branch 'master' into upstream/pr/6656
2018-11-01 08:07:55 +01:00
Roeland Jago Douma
5cfdc71ca5
Merge branch 'master' into upstream/pr/6671
2018-10-31 21:13:10 +01:00
J-P Nurmi
08879c0f14
Make the "Add Folder Sync Connection" button act like a button
2018-10-31 20:05:14 +01:00
Roeland Jago Douma
b7d0e5672a
Merge branch 'master' into upstream/pr/6616
2018-10-31 13:51:34 +01: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
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
J-P Nurmi
1d3d261e38
Setup wizard: implement an animated and interactive slide show
2018-10-29 19:10:27 +01: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
Julius Härtl
99d4f81892
Merge branch 'master' into upstream/pr/6592
2018-10-24 22:38:11 +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
174f99728f
Merge branch 'master' into upstream/pr/6617
2018-10-24 16:27:31 +02:00
Roeland Jago Douma
d246c1e8b9
Merge branch 'master' into upstream/pr/6485
2018-10-24 08:27:11 +02:00
Roeland Jago Douma
091c4fd9b0
Merge branch 'master' into upstream/pr/6688
2018-10-24 07:29:10 +02:00
Julius Härtl
23883b2b60
Merge branch 'master' into patch-1
2018-10-23 23:11:21 +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
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
c37186cc56
Merge branch 'master' into upstream/issue/6581
2018-10-23 21:08:51 +02:00
Roeland Jago Douma
35c0c9c0b1
Merge branch 'master' into upstream/issue/6522
2018-10-23 20:13:28 +02:00
Roeland Jago Douma
0cf2970134
Merge branch 'master' into upstream/pr/6605
2018-10-23 12:32:16 +02:00
Roeland Jago Douma
1c8307f264
Merge branch 'master' into fix-issue-268
2018-10-23 12:04:14 +02:00
Roeland Jago Douma
a492ab8294
Merge branch 'master' into upstream/issue/6545
2018-10-23 10:59:56 +02:00
Roeland Jago Douma
156308c72e
Merge branch 'master' into upstream/issue/6581
2018-10-21 14:19:07 +02:00
Roeland Jago Douma
2dc7ff7332
Merge branch 'master' into upstream/pr/6360
2018-10-19 16:13:09 +02:00
Roeland Jago Douma
7ace48d5de
Merge pull request #643 from nextcloud/upstream/pr/6615
...
Log: Adjust update/reconcile log verbosity
2018-10-19 16:04:26 +02:00
Roeland Jago Douma
56ccff4ee8
Merge pull request #654 from nextcloud/upstream/sqlite-version-3-24
...
sqlite: Update bundled version to 3.24.0
2018-10-19 16:03:04 +02:00