7089 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Mario Danic	6bf7476081	Add support for web login	2017-03-27 21:27:14 +02:00
Mario Đanić	8b3bdd7c8e	Merge pull request #782 from nextcloud/userInfoUiFixes ... add icons to website/twitter on user info screen, cleanup - #781	2017-03-27 21:23:44 +02:00
Mario Danic	99104058de	List item	2017-03-27 19:14:54 +02:00
AndyScherzinger	bae932ea82	removed nested if statements	2017-03-27 18:08:12 +02:00
AndyScherzinger	9ffb4c6639	#781 add icons to website/twitter on user info screen, cleanup	2017-03-27 17:45:00 +02:00
Mario Danic	c7375e6875	Bottom toolbar should be enabled	2017-03-27 16:03:14 +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
AndyScherzinger	453e7cc66e	added license header	2017-03-27 11:38:52 +02:00
AndyScherzinger	95e90cbeae	initial menu add and empty activity	2017-03-27 11:38:52 +02:00
AndyScherzinger	d13b1805bd	activity icon work	2017-03-27 11:38:44 +02:00
Mario Danic	b4ed6a8d78	Fix issue with fab	2017-03-27 10:28:31 +02:00
Mario Danic	6fdb67b593	Fix a few issues	2017-03-27 09:29:16 +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	15b4c8a45b	replace complex LinearLayouts with table layout for better performance	2017-03-26 16:11:04 +02:00
AndyScherzinger	e0bd3d7c1e	make actual selection bold, for easier recognition in case of color blindness	2017-03-26 16:11:03 +02:00
AndyScherzinger	a28a0e9d90	slightly shorten code	2017-03-26 16:11:03 +02:00
AndyScherzinger	6086ff81c6	redesign of dialog according to design review/mock/feedback	2017-03-26 16:11:02 +02:00
AndyScherzinger	862efbd6be	flip arrow according to design review	2017-03-26 16:11:02 +02:00
AndyScherzinger	c1867c0509	move image button icon coloring to DisplayUtils	2017-03-26 16:11:02 +02:00
AndyScherzinger	b4962daecb	remove PreferenceManager dependency and work on input parameters only	2017-03-26 16:11:01 +02:00
AndyScherzinger	d13d064d62	integrate new sorting dialog into Upload file activity	2017-03-26 16:11:01 +02:00
AndyScherzinger	8c22295137	change icons according to review	2017-03-26 16:11:00 +02:00
AndyScherzinger	0490d52270	minor tweaking and fixes for ordering	2017-03-26 16:11:00 +02:00
AndyScherzinger	d0a6e6ea26	wired the new sorting order fragment	2017-03-26 16:11:00 +02:00
AndyScherzinger	4a14e0fae6	default to alphabetical ascending	2017-03-26 16:10:59 +02:00
AndyScherzinger	9ebb7d96b6	add breaks and empty default to switch	2017-03-26 16:10:59 +02:00
AndyScherzinger	8e884b8cf5	new sorting order dialog	2017-03-26 16:10:58 +02:00
Andy Scherzinger	f615bd5384	Merge pull request #716 from nextcloud/participateApkImage ... Participate apk image	2017-03-26 16:08:04 +02:00
AndyScherzinger	bf326394ef	move to new project structure	2017-03-26 15:56:31 +02:00
tobiasKaminsky	5550f9127a	spaces replaced with underscores	2017-03-26 15:56:31 +02:00
tobiasKaminsky	d13f8437a9	add svg file	2017-03-26 15:56:30 +02:00
tobiasKaminsky	0ebdb7e343	remove unnecessary textview	2017-03-26 15:56:30 +02:00
tobiasKaminsky	2cbdddffc3	add image for downloading nightly ... fix url	2017-03-26 15:56:25 +02:00
Andy Scherzinger	4e25d84d24	Merge pull request #711 from nextcloud/skipIntroduction ... showing introduction screen is now customizable by setup.xml	2017-03-26 15:55:55 +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
AndyScherzinger	0a83e7d3ee	fix 120 character line margin	2017-03-26 15:17:39 +02:00
AndyScherzinger	fae9d48784	remove paragraph entities from javaDoc	2017-03-26 15:15:29 +02:00
Nextcloud bot	321d316d4b	[tx-robot] updated from transifex	2017-03-26 04:08:59 +00:00