Roeland Jago Douma
071709ab5e
Merge pull request #946 from hiiamok/qt5.12-wizard-webview
...
Added missing Include
2018-12-13 19:34:42 +01:00
Oskar Kruschitz
1295884420
Added missing Include
...
Fixing an error during Build with Qt5.12:
error: member access into incomplete type 'const QWebEngineCertificateError'
2018-12-13 16:13:01 +01:00
Camila Ayres
f91678ef24
Merge branch 'master' into background
2018-12-06 09:35:15 +01:00
Roeland Jago Douma
8b64db6344
Merge branch 'master' into fix/566/do_not_read_system_exclude
2018-11-27 11:19:20 +01:00
Camila Ayres
72901a4ed8
Merge branch 'master' into background
2018-11-26 21:07:14 +01:00
Roeland Jago Douma
287d78ffd3
Write the actual folder to the log
...
Fixes #873
Not all folder names are proper latin1.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-23 10:33:25 +01:00
Roeland Jago Douma
b93c762205
Fix the activity loop
...
We should stop fetching the moment the activity stream is empty when
fetched. It doesn't matter if the current list is empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-22 10:40:00 +01:00
Roeland Jago Douma
bdd5d423ed
Merge branch 'master' into fix/788/no_activity_flood
2018-11-19 21:29:58 +01:00
Roeland Jago Douma
d8c0fb856c
Merge branch 'master' into share-dialog-take-2
2018-11-19 19:33:05 +01:00
Roeland Jago Douma
6cc496633f
Do not read system exclude list if user exclude is present
...
For #566
Since we only showed the user exclude list (and some extra items) the
system exclude list was still used.
This copies over the system exclude list (if it isn't there).
If it fails we use the system one still.
However if you now remove items from your own list it will really be
gone.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 15:35:32 +01:00
Roeland Jago Douma
1d0bf08a1c
Do not fetch activities if they are not enabled
...
Fixes #788
Fixes #834
If the activity app is not enabled we should not try to fetch the
activities at all.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-19 14:13:51 +01:00
Daniel Hansson
2d6c5f393f
Change link to docs for NC 15
...
This changes the link for the "Host your own" link in the wizard.
2018-11-18 11:02:34 +01:00
rakekniven
6c0cd4bd3a
Fixed typo
...
Reported at Transifex.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-11-17 11:36:16 +01:00
J-P Nurmi
d6170271e9
ShareDialog: increase the width
...
To match the old width it had before the alignment work.
2018-11-17 09:24:45 +01:00
J-P Nurmi
6f145e3a80
ShareUserGroupWidget: allow frame when scrollable
2018-11-17 09:22:52 +01:00
J-P Nurmi
3c193143f2
Cleanup sharedialog.ui
2018-11-17 09:22:52 +01:00
J-P Nurmi
b25e15347b
ShareUserGroupWidget: fix scroll area size management
2018-11-17 09:22:52 +01:00
J-P Nurmi
a8cce41f35
sharedialog.ui: fix scroll area size
2018-11-17 09:22:52 +01:00
J-P Nurmi
f0f691fffc
Cleanup shareuserline.ui
2018-11-17 09:22:52 +01:00
J-P Nurmi
847706432b
ShareLinkWidget: redo the layout
...
NOTE: The progress indicator is temporarily moved one line up to avoid
inserting it on its own line, which would cause the content pushed down
and the dialog size jump back and forth.
2018-11-17 09:22:52 +01:00
J-P Nurmi
bd93489b14
Cleanup shareusergroupwidget.ui
...
Remove hard-coded fixed sizes, size constraints, and other unnecessary
property assignments. This works with any dialog width, meaning that
the width can be defined in one place higher up in the widget hierachy.
2018-11-17 09:22:52 +01:00
J-P Nurmi
96d0059ca4
ShareDialog: use auto-raising tool buttons as confirm buttons
2018-11-17 09:22:52 +01:00
J-P Nurmi
df802472cb
ShareLinkWidget: sync the confirm button size
2018-11-17 09:22:52 +01:00
J-P Nurmi
94750a5ea1
ShareUserGroupWidget: sync the share confirm button size with others
...
This keeps also the total width of the share dialog constant.
2018-11-17 09:22:52 +01:00
J-P Nurmi
fae1c0dbdd
ShareUserLine: fix eliding
...
The widget doesn't have its final size at construction time, so the
width for eliding is not yet known. Let ElidedLabel do the job.
2018-11-17 09:22:52 +01:00
J-P Nurmi
b546e7c224
ElidedLabel: add default constructor
...
Makes it possible to promote QLabel to an ElidedLabel in Qt Designer.
2018-11-17 09:22:52 +01:00
J-P Nurmi
cd58850f5b
ShareUserGroupWidget: remove nested content margins
2018-11-17 09:22:52 +01:00
J-P Nurmi
7d3242077b
ShareDialog: align the left margin
...
All other margins are 10px.
2018-11-17 09:22:52 +01:00
Manuel Stahl
6718f5ad58
Fix cmake build using WITH_PROVIDERS=OFF
...
Fixes #821 .
2018-11-13 14:54:30 +01:00
Julius Härtl
2d79ea5262
More verbose error and proper app name on configuration read error
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-13 11:01:20 +01:00
Roeland Jago Douma
e2c813bfca
Merge branch 'master' into action-colors
2018-11-13 07:41:53 +01:00
Roeland Jago Douma
0d9d942ab7
Merge branch 'master' into modernize
2018-11-12 20:21:13 +01:00
J-P Nurmi
53c89e2196
SettingsDialog: tweak color aware icons
...
If selected text is light, provide a light icon too when selected.
2018-11-12 20:04:02 +01:00
J-P Nurmi
b0959a6292
SettingsDialog: fix a little glitch in the account tool button size
...
SettingsDialog::accountAdded() uses the height of the toolbar to
calculate the desired default size for toolbuttons. Make sure to have
the "General" and "Network" tool buttons in place before calling
accountAdded() to avoid cramped first button.
2018-11-12 18:53:47 +01:00
J-P Nurmi
1af9bf8abc
libsync: run clang-tidy modernize-use-nullptr
2018-11-12 18:46:39 +01:00
J-P Nurmi
0d1c15a768
libsync: run clang-tidy modernize-use-override
2018-11-12 18:43:58 +01:00
J-P Nurmi
48acaec66f
libsync: search'n'replace "Q_DECL_OVERRIDE" with "override"
2018-11-12 18:39:50 +01:00
Roeland Jago Douma
c5a4694c74
Merge branch 'master' into modernize
2018-11-12 14:56:35 +01:00
Roeland Jago Douma
0f2294cef4
Merge pull request #806 from nextcloud/server-notification-handler
...
Fixup the port in server notification URLs
2018-11-12 14:48:30 +01:00
J-P Nurmi
ba53a01339
SlideShow: don't allow clicks while animating
...
Changing slides while animating was looking a bit awkward.
2018-11-11 12:30:33 +01:00
J-P Nurmi
8217c44ee5
SlideShow: slow down the slide interval
...
The original non-animated slide show was running at 2500ms interval.
The new animated slide show was using the same interval, but used
1000ms to animate the slides. This left significantly less time for
the user to read the slides.
2018-11-11 12:27:21 +01:00
J-P Nurmi
fff64e8aa5
GUI: search'n'replace remaining "Q_DECL_OVERRIDE" with "override"
2018-11-11 11:12:37 +01:00
J-P Nurmi
8e38e2ac86
GUI: run clang-tidy modernize-use-override
2018-11-11 11:08:03 +01:00
J-P Nurmi
fb5ff96ed6
GUI: run clang-tidy modernize-use-nullptr
2018-11-11 10:56:22 +01:00
J-P Nurmi
91602574a9
Fixup the port in server notification URLs
...
... in addition to fixing up the scheme and host.
For example, the survey app sends "/settings/admin/survey_client" as
a link. Clicking the "More information" button wouldn't lead to the
correct place if NC was running on a custom port.
2018-11-10 22:24:17 +01:00
rakekniven
a73da99d78
Merge branch 'master' into rakekniven-patch-1
2018-11-09 16:37:43 +01:00
rakekniven
f25ef73772
l10n. Added space for correct grammar.
...
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
2018-11-09 16:37:29 +01:00
Roeland Jago Douma
cf0838643f
Merge pull request #800 from nextcloud/fix/open_activities_on_conflict
...
Actually open the activity view on a click for more info
2018-11-09 16:36:24 +01:00
Roeland Jago Douma
3a0c7f64c0
Use a format that supports alpha channels for avatars
...
If we use the source format it can result in fully black images. As the
basic generated avatar doesn't have an alpha channel.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:01:28 +01:00
Roeland Jago Douma
7925c6c081
Actually open the activity view on a click for more info
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 12:12:25 +01:00
Roeland Jago Douma
9c0e5c2b19
Merge pull request #797 from alexcustos/issue_alternative_log_in
...
Added default scheme when server returns just a host
2018-11-09 08:52:39 +01:00
Aleksandr Borisenko
f5586baee7
Added default scheme when server returns just a host
2018-11-08 11:35:27 +03:00
Aleksandr Borisenko
bb2d31a2bd
Removed explicit initialization; Fixed RAND_bytes not found
2018-11-08 11:24:39 +03:00
J-P Nurmi
3a6d0ee29c
SettingsDialog: disable unnecessary wrapping for the about label
...
For some reason, QLabel with rich text and word wrapping enabled
calculates quite a bit too large size hint. Luckily, it's rich text
that is already divided to paragraphs so that wrapping makes actually
very little visual difference. For example, on my screen, when the
settings dialog is resized horizontally to the minimum, the only word
that actually wrapped was "2017". After this patch, it naturally won't
wrap anymore, but the General Settings page also doesn't leave a large
gap at the bottom. As a result, the minimum height of the dialog went
down from 581 to 525. The exact values depend on the style and fonts.
Fixes #91 .
2018-11-07 20:01:28 +01:00
J-P Nurmi
ee8bcb2a5b
Add a command line option to launch the client in the background
...
Allow passing a --background argument to force the app in the background
even if systray is not available.
Fixes #737
2018-11-07 18:42:36 +01:00
J-P Nurmi
d01a99e9e5
ActivityWidget: remove a hard-coded white background
...
Let the system palette provide the appropriate color.
Fixes #742 .
2018-11-05 22:13:34 +01:00
J-P Nurmi
b8d97b590f
Fix palette usage in ActivityItemDelegate::paint()
...
Fixes #742 .
2018-11-05 20:18:54 +01:00
Roeland Jago Douma
fe60a2a570
Use Nextcloud
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 13:27:30 +01:00
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