Commit graph

3395 commits

Author SHA1 Message Date
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
9e55ef9585 Show password dialog 2015-03-05 18:02:40 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
690341af68 Create layout for password 2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
masensio
3d3046dc26 Add author's line in license 2015-03-05 12:36:30 +01:00
masensio
3083dcc7d7 Update library reference 2015-03-05 10:56:02 +01:00
Jenkins for ownCloud
664ee08a3c [tx-robot] updated from transifex 2015-03-05 01:13:45 -05:00
Jenkins for ownCloud
a349906e77 [tx-robot] updated from transifex 2015-03-04 01:13:41 -05:00
jabarros
21c7755858 Added item name to ContentDescription property in list item linearlayout of FileListListAdapter 2015-03-03 14:12:15 +01:00
Jenkins for ownCloud
3cab8a4986 [tx-robot] updated from transifex 2015-03-03 01:13:33 -05:00
Jenkins for ownCloud
3d66b4ccc0 [tx-robot] updated from transifex 2015-03-01 01:13:35 -05:00
Jenkins for ownCloud
0f3af9c0ef [tx-robot] updated from transifex 2015-02-28 01:13:44 -05:00
Jenkins for ownCloud
c1efe4304b [tx-robot] updated from transifex 2015-02-27 01:13:37 -05:00
Jenkins for ownCloud
62bbe70290 [tx-robot] updated from transifex 2015-02-26 01:13:46 -05:00
David A. Velasco
b46ac9c649 Merge pull request #886 from owncloud/cancel_transfer_for_deleted_users
Cancel pending or in-progress downloads and uploads when an account is deleted from the device.
2015-02-25 11:02:02 +01:00
masensio
01fc29c892 Bug fixed: Upload fails 2015-02-25 09:09:41 +01:00
masensio
2abceb0ed5 Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-25 08:56:00 +01:00
Jenkins for ownCloud
72bd1c17a5 [tx-robot] updated from transifex 2015-02-25 01:13:42 -05:00
masensio
8d773ef002 Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users 2015-02-24 15:09:54 +01:00
David A. Velasco
4d2b382785 Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space 2015-02-24 15:02:26 +01:00
masensio
2d697473a1 Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-24 14:19:41 +01:00
masensio
759b5e3e72 Merge pull request #888 from owncloud/enable_cookies
Enable cookies
2015-02-24 14:05:54 +01:00
Jenkins for ownCloud
4c964b7dcb [tx-robot] updated from transifex 2015-02-24 01:13:38 -05:00
David A. Velasco
2be8e301e5 Clean-up and minor refactoring 2015-02-23 13:22:44 +01:00
Jenkins for ownCloud
6a88d7a9f4 [tx-robot] updated from transifex 2015-02-22 01:13:32 -05:00
Jenkins for ownCloud
099b32fc42 [tx-robot] updated from transifex 2015-02-21 01:13:31 -05:00
masensio
83f990e49b Merge branch 'master' into develop 2015-02-20 13:20:48 +01:00
masensio
e3a61d283f Changes from comments, FileUploader and FileDownloader implement OnAccountsUpdateListener 2015-02-20 10:51:18 +01:00
masensio
0f7ea542c9 New method in IndexesForest: remove(Account account). Use this method for cancelling downloads 2015-02-20 10:23:46 +01:00
Jenkins for ownCloud
fd8e590ea0 [tx-robot] updated from transifex 2015-02-20 01:13:38 -05:00
masensio
83ad608faa Changes from Comments in PR#886 2015-02-19 18:48:04 +01:00
Raquel
163aaf5a04 Added changelog 2015-02-19 16:08:27 +01:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
2015-02-19 13:02:53 +01:00
masensio
cb175f2994 Merge branch 'develop' into cancel_transfer_for_deleted_users
Conflicts:
	AndroidManifest.xml
2015-02-19 12:54:59 +01:00
masensio
e93016d7e0 Try to cancel transfers when an account is deleted outside of the app: Done 2015-02-19 12:50:53 +01:00
David A. Velasco
ec6b9d7c70 Merge branch 'master' into develop 2015-02-19 11:01:00 +01:00
masensio
2058391230 Cancel downloads for deleted users 2015-02-18 18:39:10 +01:00
masensio
4984d909f2 Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-18 12:26:49 +01:00
masensio
90b786853e Fix bug: Black screen is shown when trying to go to files view after changing the password 2015-02-18 12:23:25 +01:00
David A. Velasco
fc435f64f0 Fixed recovery of position list when browsing up after two rotations 2015-02-18 11:29:31 +01:00
Jenkins for ownCloud
ae1bd1b6a1 [tx-robot] updated from transifex 2015-02-18 01:13:36 -05:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
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