mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
3269 commits 220 branches 1588 tags 639 MiB
Commit graph

3269 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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