4134 commits

Author	SHA1	Message	Date
tobiasKaminsky	13ddc01467	NPE during Activity orientation change	2017-04-30 13:02:31 +02:00
Nextcloud bot	a8230f03c9	[tx-robot] updated from transifex	2017-04-30 00:21:24 +00:00
Tobias Kaminsky	f1e113753b	Merge pull request #915 from nextcloud/privatereese-patch-1 ... "And" Missing	2017-04-29 09:08:17 +02:00
tobiasKaminsky	1f67a9ae14	change log_name	2017-04-29 09:04:40 +02:00
tobiasKaminsky	fb025d17d0	db name also "custom"	2017-04-29 09:03:41 +02:00
tobiasKaminsky	21c4551c45	default to "keep file in original folder"	2017-04-29 08:21:50 +02:00
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
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
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
Nextcloud bot	7e5d7f1f4e	[tx-robot] updated from transifex	2017-04-27 00:21:31 +00:00
Mario Danic	b0eb6039fb	Codacy fix	2017-04-26 22:00:58 +02:00
Mario Danic	52e2c42df5	Disable analytics in gplay edition too	2017-04-26 21:59:46 +02:00
Mario Danic	5ecf2ea541	Fix up analytics	2017-04-26 21:59:46 +02:00
Mario Danic	7d1af571bc	Set screen name for a few more screens	2017-04-26 21:58:58 +02:00
Mario Danic	9130635fa1	Progress on Analytics magic	2017-04-26 21:58:00 +02:00
tobiasKaminsky	726a02f39c	Revert "remove firebase from branding branch and put it into branch "analytics"" ... This reverts commit 71ea26df31.	2017-04-26 21:57:59 +02:00
tobiasKaminsky	41494099f2	bottom bar in all activities	2017-04-26 20:40:25 +02:00
alejandro	0b6423ce72	Bug #843 was Fixed ... PreviewImageActivity is removed from the stack activity	2017-04-26 19:25:44 +02:00
Nextcloud bot	4efd85c748	[tx-robot] updated from transifex	2017-04-26 15:19:56 +00:00
Nextcloud bot	5415a42f14	[tx-robot] updated from transifex	2017-04-26 15:15:55 +00:00
tobiasKaminsky	92f12ac6a9	if webview show app name	2017-04-26 15:23:39 +02:00
Andy Scherzinger	af2eef9f15	Merge pull request #872 from nextcloud/nullInSharedView ... always refresh ocShares prior listing them to have an up-to-date ocFile	2017-04-26 09:34:10 +02:00
Nextcloud bot	3d71602697	[tx-robot] updated from transifex	2017-04-26 00:22:16 +00:00
Mario Đanić	8442c045c6	Merge pull request #870 from nextcloud/noFABinSearchView ... disable FAB on searchViews	2017-04-25 18:59:03 +02:00
Mario Đanić	3b7d46abdc	Merge pull request #867 from nextcloud/showSearchViewHeaders ... show correct header for searchViews & fix icon color and text for favorites	2017-04-25 18:46:57 +02:00
Mario Đanić	d8f6d80b4e	Merge pull request #866 from nextcloud/branding-options ... Tweak davdroid config option	2017-04-25 18:39:06 +02:00
Nextcloud bot	4d9df8073a	[tx-robot] updated from transifex	2017-04-25 00:20:25 +00:00
AndyScherzinger	87b810b959	add title method	2017-04-24 11:56:53 +02:00
AndyScherzinger	5f3a1ce9bb	#871 make favorite icon yellow and fix headline adding "yet"	2017-04-24 10:16:48 +02:00
tobiasKaminsky	6ee4ab23c7	show correct header for searchViews	2017-04-24 09:41:44 +02:00
Nextcloud bot	081c058b4c	[tx-robot] updated from transifex	2017-04-24 00:20:35 +00:00
Nextcloud bot	a70967efc0	[tx-robot] updated from transifex	2017-04-23 00:20:25 +00:00
Nextcloud bot	98f1641fe8	[tx-robot] updated from transifex	2017-04-22 00:21:04 +00:00
tobiasKaminsky	5319a63c33	always refresh ocShares prior listing them to have an uptodate ocFile	2017-04-21 15:36:44 +02:00
tobiasKaminsky	42f2ed267d	disable FAB on searchViews	2017-04-21 13:49:39 +02:00
Mario Danic	ca1355bf10	Tweak davdroid config option	2017-04-21 12:36:43 +02:00
Mario Đanić	618c472a72	Merge pull request #861 from nextcloud/renameNightlyToDev ... change all namings of beta/nightly to new "dev"	2017-04-21 10:03:20 +02:00
tobiasKaminsky	f33e022e7b	fix mediaplayer for real this time	2017-04-21 08:28:17 +02:00
tobiasKaminsky	550ae613a1	change all namings of beta/nightly to new "dev"	2017-04-21 07:32:24 +02:00
Nextcloud bot	dcc216b316	[tx-robot] updated from transifex	2017-04-21 00:20:51 +00:00
Mario Danic	f725ada65e	Fix prefs	2017-04-20 23:17:25 +02:00
Mario Đanić	9739edbbec	Merge pull request #624 from Flole998/master ... Added fingerprint support	2017-04-20 22:40:50 +02:00
Mario Đanić	5d50a1cc44	Merge pull request #858 from nextcloud/favoritesSwitchToGrid ... prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 22:39:48 +02:00
Mario Đanić	5baf7860b2	Merge pull request #854 from nextcloud/swipeToRefreshSearch ... Swipe to refresh search	2017-04-20 22:39:34 +02:00
Mario Đanić	27150277a7	Merge pull request #853 from nextcloud/fixLongClicking ... fix missing long click in "search"	2017-04-20 22:39:01 +02:00
Mario Đanić	c19644f86b	Merge pull request #852 from nextcloud/preventCrashWhileRotating ... prevent crash when fetching search event while rotating	2017-04-20 22:38:47 +02:00
Mario Đanić	19705ff438	Merge branch 'master' into externalLinks	2017-04-20 22:37:56 +02:00
Mario Đanić	89f4d81ff1	Merge pull request #824 from nextcloud/contactBackupRestore ... Contact backup & import	2017-04-20 22:36:00 +02:00
AndyScherzinger	299f08694f	fixes due to code review	2017-04-20 21:51:08 +02:00
tobiasKaminsky	fe6171571f	prevent NPE if trying to store grid preference for favorites/shared	2017-04-20 15:34:36 +02:00
tobiasKaminsky	9377f22f51	swipe to refresh for "search"	2017-04-20 11:26:22 +02:00
tobiasKaminsky	95d9ea014c	fix missing long click in "search"	2017-04-20 11:21:25 +02:00
tobiasKaminsky	9c1339b1e4	prevent crash when fetching search event while rotating	2017-04-20 10:32:45 +02:00
AndyScherzinger	ed59604d3f	fixes after rebase	2017-04-20 09:09:14 +02:00
AndyScherzinger	744a1fc549	fix remove line	2017-04-20 09:09:13 +02:00
AndyScherzinger	8bdb8614e6	fixes after rebase due to project structure changes	2017-04-20 09:09:13 +02:00
Flole	674b20364a	Fixed crashes when OEM removes Fingerprintmanager from system	2017-04-20 09:09:13 +02:00
Flole	cbb29e23eb	Removed useless check and double inverse	2017-04-20 09:09:12 +02:00
Flole998	b291d6b3c1	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole998	10f787b186	Update strings.xml	2017-04-20 09:09:12 +02:00
Flole	043ff2ad8f	Fixing issues mentioned in review.	2017-04-20 09:09:11 +02:00
Flole	ace94f1876	Made fingerprintmanager private	2017-04-20 09:09:11 +02:00
Flole	8365ef8073	Fixed some issues	2017-04-20 09:09:11 +02:00
Flole	b6d6208bb8	Fixed some issues	2017-04-20 09:09:10 +02:00
Flole	3b670ce175	Fixed some issues	2017-04-20 09:09:10 +02:00
Flole	99bf76657a	Added Fingerprint Support	2017-04-20 09:09:10 +02:00
Flole	8da1057f3b	Added Fingerprint Support	2017-04-20 09:08:59 +02:00
Nextcloud bot	fb4374d9fc	[tx-robot] updated from transifex	2017-04-20 00:21:12 +00:00
AndyScherzinger	cf7ccdfc65	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/strings.xml	2017-04-19 23:38:31 +02:00
AndyScherzinger	22976389c2	add generic circular avatars for contacts and use slightly smaller, more material like font size	2017-04-19 19:08:59 +02:00
AndyScherzinger	f9c0e1ca09	align text to the right	2017-04-19 18:31:20 +02:00
Mario Danic	312c09b902	Implement icon loading	2017-04-19 18:28:57 +02:00
AndyScherzinger	8187a2582f	Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore ... # Conflicts: # src/main/res/values/setup.xml # src/modified/res/values/setup.xml	2017-04-19 18:25:51 +02:00
AndyScherzinger	4c46665d0c	Merge branch 'master' of https://github.com/nextcloud/android into notifications	2017-04-19 18:11:42 +02:00
AndyScherzinger	cb281d3bb1	further cleanups	2017-04-19 17:41:20 +02:00
AndyScherzinger	a04b3e63dc	cleanups	2017-04-19 17:09:45 +02:00
tobiasKaminsky	c070e9d1bb	missing merge commit	2017-04-19 16:26:29 +02:00
Mario Danic	c0f4b80c43	Implement checkboards for svg	2017-04-19 16:06:23 +02:00
AndyScherzinger	320d991c19	show SVG images	2017-04-19 16:06:22 +02:00
Mario Danic	b3a9c56511	Update things	2017-04-19 15:55:55 +02:00
Mario Danic	0eab8f9a2e	Fix initial subscription	2017-04-19 15:55:55 +02:00
Mario Danic	b787ee6caa	Work	2017-04-19 15:55:53 +02:00
Mario Danic	89ef51b703	Only send registration if all is well	2017-04-19 15:54:55 +02:00
Mario Danic	0cabc398b1	Fix sha512 magic	2017-04-19 15:54:55 +02:00
Mario Danic	8ef8a68a86	Fix a few things	2017-04-19 15:54:55 +02:00
Mario Danic	047bd3cc8e	Work a bit more on notifications	2017-04-19 15:54:55 +02:00
Mario Danic	50bed99eec	clear up notifications	2017-04-19 15:54:54 +02:00
AndyScherzinger	8604a14448	fix double method call	2017-04-19 15:54:54 +02:00
Mario Danic	e429f351a3	Fix drawer menu item	2017-04-19 15:54:54 +02:00
Mario Danic	efeeaf83d9	Make notifications single instance	2017-04-19 15:54:54 +02:00
Mario Danic	76471322ef	Remove Mario	2017-04-19 15:54:54 +02:00
Mario Danic	f21fe2b972	Remove push enabled	2017-04-19 15:54:53 +02:00
Mario Danic	1ea6607186	Improve custom handling	2017-04-19 15:54:53 +02:00
Mario Danic	9ea45c74a7	Basics of push	2017-04-19 15:54:53 +02:00
AndyScherzinger	a49f8792ee	WiP data fetching	2017-04-19 15:54:53 +02:00
AndyScherzinger	a382872313	WiP activity for notifications	2017-04-19 15:54:52 +02:00
Mario Danic	1ab159163c	Fix bunch of stuff	2017-04-19 15:54:52 +02:00
Mario Danic	9684e89daf	Fix drawer menu item	2017-04-19 15:54:52 +02:00
Mario Danic	537c6a12f4	Make notifications single instance	2017-04-19 15:54:52 +02:00
AndyScherzinger	8eeec5f891	add item divider via decorator	2017-04-19 15:54:51 +02:00
AndyScherzinger	ac088c14a0	initial UI implementation displaying notifications	2017-04-19 15:54:51 +02:00
Mario Danic	d5170673ff	Remove Mario	2017-04-19 15:54:51 +02:00
Mario Danic	9e1ceebf9c	Remove push enabled	2017-04-19 15:54:51 +02:00
Mario Danic	c14d26f635	Improve custom handling	2017-04-19 15:54:51 +02:00
Mario Danic	dfc95e6edd	Basics of push	2017-04-19 15:54:50 +02:00