13700 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nextcloud bot	a3d1bd3a42	[tx-robot] updated from transifex	2018-11-19 01:46:32 +00:00
Roeland Jago Douma	1c0fbba98e	Merge pull request #854 from nextcloud/enoch85-patch-1 ... Change link to docs for NC 15	2018-11-18 16:34:14 +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
Nextcloud bot	eaf339b11d	[tx-robot] updated from transifex	2018-11-18 01:48:31 +00:00
Roeland Jago Douma	3a50b57b5a	Merge pull request #848 from nextcloud/rakekniven-patch-1 ... Fixed typo	2018-11-17 13:08:06 +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
Nextcloud bot	3f2ff2e6ba	[tx-robot] updated from transifex	2018-11-17 02:02:47 +00:00
Roeland Jago Douma	433a059223	Merge pull request #843 from Aentfs/master ... Change man page names and contents for nextcloud	2018-11-16 22:35:22 +01:00
Stefan Suhren	d6feb984c3	Change man page names and contents for nextcloud	2018-11-16 16:57:15 +01:00
Nextcloud bot	41f2864ac9	[tx-robot] updated from transifex	2018-11-16 01:47:40 +00:00
Nextcloud bot	b1a2683e62	[tx-robot] updated from transifex	2018-11-15 01:50:21 +00:00
Roeland Jago Douma	4febf7c70b	Merge pull request #823 from Awesome-Technologies/providers ... Fix cmake build using WITH_PROVIDERS=OFF	2018-11-14 14:43:42 +01:00
Roeland Jago Douma	b8f0721fcb	Merge pull request #824 from ivaradi/debian-repo-update ... Debian/Ubuntu target repository update	2018-11-14 14:30:51 +01:00
Roeland Jago Douma	8f95f68f06	Merge branch 'master' into providers	2018-11-14 13:18:37 +01:00
Nextcloud bot	c9b7078fb7	[tx-robot] updated from transifex	2018-11-14 01:47:56 +00:00
István Váradi	f0b96445d2	Fixed the PPA names as well	2018-11-13 20:49:26 +01:00
István Váradi	bcb4b44c69	Also use the correct OBS repository	2018-11-13 16:47:06 +01:00
István Váradi	82f9ec78dc	Use the version kind to differentiate between target repos	2018-11-13 16:44:20 +01:00
István Váradi	5a26e7dabe	Use the tags to determine if a version is a release or a beta one	2018-11-13 16:42:42 +01:00
Manuel Stahl	6718f5ad58	Fix cmake build using WITH_PROVIDERS=OFF ... Fixes #821.	2018-11-13 14:54:30 +01:00
Roeland Jago Douma	88c738dd21	Merge pull request #818 from nextcloud/enhancement/809/config-error ... More verbose error and proper app name on configuration read error	2018-11-13 11:30:18 +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	cc7abc02f4	Merge pull request #813 from jpnurmi/action-colors ... SettingsDialog: tweak color aware icons	2018-11-13 08:16:41 +01:00
Roeland Jago Douma	e2c813bfca	Merge branch 'master' into action-colors	2018-11-13 07:41:53 +01:00
Roeland Jago Douma	5695aba5d7	Merge pull request #811 from jpnurmi/modernize ... libsync: let Clang-Tidy modernize nullptr & override usage	2018-11-13 07:41:10 +01:00
Nextcloud bot	0f9e32d49c	[tx-robot] updated from transifex	2018-11-13 01:52:41 +00:00
Roeland Jago Douma	0d9d942ab7	Merge branch 'master' into modernize	2018-11-12 20:21:13 +01:00
Roeland Jago Douma	9de32d2cb7	Merge pull request #812 from jpnurmi/settings-dialog-accounts ... SettingsDialog: fix a little glitch in the account tool button size	2018-11-12 20:10:30 +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