7585 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Andy Scherzinger	8ed477ca0d	Merge pull request #990 from nextcloud/lintConfig ... disable 'MissingTranslation' as this is handled by transifex	2017-05-13 22:12:27 +02:00
nextcloud-android-bot	7608e00528	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-13 14:57:35 +00:00
Tobias Kaminsky	fe4e366a4d	Merge 3612523c12 into e89a8190f7	2017-05-13 14:31:34 +00:00
AndyScherzinger	3612523c12	Merge branch 'master' of https://github.com/nextcloud/android into lintConfig	2017-05-13 16:31:08 +02:00
Andy Scherzinger	e89a8190f7	Merge pull request #451 from nextcloud/fix_file_modification_date_on_upload ... Fix file modification date on upload	2017-05-13 15:34:01 +02:00
nextcloud-android-bot	4e81fc9190	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-05-13 13:08:58 +00:00
Andy Scherzinger	72b957a25d	Merge 02100ae744 into 4f2eae90d1	2017-05-13 12:53:19 +00: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
AndyScherzinger	da4cebafd3	fix rebase	2017-05-13 14:11:18 +02:00
AndyScherzinger	f9719dc374	use lib master since lib pr got merged	2017-05-13 14:11:17 +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
Andy Scherzinger	4f2eae90d1	Merge pull request #395 from nextcloud/federated_sharing_edit_options ... Updated federated sharing edit options	2017-05-13 14:09:59 +02:00
AndyScherzinger	f9e7c85d03	fix last modified timestamp	2017-05-13 13:55:20 +02:00
AndyScherzinger	06a82e45f0	bump lib to v1.0.17	2017-05-13 13:52:34 +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
AndyScherzinger	89eb8f1a49	fix codacy warning	2017-05-13 13:49:51 +02:00
AndyScherzinger	6e6e1a08b3	fix import	2017-05-13 13:49:51 +02:00
AndyScherzinger	008a974a74	adaptes federated shares permission computation	2017-05-13 13:49:41 +02:00
AndyScherzinger	335bbdb511	fix compile error after lib merges ... # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java	2017-05-13 13:49:41 +02:00
David A. Velasco	40e0f08c79	Remove always-true component in condition, from CR	2017-05-13 13:49:05 +02:00
jabarros	c41e968e73	Fix var name in comment	2017-05-13 13:49:05 +02:00
jabarros	712b83dc0e	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:05 +02:00
AndyScherzinger	f8bd7e7a19	fix codacy warning	2017-05-13 13:49:04 +02:00
AndyScherzinger	c7e544ab77	reintroduce account for federated sharing permission	2017-05-13 13:49:04 +02:00
AndyScherzinger	915cfb4f86	fix import	2017-05-13 13:49:04 +02:00
AndyScherzinger	a24c4b5878	adaptes federated shares permission computation	2017-05-13 13:48:54 +02:00
AndyScherzinger	c1c306150f	fix compile error after lib merges ... # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java	2017-05-13 13:48:53 +02:00
AndyScherzinger	0f7e51fc37	temp gradle dependency to library PR	2017-05-13 13:48:41 +02:00
AndyScherzinger	45f5d16038	add missing code fragments	2017-05-13 13:48:22 +02:00
David A. Velasco	626e639c92	Remove always-true component in condition, from CR	2017-05-13 13:48:21 +02:00