12526 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Camila Ayres	ff23e99a9a	Merge pull request #389 from nextcloud/upstream/pr/6426 ... Theme: unify ownCloudTheme and Theme classes	2018-06-28 14:39:17 +02:00
Roeland Jago Douma	38b89a3fa0	Update testutility ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-28 13:37:02 +02:00
Roeland Jago Douma	6ab7e814a5	Fix tests to actually compile ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-28 13:37:02 +02:00
Roeland Jago Douma	595cbfaa16	Update urls ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-28 12:46:47 +02:00
Camila San	4c7b7dfcaa	Restores previous text in the about section. ... Signed-off-by: Camila San <hello@camila.codes>	2018-06-28 12:33:40 +02:00
Olivier Goffart	c5ace2338c	Theme: unify ownCloudTheme and Theme classes ... The goal is to avoid confusion described in issue #6422 by removing duplicates between the Theme and owncloudTheme. - Use the about from ownCloudTheme everywhere - Create default applicationIcons() and condifFileName() that should work everywhere - trayFolderIcon was removed as it is not used - the helpUrl from the default Theme now points to the owncloud client documentation. Before there was no help entry by default for branded client if the function was not overriden. - Do not merge functions that would otherwise break compatibility with theme that did not override them. For example colors or customMedia.	2018-06-28 12:33:39 +02:00
Roeland Jago Douma	0c21e4945d	Merge pull request #455 from nextcloud/fix/appimage/openssl ... Fix/appimage/openssl	2018-06-27 23:26:44 +02:00
Roeland Jago Douma	cd0b638a80	Add openssl 1.0 to appimage as Qt needs it ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-27 23:14:10 +02:00
Roeland Jago Douma	8d70eab8fe	Checkout depth of 1 for drone for faster cloning ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-27 23:13:56 +02:00
Roeland Jago Douma	5ce9aedb7a	Merge pull request #452 from nextcloud/organize-windows-translation ... Windows: moves translation files to /i18n.	2018-06-27 13:14:19 +02:00
Camila Ayres	acc65cdc4a	Merge branch 'master' into organize-windows-translation	2018-06-27 12:29:56 +02:00
Nextcloud bot	c36dafa317	[tx-robot] updated from transifex	2018-06-27 00:46:34 +00:00
Camila San	e69a9c61d0	Windows: moves translation files to /i18n. ... Signed-off-by: Camila San <hello@camila.codes>	2018-06-26 23:56:34 +02:00
Roeland Jago Douma	aa04f20ad6	Merge pull request #449 from nextcloud/ci/appimage ... Build AppImage with Qt-5.11	2018-06-26 21:18:30 +02:00
Roeland Jago Douma	7ce9c22d2c	Build AppImage with Qt-5.11 ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-26 17:49:00 +02:00
Roeland Jago Douma	106756624a	Merge pull request #448 from nextcloud/ci/clang ... Add clang build to CI	2018-06-26 17:44:23 +02:00
Camila Ayres	e3815608ab	Merge branch 'master' into ci/clang	2018-06-26 17:26:54 +02:00
Camila Ayres	959318adf0	Merge pull request #450 from nextcloud/deps/openssl ... We require openssl 1.1	2018-06-26 17:26:16 +02:00
Roeland Jago Douma	c1bebd1253	We require openssl 1.1 ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-26 16:37:44 +02:00
Roeland Jago Douma	64255f8f09	Add clang build to CI ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-26 15:41:23 +02:00
Julius Härtl	84b7ed04e6	Merge pull request #446 from nextcloud/ci/qt510-qt511 ... Add Qt-5.10 and Qt-5.11 drone builds	2018-06-26 15:08:51 +02:00
Roeland Jago Douma	0a9185b88c	Add Qt-5.10 and Qt-5.11 drone builds ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-26 13:08:34 +02:00
Nextcloud bot	5d96a0e6b6	[tx-robot] updated from transifex	2018-06-25 00:46:38 +00:00
Nextcloud bot	e290b1c353	[tx-robot] updated from transifex	2018-06-24 00:46:16 +00:00
Roeland Jago Douma	1235652cde	Merge pull request #442 from nextcloud/fix/noid/appimage_webview ... Fix webview appimage	2018-06-23 21:36:47 +02:00
Roeland Jago Douma	2c5e559df6	Bundle NSS because else 💥 ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-23 21:29:16 +02:00
Roeland Jago Douma	e79591e52c	Bump drone images ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-23 21:29:16 +02:00
Roeland Jago Douma	9eb950bdcf	Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option ... Hide decrypt option since it does only work for empty folders	2018-06-23 21:20:46 +02:00
Julius Härtl	92480ec8fb	Hide decrypt option since it does only work for empty folders ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-22 12:13:04 +02:00
Roeland Jago Douma	aff749da12	Merge pull request #437 from nextcloud/feature/150/e2e-indicator ... Add indicator to e2e folders	2018-06-22 11:32:22 +02:00
Julius Härtl	e42f5648bd	Add indicator to e2e folders ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-22 11:21:30 +02:00
Camila Ayres	73969e2515	Merge pull request #436 from nextcloud/feature/noid/e2e-mnemonic-dialog ... Use custom mnemonic dialog.	2018-06-22 11:09:54 +02:00
Julius Härtl	655a43db10	Use custom mnemonic dialog ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-22 10:42:01 +02:00
Roeland Jago Douma	cf93b74028	Merge pull request #432 from nextcloud/feature/157/show_mnemonic ... Add a button to E2E accounts to show the mnemonic	2018-06-22 10:15:07 +02:00
Roeland Jago Douma	48a6ef37b2	Add a button to E2E accounts to show the mnemonic ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-21 19:52:27 +02:00
Roeland Jago Douma	a742cbcdce	Merge pull request #409 from nextcloud/upstream/pr/6556 ... Fix make doc-man in shadow build	2018-06-21 19:50:48 +02:00
Roeland Jago Douma	652dd8c812	Merge pull request #410 from nextcloud/upstream/windows-shell-integration ... Windows Shell extention: Fix clicking on the menu entries	2018-06-21 19:42:04 +02:00
Olivier Goffart	0d0bff4bf5	Windows Shell extention: Fix clicking on the menu entries ... Issue #6553	2018-06-21 19:21:07 +02:00
Camila Ayres	4d60dd6516	Merge pull request #431 from nextcloud/fix/webkit-osx ... More fixes for the OSX daily builds.	2018-06-21 15:37:56 +02:00
Roeland Jago Douma	30b211381f	More fixes for the OSX daily builds ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-21 15:22:53 +02:00
Nextcloud bot	9bfdb057cd	[tx-robot] updated from transifex	2018-06-21 00:50:29 +00:00
Jan-Christoph Borchardt	ae6483862e	Merge pull request #416 from nextcloud/bugfix/16/sync-state-icons ... Add new sync state icons	2018-06-20 17:36:38 +02:00
Julius Härtl	b4306884c8	Update theme file ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:27:17 +02:00
Julius Härtl	539823e64a	Add new icons ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:06:20 +02:00
Julius Härtl	0e1302cca5	Remove icons from qrc file ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:06:20 +02:00
Julius Härtl	4ba40a6ce1	Move information icon to warning icon ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:06:19 +02:00
Julius Härtl	38b4febde6	Remove unused icons ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:06:19 +02:00
Roeland Jago Douma	81d8a1ec6b	Merge pull request #419 from nextcloud/fix/osx/no_thead_local ... Thread local storage don't work properly on OSX	2018-06-20 15:15:15 +02:00
Roeland Jago Douma	9fe77ed7bf	Merge pull request #430 from nextcloud/update_mac_deploy-at ... Fix macdeployqt	2018-06-20 15:14:43 +02:00
Roeland Jago Douma	cbf3725814	Fix macdeployqt ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-20 13:05:41 +02:00