383 commits

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
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
AndyScherzinger	89b5554276	fix UI glitch	2017-03-31 16:11:16 +02:00
AndyScherzinger	91f984eff6	design optimized layout changes	2017-03-31 16:11:16 +02:00
Andy Scherzinger	2fdbf5d8e7	Merge pull request #742 from nextcloud/favourites ... Search and others	2017-03-31 16:10:31 +02:00
AndyScherzinger	8f265b4c9e	use fav strings as used on the webUI	2017-03-31 11:21:06 +02:00
AndyScherzinger	ed771603ef	menu ordering	2017-03-31 11:09:33 +02:00
AndyScherzinger	a0f1b15b81	add proper star icon for menus	2017-03-31 11:02:44 +02:00
AndyScherzinger	6b2e0f54ce	fix menu	2017-03-31 10:07:20 +02:00
Nextcloud bot	9f2a8158f6	[tx-robot] updated from transifex	2017-03-31 00:21:57 +00:00
AndyScherzinger	3d17ac886b	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java # src/main/res/menu/drawer_menu.xml	2017-03-31 01:57:38 +02:00
Andy Scherzinger	7706fdb8fc	Merge pull request #784 from nextcloud/activities ... Activities	2017-03-31 01:12:06 +02:00
AndyScherzinger	28cb271d72	fit message according to the webUI	2017-03-31 00:36:04 +02:00
AndyScherzinger	472f300e26	minor layout changes	2017-03-30 23:08:01 +02:00
Mario Danic	8099055fe9	Fix activity	2017-03-30 14:49:53 +02:00
Mario Danic	a57cb2e368	Working on everything	2017-03-30 12:10:11 +02:00
Mario Danic	a553590a24	Add empty view	2017-03-30 10:29:52 +02:00
Nextcloud bot	056b4d9be8	[tx-robot] updated from transifex	2017-03-30 00:21:08 +00:00
AndyScherzinger	d0bd2707fb	revert back to frame layout for icon badges' size	2017-03-29 22:51:08 +02:00
Mario Danic	8b7ecc4392	Implement shared files	2017-03-29 18:21:56 +02:00
Mario Danic	6bdb618014	Implement favorites	2017-03-29 09:55:23 +02:00
Nextcloud bot	cb753fd332	[tx-robot] updated from transifex	2017-03-29 00:20:33 +00:00
alejandro	6e993b6641	Message to Empty List	2017-03-28 16:54:47 -06:00
alejandro	67c8cafeda	UI Implementation displaying activities	2017-03-28 15:21:50 -06:00
Mario Danic	d56855e2a9	Fix layouts	2017-03-28 18:24:48 +02:00
Nextcloud bot	a92e7e31aa	[tx-robot] updated from transifex	2017-03-28 00:20:53 +00:00
AndyScherzinger	e06476f3e6	large empty list icon	2017-03-27 23:40:59 +02:00
AndyScherzinger	04679b12f8	initial menu add and empty activity	2017-03-27 23:40:58 +02:00
AndyScherzinger	0ab3e27c1e	activity icon work	2017-03-27 23:40:57 +02:00
AndyScherzinger	e828cc701b	Merge branch 'master' of https://github.com/nextcloud/android into favourites	2017-03-27 23:35:04 +02:00
Mario Danic	6bf7476081	Add support for web login	2017-03-27 21:27:14 +02:00
Mario Danic	99104058de	List item	2017-03-27 19:14:54 +02:00
AndyScherzinger	9ffb4c6639	#781 add icons to website/twitter on user info screen, cleanup	2017-03-27 17:45:00 +02:00
AndyScherzinger	b433178914	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java	2017-03-27 13:16:53 +02:00
Mario Danic	b4ed6a8d78	Fix issue with fab	2017-03-27 10:28:31 +02:00
Mario Đanić	28aa44b0c2	Merge pull request #575 from nextcloud/newSortingLayout ... New sorting order dialog	2017-03-27 07:20:48 +02:00
Nextcloud bot	87b930f251	[tx-robot] updated from transifex	2017-03-27 00:20:55 +00:00
AndyScherzinger	933dbccba6	Merge branch 'master' of https://github.com/nextcloud/android into favourites	2017-03-26 16:15:07 +02:00
AndyScherzinger	a5e5cb85c2	move to new folder structure after branding	2017-03-26 16:11:04 +02:00
AndyScherzinger	6086ff81c6	redesign of dialog according to design review/mock/feedback	2017-03-26 16:11:02 +02:00
AndyScherzinger	bf326394ef	move to new project structure	2017-03-26 15:56:31 +02:00
tobiasKaminsky	2cbdddffc3	add image for downloading nightly ... fix url	2017-03-26 15:56:25 +02:00
tobiasKaminsky	354e008665	showing introduction screen is now customizable by setup.xml, enabled by default	2017-03-26 15:32:40 +02:00
Andy Scherzinger	7a899b0737	Merge pull request #753 from nextcloud/login-branding ... Login branding	2017-03-26 15:28:39 +02:00
Nextcloud bot	321d316d4b	[tx-robot] updated from transifex	2017-03-26 04:08:59 +00:00
AndyScherzinger	22a2f92909	id	2017-03-26 01:34:11 +01:00
AndyScherzinger	53e67c431e	fix codacy warnings and formatting	2017-03-26 01:34:11 +01:00
Mario Danic	96e8e16829	Remove hint from land	2017-03-26 01:34:10 +01:00
Mario Danic	e6adc4fd95	Add support for various server types	2017-03-26 01:34:10 +01:00
Mario Danic	bd16eb7146	Partly works	2017-03-26 01:34:10 +01:00
AndyScherzinger	d84ff3917c	Merge branch 'master' of https://github.com/nextcloud/android into favourites ... # Conflicts: # build.gradle	2017-03-26 01:20:57 +01:00
AndyScherzinger	bfe6dbe80a	move files for new project structure	2017-03-26 00:51:28 +01:00
Mario Danic	f4ab569226	Implement user information magic	2017-03-26 00:51:09 +01:00
Mario Danic	38f1cc0e28	First bits of user info code	2017-03-26 00:51:07 +01:00
Mario Danic	a8ed34fe97	Fix list view clicks	2017-03-24 19:12:37 +01:00
Mario Danic	0d24f87717	Merge branch 'master' into favourites ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java	2017-03-24 09:44:50 +01:00
Mario Danic	adfb581ef6	Merge branch 'master' into branding	2017-03-22 21:16:12 +01:00
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
Mario Danic	705ea85060	Work a bit on favorites	2017-03-19 22:12:44 +01:00
AndyScherzinger	ca0f1bbb2d	partial click fix	2017-03-19 14:05:50 +01:00
Mario Danic	59c5eccf6a	Grid image favourite focus	2017-03-19 11:18:38 +01:00
Mario Danic	85a37b563f	Revert "Update branding setup" ... This reverts commit d7161474a2.	2017-03-17 19:09:17 +01:00
Mario Danic	dd3f303505	Merge branch 'branding' into favourites	2017-03-17 18:28:24 +01:00
Mario Danic	d7161474a2	Update branding setup	2017-03-17 18:28:14 +01:00
Mario Danic	d4af7441fc	Merge branch 'branding' into favourites ... # Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties	2017-03-17 18:26:26 +01:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +01:00
Mario Danic	8a04689e92	Fix sharing	2017-03-16 18:04:21 +01:00
Mario Danic	3c68e865e2	Fix layout issues	2017-03-15 01:18:14 +01:00
Mario Danic	274aa7e9a8	Fix UI issues	2017-03-15 00:12:17 +01:00
AndyScherzinger	7c1e06bbc8	Merge branch 'favourites' of https://github.com/nextcloud/android into favourites ... # Conflicts: # src/main/res/layout/grid_item.xml # src/main/res/layout/list_item.xml	2017-03-14 23:10:54 +01:00
Mario Danic	11c199eb2b	Add favorite buttons	2017-03-14 23:06:40 +01:00
Mario Danic	cf8a72f992	Continue work	2017-03-14 23:06:40 +01:00
AndyScherzinger	022fc5f712	empty list error icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	66904769a5	empty list video/image icons	2017-03-14 23:06:40 +01:00
AndyScherzinger	fd326c0cb9	menu shared icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	d79c90ac89	shared icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	0252cb4091	recent icon	2017-03-14 23:06:40 +01:00
AndyScherzinger	67061c89fc	home icon	2017-03-14 23:06:40 +01:00
Mario Danic	c29075ee47	Progress on all fronts	2017-03-14 23:06:40 +01:00
Mario Danic	49c01f1d74	Significant progress on various things	2017-03-14 23:06:40 +01:00
Mario Danic	beba6ca11e	Some progress on search	2017-03-14 23:05:51 +01:00
AndyScherzinger	565aa84655	empty view star icon	2017-03-14 23:05:51 +01:00
AndyScherzinger	8a2b838f4e	missing xxhdpi favorite icon	2017-03-14 23:05:51 +01:00
AndyScherzinger	b1a2934bec	xxxhdpi favorite icons	2017-03-14 23:05:51 +01:00
AndyScherzinger	fcc5a816f8	grey star icon (80% opacity)	2017-03-14 23:05:51 +01:00
Mario Danic	f0249be463	Fix search users	2017-03-14 22:59:35 +01:00
AndyScherzinger	712b2f98dc	fix click event hadling via setting focusable attribute right	2017-03-14 22:45:59 +01:00
Mario Danic	aa53f63197	Add favorite buttons	2017-03-14 21:59:28 +01:00