5075 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
jabarros	49bcfd04a3	Removed unused and commented code	2016-05-23 13:04:31 +02:00
jabarros	e0ec383fe4	Show waiting dialog when receiving external files	2016-05-23 13:04:31 +02:00
jabarros	1a18ca4186	Remove content resolver parameter from UriUploader constructor and renamed UriUloadResult var	2016-05-23 13:04:31 +02:00
jabarros	7b7b85d530	Added and managed result cases when upload uris	2016-05-23 13:04:31 +02:00
jabarros	e84bfdf4ef	Refactor upload files code. Move to use UriUploader (WIP)	2016-05-23 13:04:31 +02:00
jabarros	f09fe374c0	Refactor upload files code (WIP)	2016-05-23 13:04:31 +02:00
jabarros	5948c1c387	Rename Uploader activity to ReceiveExternalFilesActivity	2016-05-23 13:04:31 +02:00
jabarros	ae63ec12b2	Changes after CR. Added silent error as Toast when error uploading a content uri file appears, or data file is not valid	2016-05-23 13:04:31 +02:00
jabarros	10b8f5ca4a	Removed replacement of ':' character from file name when uploading it as content uri scheme	2016-05-23 13:04:31 +02:00
jabarros	b8b17d4941	Fix. Import file from external storage with '/' character is uploaded incorrectly	2016-05-23 13:04:31 +02:00
jabarros	a0f2e7ab23	Minor refactor and added CR comment	2016-05-23 13:04:31 +02:00
jabarros	47f0a24f93	Remove unused import	2016-05-23 13:04:31 +02:00
jabarros	76e88dcd2b	Copy and upload the selected file when content type is uri	2016-05-23 13:04:31 +02:00
Jenkins for ownCloud	2b60acf5e1	[tx-robot] updated from transifex	2016-05-22 01:13:49 -04:00
Jenkins for ownCloud	088eafacdf	[tx-robot] updated from transifex	2016-05-21 01:13:51 -04:00
Jenkins for ownCloud	4a8e8b3c4a	[tx-robot] updated from transifex	2016-05-20 01:13:51 -04:00
Jenkins for ownCloud	37d1ce6db3	[tx-robot] updated from transifex	2016-05-19 01:13:50 -04:00
Andy Scherzinger	1f0fa0a153	Merge pull request #1552 from owncloud/1432_logs_to_settings_screen ... moved logs from drawer menu to the settings	2016-05-18 12:42:52 +02:00
Andy Scherzinger	919fe916b6	cleanup since logging code has been implemented twice	2016-05-18 12:35:58 +02:00
Andy Scherzinger	e80d1465cd	show log preference item only for debug mode or flag set true (false by default)	2016-05-18 12:35:58 +02:00
Andy Scherzinger	74a05bb2a9	moved logs from drawer menu to "More" section in the settings	2016-05-18 12:35:57 +02:00
David A. Velasco	b7275d4bbf	Merge pull request #1673 from owncloud/favorite_edited_file ... Fixed: favorite setting not remembered when modifying a local file	2016-05-18 12:29:33 +02:00
jabarros	64c6e90724	Fix. Favorite setting is not remembered when modifying the local file	2016-05-18 11:03:32 +02:00
Jenkins for ownCloud	37c96a4fb0	[tx-robot] updated from transifex	2016-05-18 01:13:49 -04:00
Jenkins for ownCloud	109a056319	[tx-robot] updated from transifex	2016-05-17 01:13:38 -04:00
Jenkins for ownCloud	f10fff8715	[tx-robot] updated from transifex	2016-05-16 01:13:47 -04:00