7758 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	c33a88104d	Merge pull request #1024 from nextcloud/contactsSort ... Sort contact list	2017-05-19 14:50:15 +02:00
tobiasKaminsky	28772f1ba9	5 cols on portrait	2017-05-19 11:49:07 +02:00
tobiasKaminsky	ba14880f3d	use 10cols on landscape, 6 on portrait	2017-05-19 11:34:49 +02:00
tobiasKaminsky	1ab754278e	revert	2017-05-19 10:48:26 +02:00
tobiasKaminsky	47b5748b74	Merge remote-tracking branch 'remotes/origin/master' into pinchZoom_new	2017-05-19 10:43:50 +02:00
tobiasKaminsky	32a5c7d81a	formatting	2017-05-19 07:47:00 +02:00
Nextcloud bot	4ed4ed8dc0	[tx-robot] updated from transifex	2017-05-19 00:25:56 +00:00
alejandro	f94169a458	Sort contacts list	2017-05-18 18:50:21 -05:00
Tobias Kaminsky	332d48abac	Merge branch 'master' into crashDueToEmptyString	2017-05-18 16:16:45 +02:00
Tobias Kaminsky	a08d17b592	Merge pull request #1014 from nextcloud/improve-push ... Improve push	2017-05-18 15:04:56 +02:00
nextcloud-android-bot	b43dc9d1a7	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-18 12:50:27 +00:00
Tobias Kaminsky	4898ee1050	Merge 2d78364f70 into 547453760e	2017-05-18 12:36:12 +00:00
tobiaskaminsky	2d78364f70	Warning "Duplicated icons under different names" increased, but no other way possible	2017-05-18 14:35:57 +02:00
tobiaskaminsky	7eddd7440c	fixed "all files"	2017-05-18 14:34:44 +02:00
nextcloud-android-bot	b86682254f	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-18 12:04:04 +00:00
Tobias Kaminsky	512ddb0e27	Merge f0597ec7a9 into 547453760e	2017-05-18 11:49:16 +00:00
tobiaskaminsky	f0597ec7a9	comment gms	2017-05-18 13:49:06 +02:00
tobiaskaminsky	fabecc86a5	Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement	2017-05-18 13:47:03 +02:00
nextcloud-android-bot	17beb10fdd	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-18 11:15:26 +00:00
Tobias Kaminsky	98989a9363	Merge 44b9355315 into 547453760e	2017-05-18 10:52:31 +00:00
tobiaskaminsky	44b9355315	change to value of current master	2017-05-18 12:52:20 +02: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
tobiaskaminsky	0f6f4ad642	do not send status messages if fragment is destroyed	2017-05-17 16:41:01 +02:00
nextcloud-android-bot	44c062e853	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-17 14:20:12 +00:00
Tobias Kaminsky	c4e6ae1824	Merge 37aac8498c into 01e7112a9a	2017-05-17 14:10:05 +00:00
tobiaskaminsky	37aac8498c	prevent NPE ... use boolean to determinate if resume or if new start	2017-05-17 16:08:21 +02:00
tobiaskaminsky	9860aaa10f	Merge remote-tracking branch 'remotes/origin/master' into audioRotationBug	2017-05-17 15:39:28 +02:00
Tobias Kaminsky	c2010bb3d0	Merge branch 'master' into crashDueToEmptyString	2017-05-17 15:26:05 +02:00
nextcloud-android-bot	849e23872a	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-17 11:47:16 +00:00
Mario Đanić	c5af507080	Merge fd6caadc3f into 01e7112a9a	2017-05-17 11:30:59 +00:00
Mario Danic	fd6caadc3f	Unify scope ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-17 13:30:29 +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
Mario Danic	fc7c24b610	Fix delete ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-17 11:17:05 +02:00
Mario Danic	8b923ad8e7	Push fix ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-17 11:01:00 +02:00
Nextcloud bot	e420fac753	[tx-robot] updated from transifex	2017-05-17 00:23:49 +00:00
AndyScherzinger	9021848af6	use apply instead of commit	2017-05-16 21:50:59 +02:00
AndyScherzinger	c749f6ea32	Fix javaDoc format	2017-05-16 21:41:02 +02:00
tobiasKaminsky	4f8da57a0e	minor improvements due to android studio suggestions	2017-05-16 13:30:07 +02:00
tobiasKaminsky	5126eeac10	do not show "set picture as" for svg images	2017-05-16 13:27:16 +02:00
tobiasKaminsky	7891aea932	Merge remote-tracking branch 'origin/contactListImprovement' into contactListImprovement	2017-05-16 13:14:52 +02:00
tobiasKaminsky	e520c5a585	fix some issues/warnings ... fix some issues/warnings scoping back	2017-05-16 13:14:19 +02:00
Mario Danic	05425c0444	Fix push ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-16 12:33:44 +02:00
tobiasKaminsky	099b715fa6	scoping back	2017-05-16 11:28:14 +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
tobiasKaminsky	852252717b	non-downloaded file will first downloaded and then used for "set as"	2017-05-16 09:48:47 +02:00
tobiasKaminsky	057092ba6a	fix some issues/warnings	2017-05-16 08:23:45 +02:00
tobiasKaminsky	b8fd74bd70	fix some issues/warnings	2017-05-16 08:10:22 +02:00