7338 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nextcloud bot	7b1f251a0d	[tx-robot] updated from transifex	2017-04-29 00:21:08 +00:00
Mario Đanić	e9dc702dfc	Merge pull request #904 from nextcloud/customErrorWebView ... ability to show custom error message for webview	2017-04-28 22:59:07 +02:00
Bernhard Blieninger	299a71e03f	I think the "and" is missing.	2017-04-28 22:38:31 +02:00
Mario Danic	87cb2890ad	Cancel job only for an account	2017-04-28 20:51:47 +02:00
alejandro	887645921f	Fixing duplicated code	2017-04-28 10:22:47 -05:00
tobiasKaminsky	fa84532da7	make custom build 100% independent	2017-04-28 15:05:50 +02:00
tobiasKaminsky	c9c2cdbb4e	add Arbitrary Data table ... use it for multiple account contact backup	2017-04-28 14:52:30 +02:00
tobiasKaminsky	935e795a85	Merge remote-tracking branch 'remotes/origin/contacts-fragment-replace' into contactBackupRestore	2017-04-28 14:12:46 +02:00
tobiasKaminsky	21418cdc2d	Merge remote-tracking branch 'origin/master' into contactBackupRestore	2017-04-28 14:09:32 +02:00
tobiasKaminsky	aca5040a80	add Arbitrary Data table	2017-04-28 14:09:23 +02:00
Andy Scherzinger	957670eb97	Merge pull request #906 from nextcloud/manageAccountNPE ... prevent NPE if quotaLink does not exist, e.g. in manageaccount activity	2017-04-28 11:25:02 +02:00
Mario Danic	1cd175a1e5	Fix bugs	2017-04-28 10:39:59 +02:00
tobiasKaminsky	02411467b8	cancel specific backup job ... disable daily backup on remove	2017-04-28 10:39:59 +02:00
tobiasKaminsky	7fc6d5fb6d	deleted not needed xml stuff	2017-04-28 10:39:58 +02:00
AndyScherzinger	4dae921763	change style of import button	2017-04-28 10:39:58 +02:00
tobiasKaminsky	06d87d7a11	add select/deselect all button	2017-04-28 10:39:57 +02:00
Mario Danic	3522d28fbf	Fix all issues	2017-04-28 10:39:57 +02:00
Mario Danic	cb00d3f422	Fix enable automatic job	2017-04-28 10:39:56 +02:00
Mario Danic	fc2f762bb2	Fix restore appearance	2017-04-28 10:39:56 +02:00
AndyScherzinger	85846e154f	revert bottom_toolbar_enabled to false	2017-04-28 10:39:56 +02:00
AndyScherzinger	841ad6c348	minor code review fixes	2017-04-28 10:39:55 +02:00
AndyScherzinger	097b05d59a	fixes after rebase	2017-04-28 10:39:55 +02:00
AndyScherzinger	7a5409f0e8	extract listener to class	2017-04-28 10:39:55 +02:00
AndyScherzinger	8d46e8b9d2	remove/re-add for proper win support...	2017-04-28 10:39:54 +02:00
AndyScherzinger	7afe91914f	remove/re-add for proper win support...	2017-04-28 10:39:54 +02:00
Mario Danic	e89e290c87	Take more time to pop	2017-04-28 10:39:53 +02:00
Mario Danic	573545d740	Fix remembering state/selection/etc	2017-04-28 10:39:53 +02:00
Mario Danic	b38866ebc7	Lots of magic	2017-04-28 10:39:52 +02:00
Mario Danic	16d79b4645	Fix build issue	2017-04-28 10:39:52 +02:00
Mario Danic	dac342cc25	Fix pkg name again	2017-04-28 10:39:52 +02:00
Mario Danic	1f5e134fb9	Fix codacy issues	2017-04-28 10:39:51 +02:00
Mario Danic	382ee5dc1c	Small reformat	2017-04-28 10:39:51 +02:00
Mario Danic	0994140d55	Progress on magic	2017-04-28 10:39:51 +02:00
Mario Đanić	28582da92a	Merge pull request #901 from nextcloud/gplay-edition ... Gplay edition	2017-04-28 10:01:44 +02:00
tobiasKaminsky	50ffaaa993	- rename zstore to gplay ... - only one build.gradle, but with commented lines for gplay/modified	2017-04-28 09:26:16 +02:00
tobiasKaminsky	7693705ef2	adding build variants to doc	2017-04-28 09:25:24 +02:00
alejandro	10b48a21ec	Fixing imports	2017-04-27 15:23:36 -05:00
alejandro	58566337f6	Fix to load error page from raw	2017-04-27 15:11:04 -05:00
Mario Đanić	fd161aa99f	Merge pull request #897 from nextcloud/WebViewTitle ... if webview show app name	2017-04-27 14:54:47 +02:00
tobiasKaminsky	57f0df279a	use themed color instead of white	2017-04-27 14:53:31 +02:00
Andy Scherzinger	dc2bacc857	Merge pull request #908 from nextcloud/missingBottomBar ... add missing layout param	2017-04-27 14:19:53 +02:00
Andy Scherzinger	2de760428c	Merge pull request #902 from comradekingu/language ... Revamp of upstream strings	2017-04-27 14:19:12 +02:00
tobiasKaminsky	c5e2673309	add missing layout param	2017-04-27 13:05:19 +02:00
tobiasKaminsky	a5d255afed	prevent NPE if quotaLink does not exist, e.g. in manageaccount activity	2017-04-27 12:41:15 +02:00
Mario Đanić	da6175595c	Merge pull request #898 from nextcloud/logoutButton ... logout button in drawer	2017-04-27 11:31:35 +02:00
AndyScherzinger	d0521c1c89	rename flag from logout to show_drawer_logout	2017-04-27 11:28:59 +02:00
tobiasKaminsky	003076eb14	ability to show custom error message for webview	2017-04-27 10:08:39 +02:00
AndyScherzinger	7a4c75aebb	fix logout button coloring	2017-04-27 09:19:11 +02:00
tobiasKaminsky	de9aa39c87	logout button in drawer	2017-04-27 09:19:11 +02:00
Allan Nordhøy	b5c7833895	Revamp of upstream strings	2017-04-27 06:44:41 +02:00