4258 commits

Author	SHA1	Message	Date
tobiasKaminsky	32a5c7d81a	formatting	2017-05-19 07:47:00 +02:00
alejandro	f94169a458	Sort contacts list	2017-05-18 18:50:21 -05:00
Tobias Kaminsky	a08d17b592	Merge pull request #1014 from nextcloud/improve-push ... Improve push	2017-05-18 15:04:56 +02:00
Nextcloud bot	547453760e	[tx-robot] updated from transifex	2017-05-18 00:24:19 +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
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
Mario Danic	05425c0444	Fix push ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-05-16 12:33:44 +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
Nextcloud bot	e4e75bc7cb	[tx-robot] updated from transifex	2017-05-16 00:23:28 +00:00
tobiasKaminsky	c9fc98499f	add missing import	2017-05-15 14:18:05 +02:00
tobiasKaminsky	6c6b0465b6	Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper	2017-05-15 14:08:36 +02:00
Tobias Kaminsky	cea61893a0	Merge branch 'master' into enhanceParticipate	2017-05-15 14:04:15 +02:00
tobiasKaminsky	ebd94e889e	use contribute url from setup.xml ... escape quote signs	2017-05-15 11:42:28 +02:00
tobiasKaminsky	aeba233894	use app specific log folder	2017-05-15 09:08:19 +02:00
Nextcloud bot	0017e16748	[tx-robot] updated from transifex	2017-05-15 00:23:31 +00:00
Nextcloud bot	6db771d36a	[tx-robot] updated from transifex	2017-05-14 00:23:16 +00:00
tobiaskaminsky	c28f17d9af	remove old reference to onClick, this is now handled via ButterKnife ... use "end" instead of "right" for RTL support	2017-05-13 22:30:00 +02:00
AndyScherzinger	02100ae744	remove unnecessary casts	2017-05-13 14:53:01 +02:00
AndyScherzinger	086e18d377	use apply() instead of commit()	2017-05-13 14:52:39 +02:00
AndyScherzinger	e48cc1bbbc	document empty method bodies (codacy)	2017-05-13 14:48:40 +02:00
AndyScherzinger	f2a81fcc08	fix javaDoc (lint)	2017-05-13 14:38:21 +02:00
AndyScherzinger	54b3229c6a	add missing super calls (lint)	2017-05-13 14:38:08 +02:00
AndyScherzinger	904ec2623d	remove unnecessary semicolons (lint)	2017-05-13 14:11:20 +02:00
davigonz	a480dff6ca	Read modification time from the file in local filesystem and set it to the file ... # Conflicts: # src/com/owncloud/android/operations/UploadFileOperation.java	2017-05-13 14:11:04 +02:00
AndyScherzinger	f9e7c85d03	fix last modified timestamp	2017-05-13 13:55:20 +02:00
tobiasKaminsky	09f9019c9c	some minor code formatting	2017-05-13 13:50:49 +02:00
AndyScherzinger	433a281665	fix codacy warning	2017-05-13 13:50:34 +02:00
AndyScherzinger	da73fdbbe9	fix import	2017-05-13 13:50:33 +02:00
AndyScherzinger	1029a9e2e7	adaptes federated shares permission computation	2017-05-13 13:50:24 +02:00
AndyScherzinger	e9b25d0a4a	fix compile error after lib merges ... # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java	2017-05-13 13:50:24 +02:00
David A. Velasco	448e977aca	Remove always-true component in condition, from CR	2017-05-13 13:50:14 +02:00
jabarros	bc04df153d	Fix var name in comment	2017-05-13 13:50:13 +02:00
jabarros	0e7496c233	Handle create, change and delete options in federated sharing in servers 9.1 or up ... # Conflicts: # src/com/owncloud/android/ui/fragment/EditShareFragment.java	2017-05-13 13:50:13 +02:00
AndyScherzinger	c219152db5	fix codacy warning	2017-05-13 13:50:13 +02:00
AndyScherzinger	9cd963b12c	fix import	2017-05-13 13:50:12 +02:00
AndyScherzinger	8d7157d4fc	adaptes federated shares permission computation	2017-05-13 13:50:03 +02:00
AndyScherzinger	e2621389ae	fix compile error after lib merges ... # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java	2017-05-13 13:50:02 +02:00
David A. Velasco	e93de886b1	Remove always-true component in condition, from CR	2017-05-13 13:49:52 +02:00
jabarros	73798d2196	Fix var name in comment	2017-05-13 13:49:52 +02:00
jabarros	1a189a7f3c	Handle create, change and delete options in federated sharing in servers 9.1 or up ... # Conflicts: # src/com/owncloud/android/ui/fragment/EditShareFragment.java	2017-05-13 13:49:52 +02:00