369 commits

Author	SHA1	Message	Date
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
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
Mario Danic	b787ee6caa	Work	2017-04-19 15:55:53 +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	f21fe2b972	Remove push enabled	2017-04-19 15:54:53 +02:00
Mario Danic	9ea45c74a7	Basics of push	2017-04-19 15:54:53 +02:00
Mario Danic	1ab159163c	Fix bunch of stuff	2017-04-19 15:54:52 +02:00
AndyScherzinger	ac088c14a0	initial UI implementation displaying notifications	2017-04-19 15:54:51 +02:00
Mario Danic	9e1ceebf9c	Remove push enabled	2017-04-19 15:54:51 +02:00
Mario Danic	dfc95e6edd	Basics of push	2017-04-19 15:54:50 +02:00
AndyScherzinger	20ac3b4e69	empty list icon, use latest empty list layout and butterknife	2017-04-19 15:54:49 +02:00
AndyScherzinger	cb8c8caf7d	WiP activity for notifications	2017-04-19 15:54:49 +02:00
AndyScherzinger	0325dd37e5	notifications icon work	2017-04-19 15:54:49 +02:00
Tobias Kaminsky	20e83d269b	Merge pull request #830 from nextcloud/fix-fileprovider ... Fix fileprovider	2017-04-19 14:07:57 +02:00
Tobias Kaminsky	751e5068d1	Merge pull request #828 from nextcloud/fix-branding ... Improve branding	2017-04-19 14:02:09 +02:00
Mario Đanić	e9c9884357	Merge pull request #827 from nextcloud/welcome-webview ... Implement webview welcome pages	2017-04-19 09:05:17 +02:00
tobiasKaminsky	ae75177f75	smaller borders, vertical centered text	2017-04-19 08:45:46 +02:00
Nextcloud bot	9da87449d7	[tx-robot] updated from transifex	2017-04-19 00:21:05 +00:00
tobiasKaminsky	c47408d33c	Merge remote-tracking branch 'origin/master' into contactBackupRestore	2017-04-18 09:14:13 +02:00
tobiasKaminsky	e0a71f8810	Merge remote-tracking branch 'remotes/origin/contactBackupRestore' into contactBackupRestore	2017-04-18 09:07:41 +02:00
Mario Đanić	c76943803b	Merge pull request #836 from nextcloud/UploadListCount ... Upload: count uploads	2017-04-18 08:36:07 +02:00
tobiasKaminsky	0ab392a00d	use recyclerview	2017-04-18 08:23:56 +02:00
tobiasKaminsky	d058efc2de	contact list: text is now in line with header ... round images	2017-04-18 08:23:56 +02:00
tobiasKaminsky	9aff159c16	make headlines bold ... set initial state of last backup to "never"	2017-04-18 08:23:55 +02:00
tobiasKaminsky	35e683546c	contact backup & import	2017-04-18 08:23:55 +02:00
Nextcloud bot	538ca93c5a	[tx-robot] updated from transifex	2017-04-18 00:20:54 +00:00
AndyScherzinger	708a261409	minor material design layout fixes	2017-04-17 20:12:27 +02:00
tobiasKaminsky	b5a9813cbc	use recyclerview	2017-04-17 19:45:17 +02:00
tobiasKaminsky	16296153de	contact list: text is now in line with header ... round images	2017-04-17 19:45:16 +02:00
tobiasKaminsky	9c37334ef7	make headlines bold ... set initial state of last backup to "never"	2017-04-17 19:45:16 +02:00
tobiasKaminsky	d1d01db7a1	contact backup & import	2017-04-17 19:45:12 +02:00
AndyScherzinger	c90354af17	For pending, failed, etc. show the item count	2017-04-17 19:25:12 +02:00
Nextcloud bot	8d3617a742	[tx-robot] updated from transifex	2017-04-17 00:20:39 +00:00
Nextcloud bot	d024dceb9e	[tx-robot] updated from transifex	2017-04-16 00:20:42 +00:00
Nextcloud bot	c5744c61b5	[tx-robot] updated from transifex	2017-04-15 00:22:23 +00:00
Nextcloud bot	e781d20704	[tx-robot] updated from transifex	2017-04-14 00:21:31 +00:00
Mario Danic	ce1d0e639b	Updated all	2017-04-13 09:41:01 +02:00
Nextcloud bot	392d51f19b	[tx-robot] updated from transifex	2017-04-13 00:21:57 +00:00
Mario Danic	b6aa977bb4	Fix fileprovider	2017-04-13 01:01:53 +02:00
Mario Danic	ba698ffc43	Improve branding	2017-04-13 00:51:07 +02:00
Mario Danic	45c03a8203	Implement webview welcome pages	2017-04-13 00:32:05 +02:00
Nextcloud bot	f3343748f5	[tx-robot] updated from transifex	2017-04-12 00:21:00 +00:00
Nextcloud bot	5d3f5eb698	[tx-robot] updated from transifex	2017-04-11 00:20:47 +00:00
Nextcloud bot	55106ec8a7	[tx-robot] updated from transifex	2017-04-10 00:22:04 +00:00
Nextcloud bot	190d3b0075	[tx-robot] updated from transifex	2017-04-09 00:21:20 +00:00
Nextcloud bot	af1ea3758e	[tx-robot] updated from transifex	2017-04-08 00:21:29 +00:00
Nextcloud bot	c05abb6952	[tx-robot] updated from transifex	2017-04-07 00:22:55 +00:00
tobiasKaminsky	82b02788d0	generic: link, progressBar, percentage ... modified: percentage, progressbar, link	2017-04-06 17:15:59 +02:00
tobiasKaminsky	73322ad800	image loading via glide ... add fallback icons	2017-04-06 15:27:12 +02:00
tobiasKaminsky	2f405f11a1	in setting: prevent drawer opening via swipe right	2017-04-06 11:45:55 +02:00
tobiasKaminsky	a5c2cc0fb6	display external links, disabled by default ... stored in database	2017-04-06 11:45:54 +02:00
tobiasKaminsky	dfbfd051f4	added webview support	2017-04-06 11:45:53 +02:00
Nextcloud bot	5b6ecabae8	[tx-robot] updated from transifex	2017-04-06 00:21:41 +00:00
Tobias Kaminsky	8ff753f623	Merge pull request #607 from nextcloud/integration-with-master ... PNG files have full-screen checkerboard background & Better emptycontent view for file types which can not be shown	2017-04-05 08:35:56 +02:00
Nextcloud bot	0d43197c9c	[tx-robot] updated from transifex	2017-04-05 00:22:13 +00:00
Nextcloud bot	9ade2f8a46	[tx-robot] updated from transifex	2017-04-04 00:20:53 +00:00
AndyScherzinger	de825e2238	Merge branch 'master' of https://github.com/nextcloud/android into integration-with-master ... # Conflicts: # src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java # src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java # src/main/res/values-en-rGB/strings.xml	2017-04-03 23:20:30 +02:00
Nextcloud bot	7e4b3fb858	[tx-robot] updated from transifex	2017-04-03 00:21:37 +00:00
Nextcloud bot	1ae9d87da6	[tx-robot] updated from transifex	2017-04-02 00:21:26 +00:00
Nextcloud bot	bfe0dea784	[tx-robot] updated from transifex	2017-04-01 00:21:41 +00:00