16161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Roeland Jago Douma	54b490c8d1	Merge branch 'master' into qt5.5-compat	2018-11-04 20:41:33 +01:00
Roeland Jago Douma	1e6b0b8924	Merge pull request #780 from jpnurmi/margins ... Margins	2018-11-04 20:20:42 +01:00
Roeland Jago Douma	ef15534c64	Merge branch 'master' into margins	2018-11-04 19:40:40 +01:00
István Váradi	ea806a1287	Patch for Xenial to be able to compile with Qt 5.5	2018-11-04 17:28:13 +01:00
Roeland Jago Douma	b904d79d8f	Merge pull request #776 from nextcloud/feature/migrate_http_to_webflow ... Migrate http auth to webflow	2018-11-04 14:03:13 +01:00
Roeland Jago Douma	0c535872cb	Merge branch 'master' into feature/migrate_http_to_webflow	2018-11-04 13:47:04 +01:00
Nextcloud bot	15553df34e	[tx-robot] updated from transifex	2018-11-04 01:54:37 +00: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
Nextcloud bot	b44408a91b	[tx-robot] updated from transifex	2018-11-03 01:49:48 +00: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	17d05a2ad4	Merge pull request #750 from jpnurmi/slideshow ... Setup wizard: implement an animated and interactive slide show	2018-11-02 12:21:07 +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
Nextcloud bot	c2d947ee02	[tx-robot] updated from transifex	2018-11-02 01:51:45 +00:00
Roeland Jago Douma	28fe702e8e	Merge pull request #769 from nextcloud/l10n/update ... Update to translate strings	2018-11-01 16:13:10 +01:00
Roeland Jago Douma	baf4d5f9fc	Update to translate strings ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-11-01 15:22:41 +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	b30a8528bd	Merge pull request #645 from nextcloud/upstream/wizard ... Wizard enhancement	2018-11-01 09:30:19 +01:00
Roeland Jago Douma	bb4c180c89	Merge branch 'master' into upstream/wizard	2018-11-01 08:32:12 +01:00
Roeland Jago Douma	a23dd9dfb3	Merge pull request #646 from nextcloud/upstream/pr/6656 ... FolderMan::checkPathValidityForNewFolder: make sure to work when fold…	2018-11-01 08:31:36 +01:00
Roeland Jago Douma	3b5d8f0277	Merge branch 'master' into upstream/pr/6656	2018-11-01 08:07:55 +01:00
Nextcloud bot	feb9a69703	[tx-robot] updated from transifex	2018-11-01 01:50:27 +00:00
Roeland Jago Douma	fd2293b067	Merge pull request #655 from nextcloud/upstream/pr/6671 ... Do not require server replies to contain an mtime	2018-10-31 22:19:26 +01:00
Roeland Jago Douma	5cfdc71ca5	Merge branch 'master' into upstream/pr/6671	2018-10-31 21:13:10 +01:00
Roeland Jago Douma	d3ee6ed9c5	Merge pull request #651 from nextcloud/upstream/pr/6616 ... Update: Report on readdir() errors #6610	2018-10-31 21:12:54 +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
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