3632 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
purigarcia	6a9dfdb330	Merge branch 'develop' into automationTest	2015-05-06 19:05:03 +02:00
masensio	6f3e8fbb85	Merge branch 'develop' into thumbnailOOM	2015-05-06 13:42:43 +02:00
masensio	7939d3feb5	Merge pull request #970 from owncloud/pinEnhancement ... PIN code no more: Pass code protects all the activities in the app	2015-05-06 09:22:38 +02:00
David A. Velasco	5e1f98dcaf	Fixes after crossed review	2015-05-06 09:13:10 +02:00
masensio	7d82231809	Merge branch 'develop' into pinEnhancement	2015-05-05 13:56:57 +02:00
masensio	ddbb5d2522	Merge branch 'develop' into thumbnailOOM	2015-05-05 13:53:56 +02:00
David A. Velasco	8882fb2dbd	Merge pull request #967 from owncloud/fix_upload_fails_sending_another_app ... Fixed fail in upload sent from the private storage of other app	2015-05-05 13:51:46 +02:00
David A. Velasco	dcd8dde864	Merge branch 'develop' into pinEnhancement	2015-05-05 13:43:01 +02:00
David A. Velasco	c04d9c2198	Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement	2015-05-05 13:42:51 +02:00
masensio	b9c4fab1cb	Change message when entering an incorrect pass code	2015-05-05 13:37:18 +02:00
masensio	8debbb5f90	Changes from comments in PR#967, Second part	2015-05-05 13:18:49 +02:00
masensio	3c07444ff7	Changes from comments in PR#967	2015-05-05 12:56:14 +02:00
David A. Velasco	ef034fd6b8	Removed commented code	2015-05-05 12:49:38 +02:00
David A. Velasco	fdc1216471	Prevent that input fields are maximized in landscape	2015-05-05 12:27:57 +02:00
masensio	7eea2ea507	Merge branch 'develop' into thumbnailOOM	2015-05-05 10:31:46 +02:00
David A. Velasco	930d21dc93	Removed unneeded toggling on 'selected' state	2015-05-05 10:28:49 +02:00
David A. Velasco	4f0cc76a12	Removed unneeded toggling on cursor visibility	2015-05-05 09:54:49 +02:00
David A. Velasco	5aa9789a2e	Reduced duplicated code with a common TextWatcher implementation for all the input fields	2015-05-05 09:49:11 +02:00
masensio	20cc8a1551	Trying fix travis fail	2015-05-05 09:32:49 +02:00
David A. Velasco	510c00f66d	Cleaned code in PassCodeActivity	2015-05-05 00:07:24 +02:00
masensio	05df07a362	Enable/disable share option in the menu: long press and details menu, using setup option	2015-05-04 14:54:49 +02:00
masensio	a41c0b39f2	Add option to turn off share in setup.xml	2015-05-04 14:29:17 +02:00
masensio	50622d6415	Fix bug: Choose account menu doesn't disappear after rotate the device	2015-05-04 13:39:07 +02:00
David A. Velasco	08de1b153d	Added license header to PassCodeManager	2015-05-04 11:43:51 +02:00
David A. Velasco	9593b580b7	Replaced 'PIN code' by 'pass code'	2015-05-04 11:41:09 +02:00
David A. Velasco	3eb64bcdd7	When pass code is enabled, the app is sent to background if the screen is turned off and the windows are made secure to prevent they are rendered in the 'recents' menu	2015-05-04 10:52:57 +02:00
purigarcia	606834980c	Merge branch 'develop' into automationTest	2015-05-04 09:10:45 +02:00
Jenkins for ownCloud	3b08f9f5af	[tx-robot] updated from transifex	2015-05-04 01:13:48 -04:00
Jenkins for ownCloud	be12aea5ce	[tx-robot] updated from transifex	2015-05-02 01:13:50 -04:00
masensio	7d33176509	Fix bug: List of files is not the correct one	2015-04-30 18:12:23 +02:00
David A. Velasco	f186149787	Fixed lost uppercase	2015-04-30 16:26:34 +02:00
David A. Velasco	2f97466301	Added pass code protection to AuthenticatorActivity	2015-04-30 16:06:06 +02:00
David A. Velasco	8925a0a7c6	Logs on activities life cycle simplified	2015-04-30 13:30:55 +02:00
masensio	ce9f67ba14	Merge branch 'develop' into fix_upload_fails_sending_another_app	2015-04-30 13:23:37 +02:00
David A. Velasco	84e99c3cc7	Prevent that PIN code is requested when system windows partially overlapping the app disappear and the app is resumed	2015-04-30 13:21:28 +02:00
masensio	7d5c573766	Show Waiting dialog, while copy temporal file async task is working	2015-04-30 13:04:51 +02:00
Jenkins for ownCloud	f2f9fbf264	[tx-robot] updated from transifex	2015-04-30 02:30:10 -04:00
masensio	e242c5a45f	Copy file to upload for all kind of files, not only for images.	2015-04-29 18:27:45 +02:00
David A. Velasco	e0867d2b28	Refactored location of passcode check: a callback to rule them all	2015-04-29 16:50:30 +02:00
masensio	b064bd4591	Execute the file to upload copy in an AsyncTask	2015-04-29 12:42:10 +02:00
Jenkins for ownCloud	c847e97e31	[tx-robot] updated from transifex	2015-04-29 01:13:49 -04:00
masensio	42fde39ff1	Get file to upload and copy into a temporal file (Uploads#uploadFiles	2015-04-28 14:22:35 +02:00
David A. Velasco	802a164616	Merge branch 'develop' into pinEnhancement ... Conflicts SOLVED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/activity/Uploader.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-04-28 14:20:17 +02:00
masensio	03912b8335	Merge pull request #963 from owncloud/fix_account_not_changed_after_rotation ... FileActivity does not need to 'remember' the current account in configur...	2015-04-28 09:00:15 +02:00
David A. Velasco	b058d008a1	FileActivity does not need to 'remember' the current account in configuration changes	2015-04-27 12:27:09 +02:00
Jenkins for ownCloud	3489fa1ccb	[tx-robot] updated from transifex	2015-04-25 01:13:48 -04:00
Jenkins for ownCloud	25f488cfe1	[tx-robot] updated from transifex	2015-04-24 01:13:45 -04:00
Jenkins for ownCloud	3dc60cd6f7	[tx-robot] updated from transifex	2015-04-23 01:13:49 -04:00
David A. Velasco	2fcffbd3d5	Merge pull request #957 from owncloud/fix_crash_invalid_server_url ... Fix crash when typed invalid URL	2015-04-22 11:01:52 +02:00
David A. Velasco	9b68fb6fe7	Merge pull request #951 from owncloud/loging_different_servers_same_pattern ... Support for accounts with same user name in servers located in the same domain but different path	2015-04-22 10:50:48 +02:00