5151 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	a5ef75a840	Prevent error notification for delayed uploads waiting for Wifi	2016-05-30 10:45:01 +02:00
Jenkins for ownCloud	f1b66e1281	[tx-robot] updated from transifex	2016-05-30 01:13:57 -04:00
David A. Velasco	9087c93d7c	Merge pull request #1687 from owncloud/share_Android__avoid_duplication_of_received_files ... Prevent that files sent to OC from other apps are duplicated in local storage	2016-05-27 13:03:17 +02:00
David A. Velasco	cfbe5498f8	Prevent that files sent to OC from other apps are duplicated in local storage	2016-05-27 12:46:01 +02:00
Jenkins for ownCloud	de30acbbf7	[tx-robot] updated from transifex	2016-05-27 01:13:51 -04:00
Jenkins for ownCloud	6fdbb65d23	[tx-robot] updated from transifex	2016-05-26 01:13:50 -04:00
Jenkins for ownCloud	78540e4e02	[tx-robot] updated from transifex	2016-05-25 01:13:51 -04:00
David A. Velasco	ba0d2ff7af	Merge pull request #1646 from owncloud/readme-design ... Make readme/repository more attractive for contributors	2016-05-24 18:19:26 +02:00
Raquel Pérez Bartolomé	3d560abf3a	Update README.md ... Added beta version	2016-05-24 17:55:31 +02:00
Jan-Christoph Borchardt	87c401a1e1	make readme/repository more attractive for contributors	2016-05-24 17:55:31 +02:00
David A. Velasco	81218b9945	Merge pull request #1672 from owncloud/automatic_tests ... Added setup for automated tests, and first sample tests.	2016-05-24 13:09:08 +02:00
David A. Velasco	873795bffc	Commented duplicated update of Android SDK in Travis environment	2016-05-24 12:53:41 +02:00
jabarros	5f1e5fdf59	Changes after CR	2016-05-24 12:53:41 +02:00
jabarros	ddd5152a11	Fix error after doing rebase	2016-05-24 12:53:41 +02:00
jabarros	365fe2845b	Added ui automator test case	2016-05-24 12:53:41 +02:00
jabarros	9a422887e7	First UI Automator example test	2016-05-24 12:53:41 +02:00
jabarros	c0c2133222	Added AndroidManifest with api level 18 for UI Automator tests	2016-05-24 12:53:41 +02:00
jabarros	cb630e5709	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	8ef1ade039	Disable UI tests in Travis until we get a stable setup	2016-05-24 12:53:41 +02:00
David A. Velasco	2dfd98cbdd	Turn on device screen before Espress tests start	2016-05-24 12:53:41 +02:00
David A. Velasco	7a6335430d	Normalized environment variables for end2end tests	2016-05-24 12:53:41 +02:00
jabarros	d94ea80d31	Modify travis file to execute AndroidTest	2016-05-24 12:53:41 +02:00
jabarros	014547fca3	Modify gradle to get env vars to be passed to android tests directly	2016-05-24 12:53:41 +02:00
jabarros	822a62c513	Pass test vars as instrumentation runner argumments	2016-05-24 12:53:41 +02:00
jrecio	7beb1325f6	fix throwing exceptions	2016-05-24 12:53:41 +02:00
jrecio	5293d1bfa1	fix wording in code	2016-05-24 12:53:41 +02:00
jrecio	ec8174318d	fix again	2016-05-24 12:53:41 +02:00
jrecio	b6c412bd2e	fix again	2016-05-24 12:53:41 +02:00
jrecio	be94b5663c	fix conflicts	2016-05-24 12:53:41 +02:00
jrecio	dde82c75c6	fix changes rebase	2016-05-24 12:53:41 +02:00
jabarros	a76bb109bc	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	950dbe2013	Increased verbosity of logs for local unit tests	2016-05-24 12:53:41 +02:00
David A. Velasco	bfccfa0dac	Comment out WIP Espress test	2016-05-24 12:53:41 +02:00
David A. Velasco	2cfcb2318c	Run sample instrumented unit test in Travis	2016-05-24 12:53:41 +02:00
David A. Velasco	b826c80cb8	Added first instrumented unit test	2016-05-24 12:53:41 +02:00
jabarros	bfbf3704de	Encrypt connection parameters in AndroidTest and launch tests from travis (WIP)	2016-05-24 12:53:41 +02:00
jabarros	db88f7f1dd	Initial text to check authentication (WIP)	2016-05-24 12:53:41 +02:00
jabarros	1fcd724d43	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	0a83e60d9b	Run local unit tests in Travis	2016-05-24 12:53:41 +02:00
David A. Velasco	a716dff066	Added sample local unit test	2016-05-24 12:53:41 +02:00
David A. Velasco	964560da8f	Added dependencies for local unit tests to app build.gradle file	2016-05-24 12:53:41 +02:00
David A. Velasco	c1f616ce54	Updated build.gradle to find local unit tests	2016-05-24 12:53:41 +02:00
David A. Velasco	3cf03eceaf	Merge pull request #1643 from owncloud/uploads_from_content_uris ... Fixed uploads from other apps	2016-05-23 13:10:22 +02:00
jabarros	7225b9f631	Fix. [BUG] Some storages do not work when uploading content from other apps Drive	2016-05-23 13:04:31 +02:00
David A. Velasco	e34d76a126	Minor changes	2016-05-23 13:04:31 +02:00
jabarros	34470186aa	Final changes after CR	2016-05-23 13:04:31 +02:00
jabarros	7a46865c20	Second part of changes after CR	2016-05-23 13:04:31 +02:00
jabarros	36a0cd5a67	Changes after CR (WIP)	2016-05-23 13:04:31 +02:00
jabarros	2fadc0b62a	Added comments and cleaned code	2016-05-23 13:04:31 +02:00
jabarros	eae1e54c85	Removed unused imports	2016-05-23 13:04:31 +02:00