6222 Commits

Author	SHA1	Message	Date
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