14959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Camila Ayres	b18c62dc41	Merge pull request #472 from nextcloud/feature/noid/loginflow_accept_language ... Set Accept-language header for webview requests	2018-07-03 08:52:11 +02:00
Roeland Jago Douma	0d70b05b65	Set Accept-language header for webview requests ... This way the server will properly translate it for you if it has translations. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-03 07:45:02 +02:00
Nextcloud bot	44205359a5	[tx-robot] updated from transifex	2018-07-03 00:44:23 +00:00
Camila Ayres	2361076b75	Merge pull request #471 from nextcloud/fix/458/do_not_show_webview_by_default ... Do not force to show the webview on construct	2018-07-02 22:22:40 +02:00
Camila Ayres	9627aad04c	Merge branch 'master' into fix/458/do_not_show_webview_by_default	2018-07-02 22:01:03 +02:00
Roeland Jago Douma	cbf417664d	Merge pull request #404 from nextcloud/upstream/pr/6491 ... Proxy settings: Fix bad behavior with empty host	2018-07-02 21:25:53 +02:00
Christian Kamm	70b5d54082	Proxy settings: Fix bad behavior with empty host ... Fixes f6a075ef54 for #5885 When no host is given it shouldn't just *appear* that there is no proxy, there actually shouldn't be a proxy set then.	2018-07-02 21:15:30 +02:00
Roeland Jago Douma	34d964fc80	Do not force to show the webview on construct ... Should fix #458 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 20:09:30 +02:00
Roeland Jago Douma	93c6576bcb	Merge pull request #470 from nextcloud/update-readme ... Adds item about Code of Conduct in the README.	2018-07-02 19:48:07 +02:00
Camila San	4adade9818	More polishing the emojis markdown in the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 18:50:40 +02:00
Camila San	cb6506e3f1	More polishing the emojis markdown in the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 18:25:10 +02:00
Camila San	165b164e95	Fixes CoC links in the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 18:21:35 +02:00
Camila San	c437ffc95f	Adds 'Code of Conduct' item to the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 18:17:32 +02:00
Roeland Jago Douma	9bb58550ff	Merge pull request #469 from nextcloud/update-readme ... Updates the README	2018-07-02 18:11:32 +02:00
Camila San	3bf8002708	README: changes emoji markup positions. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 18:06:59 +02:00
Camila San	74dedf636c	README: trying some emoji markup. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 17:47:12 +02:00
Camila San	19f1513af0	Fixes link, put items in a list in the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 17:29:05 +02:00
Camila San	ee668eb6cd	Changes the order of the content in the README. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 17:24:57 +02:00
Camila San	65cb94c316	Updates the README with info about the daily builds and how to compile the client. ... Signed-off-by: Camila San <hello@camila.codes>	2018-07-02 17:06:48 +02:00
Camila Ayres	178edb97bc	Merge pull request #466 from nextcloud/fix_compile_warnings ... Fix compile warnings	2018-07-02 13:50:04 +02:00
Roeland Jago Douma	08abc71acb	gui Q_UNUSED ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 13:02:15 +02:00
Roeland Jago Douma	ce545b1e47	propage*encrypted Q_UNUSED ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 12:45:44 +02:00
Roeland Jago Douma	e871359453	Remove unneeded ; ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 11:03:58 +02:00
Roeland Jago Douma	b952fa64ee	Restore logger installation ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 11:01:52 +02:00
Nextcloud bot	027565e571	[tx-robot] updated from transifex	2018-07-02 00:42:35 +00:00
Nextcloud bot	09e2a4af60	[tx-robot] updated from transifex	2018-07-01 00:44:43 +00:00
Julius Härtl	bc7ef87d18	Merge pull request #460 from nextcloud/no_trademark_text ... Remove default trademark text	2018-06-29 22:56:28 +02:00
Roeland Jago Douma	d2b75cabb2	Remove default trademark text ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-29 21:36:18 +02:00
Nextcloud bot	85cee68f1d	[tx-robot] updated from transifex	2018-06-29 00:46:29 +00:00
Roeland Jago Douma	70d7676794	Merge pull request #440 from nextcloud/fix/runtestsci ... Run unit tests on drone	2018-06-28 21:55:15 +02:00
Roeland Jago Douma	97ea6c54bc	Run tests on drone ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-28 14:50:35 +02:00
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