3240 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	7fa529d328	[tx-robot] updated from transifex	2015-02-17 01:13:43 -05:00
masensio	acb2da8f02	Cancel the current upload when it hasn't started yet	2015-02-16 13:56:37 +01:00
masensio	3bed5fea7a	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-16 08:51:30 +01:00
Jenkins for ownCloud	effee70675	[tx-robot] updated from transifex	2015-02-15 01:13:29 -05:00
Jenkins for ownCloud	5e1048b343	[tx-robot] updated from transifex	2015-02-14 01:13:32 -05:00
masensio	2a02a08d52	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-13 15:16:58 +01:00
masensio	a091d39076	Fix building	2015-02-13 15:07:11 +01:00
masensio	fba65e37f6	Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies ... Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java	2015-02-13 14:39:35 +01:00
masensio	75880ec553	Adapt behaviour Authentication AyncTask + rotations	2015-02-13 14:29:15 +01:00
Jenkins for ownCloud	754c277fdd	[tx-robot] updated from transifex	2015-02-13 01:13:30 -05:00
Jenkins for ownCloud	f149a9cf77	[tx-robot] updated from transifex	2015-02-12 01:13:31 -05:00
David A. Velasco	15dc7be9d9	Count of files & folders removed from view to choose target folder for a MOVE operation	2015-02-11 16:51:46 +01:00
Jenkins for ownCloud	c4110d4be7	[tx-robot] updated from transifex	2015-02-11 01:13:30 -05:00
masensio	a5fca19b0f	Merge pull request #874 from owncloud/update_OC_client_manager ... Update OC client managers	2015-02-10 14:10:35 +01:00
David A. Velasco	991f4242f0	Update refernce to library with tests fixed	2015-02-10 13:10:54 +01:00
David A. Velasco	f75ddcb97e	Fixing build	2015-02-10 10:48:55 +01:00
David A. Velasco	b5d70ad8e7	App updated to OwnCloudAccount with deferred load of credentials	2015-02-10 10:29:51 +01:00
masensio	2c4b08395d	Fix bug: Move view should not show as a grid	2015-02-10 09:57:42 +01:00
Jenkins for ownCloud	6162271dff	[tx-robot] updated from transifex	2015-02-10 01:13:32 -05:00
David A. Velasco	246c25d27e	Kill former session when authentication token is updated	2015-02-09 15:30:17 +01:00
masensio	1e7a75c042	Add AuthenticatorAsyncTask	2015-02-09 15:09:04 +01:00
masensio	0b217c465d	Convert accessRootFolderRemoteOperation method in AsyncTask	2015-02-09 14:13:40 +01:00
David A. Velasco	64435cab25	Revert "Enable session support for all authentication methods in the app" ... This reverts commit 02372fde24.	2015-02-09 10:35:25 +01:00
David A. Velasco	170c041505	Revert "Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password" ... This reverts commit 3605bd70da.	2015-02-09 10:34:39 +01:00
Jenkins for ownCloud	62c54ac2ad	[tx-robot] updated from transifex	2015-02-09 01:13:30 -05:00
Jenkins for ownCloud	7d8cbde64f	[tx-robot] updated from transifex	2015-02-08 01:13:31 -05:00
Jenkins for ownCloud	fa0b91d7fb	[tx-robot] updated from transifex	2015-02-07 01:13:34 -05:00
David A. Velasco	f7c2909a7e	Updated link to library with relaxed timeouts	2015-02-06 14:51:48 +01:00
masensio	3605bd70da	Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password	2015-02-06 13:05:48 +01:00
Jenkins for ownCloud	b047882001	[tx-robot] updated from transifex	2015-02-06 01:13:31 -05:00
David A. Velasco	f728c502c5	Fixed some log levels	2015-02-05 16:34:15 +01:00
David A. Velasco	55c9c3a6c6	Updated services clean-up; Android 4.3 and 4.4 keep a huge number of threads in other case	2015-02-05 16:28:37 +01:00
masensio	3ff42b6220	Cancel the transfers of an account when the account is deleted: Cancel current upload	2015-02-05 09:40:09 +01:00
Jenkins for ownCloud	f8c91b0458	[tx-robot] updated from transifex	2015-02-05 01:13:34 -05:00
masensio	beb7d352f9	Cancel the transfers of an account when the account is deleted, part 1	2015-02-04 18:38:11 +01:00
Jenkins for ownCloud	8bc75d54b4	[tx-robot] updated from transifex	2015-02-04 01:14:14 -05:00
David A. Velasco	936d8466c6	Updated with fixes in Spanish translation	2015-02-03 14:01:59 +01:00
David A. Velasco	1726a9352a	Updated translations after new format string for subject in sharing e-mail	2015-02-03 13:37:22 +01:00
David A. Velasco	28e4b35595	Quotes updated in subject message for shared link, better format string	2015-02-03 13:17:14 +01:00
David A. Velasco	02372fde24	Enable session support for all authentication methods in the app	2015-02-03 13:04:19 +01:00
David A. Velasco	1ee808f3a2	Updated version number to 1.7.0	2015-02-03 12:52:17 +01:00
David A. Velasco	5116bd99e2	Merge branch 'master' into release-1.7.0	2015-02-03 12:46:23 +01:00
masensio	b64fd4cc5b	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-03 11:25:09 +01:00
David A. Velasco	5169261b66	Merge pull request #731 from owncloud/imageGrid ... Automatic grid more in folders with more than 50% of image files.	2015-02-03 11:04:32 +01:00
David A. Velasco	e4e50d44c4	Corrections from my own comments	2015-02-03 09:52:22 +01:00
masensio	aa7b7af721	Cancel transfers of an account when it detects that the account doesn't exist	2015-02-02 14:51:46 +01:00
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +01:00
masensio	ab8bf56a15	Detect if the account exists before the tranfer starts	2015-02-02 13:23:33 +01:00
David A. Velasco	7f23fa5a77	Merge pull request #844 from owncloud/delete_local_files ... Removal of media files is notified to MediaProvider directly - MediaScan API does not work properly in Android 4.x	2015-02-02 09:39:40 +01:00
masensio	c6124920d1	Changes from comments in PR 844	2015-02-02 09:34:43 +01:00