7281 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
AndyScherzinger	b3430f54d3	lib version 1.0.14	2017-03-31 09:20:30 +02:00
Nextcloud bot	9f2a8158f6	[tx-robot] updated from transifex	2017-03-31 00:21:57 +00:00
AndyScherzinger	67fa10f8fa	support lib 25.0.0	2017-03-31 02:03:15 +02: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	279f783d6d	library 1.0.14	2017-03-31 01:04:11 +02:00
Andy Scherzinger	98540e4693	Merge pull request #772 from nextcloud/fix-snapchat-etc ... Fix snapchat etc	2017-03-31 00:47:00 +02:00
AndyScherzinger	ea6778a8fe	move to master snapshot of lib	2017-03-31 00:45:01 +02:00
AndyScherzinger	28cb271d72	fit message according to the webUI	2017-03-31 00:36:04 +02:00
AndyScherzinger	10c6bf1d98	add another missing break;	2017-03-30 23:36:59 +02:00
AndyScherzinger	32ea8d2769	fix codacy	2017-03-30 23:24:37 +02:00
AndyScherzinger	5bc727e5cb	proper use of generics for view holder	2017-03-30 23:21:01 +02:00
AndyScherzinger	472f300e26	minor layout changes	2017-03-30 23:08:01 +02:00
AndyScherzinger	aebb0d95c0	Merge branch 'favourites' of https://github.com/nextcloud/android into favourites	2017-03-30 18:50:09 +02:00
AndyScherzinger	12b91c9064	set buildToolsVersion to "25.0.0"	2017-03-30 18:49:53 +02:00
Mario Danic	c023e3f92f	Fix fab again	2017-03-30 16:42:39 +02:00
Mario Danic	fb478debab	Progress on fixing activities for older versions	2017-03-30 15:43:42 +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	5da789e253	Remove stacktrace	2017-03-30 10:31:12 +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	146bfd63d6	remove paragraph entities and stackTrace calls	2017-03-29 23:37:04 +02:00
AndyScherzinger	72e87810bf	fixed empty fav list icon	2017-03-29 22:58:23 +02:00
AndyScherzinger	d0bd2707fb	revert back to frame layout for icon badges' size	2017-03-29 22:51:08 +02:00
alejandro	8a0974c656	Support for SVG icons with Glide and Android SVG	2017-03-29 12:04:35 -06:00
Mario Danic	8b7ecc4392	Implement shared files	2017-03-29 18:21:56 +02:00
Mario Danic	cd17ac2c7a	Start working on shared filter	2017-03-29 10:38:43 +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	bdde0db091	WiP use activities library branch	2017-03-28 15:53:56 -06:00
alejandro	67c8cafeda	UI Implementation displaying activities	2017-03-28 15:21:50 -06:00
Mario Danic	94daa19dc4	Fix fabmain	2017-03-28 18:53:38 +02:00
Mario Danic	d56855e2a9	Fix layouts	2017-03-28 18:24:48 +02:00
alejandro	3746cc4c71	Merge branch 'activities' of https://github.com/nextcloud/android into activities	2017-03-28 09:57:31 -06: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	84c265d8c6	added license header	2017-03-27 23:40:58 +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	d4ad5da980	Delete if not found	2017-03-27 21:59:45 +02:00
Mario Danic	7a1a84cb50	Clean update	2017-03-27 21:59:44 +02:00
Mario Danic	0d7298326a	Fix media provider	2017-03-27 21:59:42 +02:00
Andy Scherzinger	89409ce049	Merge pull request #771 from nextcloud/web-login ... Add support for web login	2017-03-27 21:56:41 +02:00
AndyScherzinger	4144cae6d5	remove javaDoc <p>	2017-03-27 21:42:15 +02:00
Mario Danic	54453bd21d	Fix	2017-03-27 21:28:14 +02:00