529 commits

Author	SHA1	Message	Date
tobiasKaminsky	a5f83d9d02	change ui for public release	2017-06-30 13:10:59 +02:00
tobiasKaminsky	e049b56c66	show "contacts backup" eithen in drawer or settings	2017-06-30 13:10:58 +02:00
Nextcloud bot	baf33b6b17	[tx-robot] updated from transifex	2017-06-30 00:27:29 +00:00
Nextcloud bot	b2f99131f2	[tx-robot] updated from transifex	2017-06-29 00:27:06 +00:00
Nextcloud bot	f9ec3574c1	[tx-robot] updated from transifex	2017-06-27 00:27:28 +00:00
tobiasKaminsky	a4c0693288	prevent NPE when disabling "storage permission" and then access auto upload	2017-06-26 16:15:27 +02:00
Nextcloud bot	88e58e9c0c	[tx-robot] updated from transifex	2017-06-26 00:27:26 +00:00
Nextcloud bot	5dcb279318	[tx-robot] updated from transifex	2017-06-25 00:27:29 +00:00
Nextcloud bot	0567679d39	[tx-robot] updated from transifex	2017-06-22 00:27:08 +00:00
Nextcloud bot	86d7d5728f	[tx-robot] updated from transifex	2017-06-21 00:26:37 +00:00
tobiasKaminsky	911c6459ff	use grey theme if no theming of elements is possible	2017-06-20 11:23:49 +02:00
tobiasKaminsky	379709d27a	Merge remote-tracking branch 'remotes/origin/master' into userTheming	2017-06-20 09:44:34 +02:00
Nextcloud bot	35b54651f9	[tx-robot] updated from transifex	2017-06-20 00:27:37 +00:00
tobiasKaminsky	d8d03244c0	participate	2017-06-19 12:05:56 +02:00
tobiasKaminsky	f0f5cb5fec	wip & preferences	2017-06-19 11:48:59 +02:00
Nextcloud bot	b0adc600d0	[tx-robot] updated from transifex	2017-06-17 00:28:22 +00:00
tobiasKaminsky	0db845a544	Merge remote-tracking branch 'origin/userTheming' into userTheming	2017-06-16 13:59:53 +02:00
tobiasKaminsky	8fae712a50	colors colors colors	2017-06-16 13:59:45 +02:00
Nextcloud bot	fcef688f1e	[tx-robot] updated from transifex	2017-06-16 00:29:04 +00:00
AndyScherzinger	914b32f7ab	Merge branch 'master' of https://github.com/nextcloud/android into userTheming ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java	2017-06-15 07:47:25 +02:00
Nextcloud bot	8d8f0e572f	[tx-robot] updated from transifex	2017-06-15 00:28:23 +00:00
AndyScherzinger	51c2f1d83d	resolves #1078 - Empty content screen icon colors	2017-06-14 11:31:52 +02:00
tobiasKaminsky	db7f93fd14	use own FAB library to support colored FAB main button.	2017-06-14 07:56:55 +02:00
Nextcloud bot	5f61418fc1	[tx-robot] updated from transifex	2017-06-14 00:26:59 +00:00
tobiasKaminsky	db22cf5bb4	ManageAccountActivity: change color of font and active icon in accounts list	2017-06-13 11:13:04 +02:00
Nextcloud bot	6c76c26bc1	[tx-robot] updated from transifex	2017-06-12 00:25:59 +00:00
Nextcloud bot	6ee38c739b	[tx-robot] updated from transifex	2017-06-08 00:27:39 +00:00
tobiasKaminsky	d84c13a176	use background image from theming app in drawer	2017-06-07 09:33:11 +02:00
Nextcloud bot	a25f953b6e	[tx-robot] updated from transifex	2017-06-07 00:29:26 +00:00
Mario Danic	ee2d09be97	Fix a typo ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-06-06 13:27:16 +02:00
Mario Danic	b530d38b07	Add various customization options ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-06-06 11:32:29 +02:00
Nextcloud bot	962c5bee7e	[tx-robot] updated from transifex	2017-06-06 00:27:03 +00:00
Nextcloud bot	9ec47db602	[tx-robot] updated from transifex	2017-06-05 00:26:28 +00:00
Nextcloud bot	3ac9c40469	[tx-robot] updated from transifex	2017-06-04 00:27:38 +00:00
Nextcloud bot	3de6aa9b51	[tx-robot] updated from transifex	2017-06-03 00:25:35 +00:00
Nextcloud bot	1e66a8235a	[tx-robot] updated from transifex	2017-06-02 00:27:31 +00:00
Nextcloud bot	22044ec663	[tx-robot] updated from transifex	2017-06-01 00:25:29 +00:00
AndyScherzinger	dd54aa7207	Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup	2017-05-31 21:55:31 +02:00
AndyScherzinger	29bd72141d	corrected left icon size to file_icon_size	2017-05-31 12:52:13 +02:00
alejandro	1d92fe8df6	Removing RecyclerView	2017-05-31 11:02:24 +02:00
alejandro	fba1d38100	Header was added in ActivitiesView ... RichSubject was Added	2017-05-31 11:02:19 +02:00
Nextcloud bot	a9a72106ee	[tx-robot] updated from transifex	2017-05-31 00:26:39 +00:00
alejandro	f0b76ede44	Add Load Contact in Background and ProgressBar ... Fixing Comparator Format code	2017-05-30 16:18:16 -05:00
AndyScherzinger	bdcbbb13c5	slightly enlarge autoUpload on/off button hitbox	2017-05-30 08:41:16 +02:00
tobiasKaminsky	328b6625ab	change auto upload path to "/Auto Upload"	2017-05-30 08:41:15 +02:00
tobiasKaminsky	7103fea76d	changed to default ... only "on wifi" is in settings	2017-05-30 08:41:15 +02:00
tobiasKaminsky	ab096dd0f7	background logic implemented	2017-05-30 08:40:55 +02:00
Andy Scherzinger	0112219dd3	Merge pull request #1050 from nextcloud/comradekingu-patch-1 ... Spelling: "Login" is not a verb. + ": Uppercase"	2017-05-30 07:46:05 +02:00
Nextcloud bot	04d7b6895c	[tx-robot] updated from transifex	2017-05-30 00:27:06 +00:00
AndyScherzinger	1b6dc03872	Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles	2017-05-29 21:42:51 +02:00
Mario Đanić	e2f07eb2d4	Merge pull request #1011 from nextcloud/contactListImprovement ... Contact list improvement	2017-05-29 21:15:28 +02:00
comradekingu	7a7091d135	Update strings.xml ... Spelling: "Login" is not a verb. + ": Uppercase"	2017-05-29 18:35:06 +02:00
Mario Danic	c774aa3040	Partially fix stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-29 12:57:19 +02:00
Nextcloud bot	7d2b37e3ec	[tx-robot] updated from transifex	2017-05-28 00:26:08 +00:00
Nextcloud bot	b6c592a067	[tx-robot] updated from transifex	2017-05-27 00:26:51 +00:00
AndyScherzinger	de58c864bb	fix folder/upload icons for empty list view (Nc blue + 50% opacity)	2017-05-26 11:36:54 +02:00
AndyScherzinger	dc21800299	fix material design color definitions	2017-05-26 11:19:13 +02:00
AndyScherzinger	49453742c9	cleanup actionbar style definition	2017-05-26 11:19:13 +02:00
tobiasKaminsky	5edd32b753	removed nc_blue_accent and nc_blue and use colors from setup.xml	2017-05-26 11:19:13 +02:00
tobiasKaminsky	b3eb13c2df	removed navigation bar color and set to primary	2017-05-26 11:19:12 +02:00
tobiaskaminsky	bf4191e251	checkbox in off state: grey ... auto upload cloud icon in on state: tint it	2017-05-26 11:19:12 +02:00
tobiasKaminsky	71a9b683fa	change auto upload cloud icon	2017-05-26 11:19:11 +02:00
tobiasKaminsky	8ba192f38a	tint checkboxes	2017-05-26 11:19:11 +02:00
tobiasKaminsky	e671cecc45	WIP use colors from setup.xml for folder icons	2017-05-26 11:19:10 +02:00
Nextcloud bot	8d510e5244	[tx-robot] updated from transifex	2017-05-26 00:25:54 +00:00
Nextcloud bot	e2254cceac	[tx-robot] updated from transifex	2017-05-25 00:25:34 +00:00
tobiasKaminsky	b11ca04f8a	Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement	2017-05-24 11:13:44 +02:00
Nextcloud bot	7995544f6c	[tx-robot] updated from transifex	2017-05-24 00:26:32 +00:00
Mario Đanić	c2edec6815	Merge pull request #1021 from nextcloud/brandingDrawer ... Drawer branding	2017-05-24 00:56:44 +02:00
tobiaskaminsky	778829d69c	- always update contacts backup folder ... - if file is not downloaded, download it then show content	2017-05-24 00:55:48 +02:00
Mario Đanić	febd1435de	Merge pull request #995 from nextcloud/crashDueToEmptyString ... Crash due to non-existing empty string	2017-05-24 00:15:14 +02:00
Nextcloud bot	0ae25b0c2c	[tx-robot] updated from transifex	2017-05-23 06:55:56 +00:00
Nextcloud bot	00f4e595fa	[tx-robot] updated from transifex	2017-05-23 00:26:22 +00:00
tobiaskaminsky	ce57d257b1	Merge remote-tracking branch 'remotes/origin/master' into brandingDrawer2	2017-05-22 10:03:15 +02:00
tobiaskaminsky	1f8ee72aa5	set to 757575ff and no transparence as in othere files	2017-05-22 10:02:08 +02:00
tobiaskaminsky	16cfaa5525	change/add nav_videos res	2017-05-22 09:49:58 +02:00
Nextcloud bot	9bc5d1bde7	[tx-robot] updated from transifex	2017-05-22 00:25:50 +00:00
Nextcloud bot	ae373a0693	[tx-robot] updated from transifex	2017-05-21 00:25:37 +00:00
Nextcloud bot	50889f726b	[tx-robot] updated from transifex	2017-05-20 00:24:46 +00:00
Nextcloud bot	4ed4ed8dc0	[tx-robot] updated from transifex	2017-05-19 00:25:56 +00:00
tobiaskaminsky	7eddd7440c	fixed "all files"	2017-05-18 14:34:44 +02:00
tobiaskaminsky	fabecc86a5	Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement	2017-05-18 13:47:03 +02:00
Tobias Kaminsky	98989a9363	Merge 44b9355315 into 547453760e	2017-05-18 10:52:31 +00:00
tobiaskaminsky	da497abdb6	move/copy drawer icons	2017-05-18 12:20:55 +02:00
Nextcloud bot	547453760e	[tx-robot] updated from transifex	2017-05-18 00:24:19 +00:00
Tobias Kaminsky	c2010bb3d0	Merge branch 'master' into crashDueToEmptyString	2017-05-17 15:26:05 +02:00
Mario Đanić	01e7112a9a	Merge pull request #194 from nextcloud/setAsWallpaper ... Set as wallpaper/contact-photo/etc.	2017-05-17 13:26:51 +02:00
Tobias Kaminsky	d6a1c7ee83	Merge branch 'master' into crashDueToEmptyString	2017-05-17 12:10:52 +02:00
Nextcloud bot	a79dbe78d4	[tx-robot] updated from transifex	2017-05-17 09:58:58 +00:00
Nextcloud bot	e420fac753	[tx-robot] updated from transifex	2017-05-17 00:23:49 +00:00
tobiasKaminsky	e520c5a585	fix some issues/warnings ... fix some issues/warnings scoping back	2017-05-16 13:14:19 +02:00
Mario Đanić	f1c0317dce	Merge pull request #1001 from nextcloud/enhanceParticipate ... Minor improvements to participate view	2017-05-16 11:06:20 +02:00
Nextcloud bot	e4e75bc7cb	[tx-robot] updated from transifex	2017-05-16 00:23:28 +00:00
tobiasKaminsky	6c6b0465b6	Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper	2017-05-15 14:08:36 +02:00
Tobias Kaminsky	cea61893a0	Merge branch 'master' into enhanceParticipate	2017-05-15 14:04:15 +02:00
Tobias Kaminsky	a2ff44a77e	Merge branch 'master' into crashDueToEmptyString	2017-05-15 12:44:22 +02:00
tobiasKaminsky	ebd94e889e	use contribute url from setup.xml ... escape quote signs	2017-05-15 11:42:28 +02:00
tobiasKaminsky	6f3c3b5579	remove all "string empty"	2017-05-15 10:27:43 +02:00
tobiasKaminsky	aeba233894	use app specific log folder	2017-05-15 09:08:19 +02:00
tobiasKaminsky	4e80906cd9	fix typo	2017-05-15 07:40:14 +02:00
tobiasKaminsky	c6c1713ec2	beautify it	2017-05-15 07:39:00 +02:00
tobiasKaminsky	3351cd4541	add string.empty	2017-05-15 07:38:19 +02:00
Nextcloud bot	0017e16748	[tx-robot] updated from transifex	2017-05-15 00:23:31 +00:00
Nextcloud bot	6db771d36a	[tx-robot] updated from transifex	2017-05-14 00:23:16 +00:00
tobiaskaminsky	c28f17d9af	remove old reference to onClick, this is now handled via ButterKnife ... use "end" instead of "right" for RTL support	2017-05-13 22:30:00 +02:00
Andy Scherzinger	6409e22228	Merge pull request #502 from nextcloud/recognizeMaintenanceMode ... Recognize maintenance mode	2017-05-13 13:31:41 +02:00
Nextcloud bot	d0427e78ab	[tx-robot] updated from transifex	2017-05-13 00:23:27 +00:00
davigonz	ea0b399550	Changed maintenance mode message	2017-05-12 15:46:01 +02:00
davigonz	9594835f24	Change dynamically the authentication maintenance mode message with the name of the app ... # Conflicts: # res/values/strings.xml	2017-05-12 15:46:00 +02:00
davigonz	a08fe1e2c9	Changed maintenance mode message	2017-05-12 15:45:56 +02:00
davigonz	8b22e17ab2	Change dynamically the authentication maintenance mode message with the name of the app ... # Conflicts: # res/values/strings.xml	2017-05-12 15:45:56 +02:00
davigonz	74e2438ada	Changed maintenance mode message	2017-05-12 15:45:50 +02:00
davigonz	036b34ca3c	Change dynamically the authentication maintenance mode message with the name of the app ... # Conflicts: # res/values/strings.xml	2017-05-12 15:45:50 +02:00
davigonz	81baba92a0	Changed maintenance mode message	2017-05-12 15:45:44 +02:00
davigonz	1b95c2fb91	Change dynamically the authentication maintenance mode message with the name of the app ... # Conflicts: # res/values/strings.xml	2017-05-12 15:45:44 +02:00
davigonz	a417f2ab2b	Change dynamically the maintenance mode message with the name of the app	2017-05-12 15:45:43 +02:00
davigonz	c7ef965564	Show maintenance mode message while authenticating ... # Conflicts: # src/com/owncloud/android/authentication/AuthenticatorActivity.java	2017-05-12 15:45:43 +02:00
davigonz	c47970857c	Show maintenance mode message while downloading, removing, renaming or creating folder operations	2017-05-12 15:45:42 +02:00
davigonz	ad6d867971	Show maintenance mode error in notifications while uploading a file ... # Conflicts: # build.gradle # res/values/strings.xml	2017-05-12 15:45:42 +02:00
Tobias Kaminsky	b98beaf0ef	Merge branch 'master' into setAsWallpaper	2017-05-12 15:18:52 +02:00
tobiaskaminsky	01761718d9	handle Nougat and wallpaper app	2017-05-12 15:17:16 +02:00
tobiaskaminsky	58c9a7ddc7	remove authority cache	2017-05-12 15:03:34 +02:00
tobiaskaminsky	d50ee0085d	Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper	2017-05-12 15:02:11 +02:00
tobiasKaminsky	854a3c026c	added privacy webview ... restructured setup.xml adapted modified/setup.xml to general/setup.xml	2017-05-12 12:43:36 +02:00
Nextcloud bot	8ec2a1de46	[tx-robot] updated from transifex	2017-05-12 00:22:16 +00:00
Mario Đanić	99114a2c72	Merge pull request #972 from nextcloud/hideContactsBackupFolder ... Hide contacts backup folder	2017-05-11 11:32:15 +02:00
Nextcloud bot	db7e5fae89	[tx-robot] updated from transifex	2017-05-10 00:24:22 +00:00
alejandro	28dfecc6d9	Fix Issue #970	2017-05-09 17:43:00 -05:00
Nextcloud bot	e7fa4d24e5	[tx-robot] updated from transifex	2017-05-09 00:22:33 +00:00
Nextcloud bot	5dc5863af3	[tx-robot] updated from transifex	2017-05-08 00:21:53 +00:00
Nextcloud bot	db660e12d5	[tx-robot] updated from transifex	2017-05-07 00:21:47 +00:00
Nextcloud bot	ada1d9e9ab	[tx-robot] updated from transifex	2017-05-06 00:21:25 +00:00
Nextcloud bot	2705f3e116	[tx-robot] updated from transifex	2017-05-05 00:21:30 +00:00
Tobias Kaminsky	d1a68cc834	Merge pull request #947 from nextcloud/externalStorage ... Enhance external Sdcard usage	2017-05-04 15:51:03 +02:00
tobiasKaminsky	be4fb43fb4	extract strings, use title	2017-05-04 11:12:14 +02:00
Nextcloud bot	8a9ff494e2	[tx-robot] updated from transifex	2017-05-04 09:04:46 +00:00
Nextcloud bot	9cf326d44e	[tx-robot] updated from transifex	2017-05-04 08:47:51 +00:00
Nextcloud bot	bfa1f060c0	[tx-robot] updated from transifex	2017-05-04 00:21:28 +00:00
tobiasKaminsky	8ccff56370	if source folder does not exist, still allow to move to new folder	2017-05-03 17:21:02 +02:00
Nextcloud bot	1246675b0e	[tx-robot] updated from transifex	2017-05-03 00:21:39 +00:00
Nextcloud bot	c9a53cb042	[tx-robot] updated from transifex	2017-05-02 06:46:46 +00:00
Nextcloud bot	d77b446e0d	[tx-robot] updated from transifex	2017-05-02 00:21:53 +00:00
Nextcloud bot	e44a5d690c	[tx-robot] updated from transifex	2017-05-01 00:21:49 +00:00
Mario Đanić	f07c78221d	Merge pull request #874 from nextcloud/contacts-fragment-replace ... Contacts backup improvements/bugfixes	2017-04-30 19:47:50 +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
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
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
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
Mario Danic	b38866ebc7	Lots of magic	2017-04-28 10:39:52 +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
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
AndyScherzinger	d0521c1c89	rename flag from logout to show_drawer_logout	2017-04-27 11:28:59 +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	9130635fa1	Progress on Analytics magic	2017-04-26 21:58:00 +02:00
tobiasKaminsky	41494099f2	bottom bar in all activities	2017-04-26 20:40:25 +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
Nextcloud bot	3d71602697	[tx-robot] updated from transifex	2017-04-26 00:22:16 +00: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	5f3a1ce9bb	#871 make favorite icon yellow and fix headline adding "yet"	2017-04-24 10:16:48 +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
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	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 Đanić	9739edbbec	Merge pull request #624 from Flole998/master ... Added fingerprint support	2017-04-20 22:40:50 +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	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
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	99bf76657a	Added Fingerprint Support	2017-04-20 09:09:10 +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