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 |
|
David A. Velasco
|
2be8e301e5
|
Clean-up and minor refactoring
|
2015-02-23 13:22:44 +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 |
|
masensio
|
83ad608faa
|
Changes from Comments in PR#886
|
2015-02-19 18:48:04 +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 |
|
masensio
|
2058391230
|
Cancel downloads for deleted users
|
2015-02-18 18:39:10 +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 |
|
David A. Velasco
|
2cfed6eaa7
|
Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts
|
2015-02-17 14:00:18 +01:00 |
|
masensio
|
acb2da8f02
|
Cancel the current upload when it hasn't started yet
|
2015-02-16 13:56:37 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
masensio
|
beb7d352f9
|
Cancel the transfers of an account when the account is deleted, part 1
|
2015-02-04 18:38:11 +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
|
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
|
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 |
|
masensio
|
c6124920d1
|
Changes from comments in PR 844
|
2015-02-02 09:34:43 +01:00 |
|
masensio
|
7f6c5bd3b2
|
Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
|
2015-01-30 12:10:15 +01:00 |
|
David A. Velasco
|
7ddb745bef
|
Clean-up excess of logs in SAML dialog
|
2015-01-30 11:34:44 +01:00 |
|
David A. Velasco
|
54dc3efc18
|
Load SAML log-in dialog from the original URL so that cookies returned with the redirection are not lost
|
2015-01-30 11:34:43 +01:00 |
|
masensio
|
4354329b46
|
Fix bug: When renaming a folder, in the photos apps both folder are shown
|
2015-01-29 11:22:47 +01:00 |
|
masensio
|
d19128e770
|
Merge branch 'develop' into delete_local_files
|
2015-01-28 10:37:08 +01:00 |
|
David A. Velasco
|
bcef916292
|
Removed commented code
|
2015-01-28 09:40:59 +01:00 |
|
masensio
|
d3b0747dde
|
Merge pull request #866 from owncloud/download_folder
Download a folder
|
2015-01-28 09:31:25 +01:00 |
|
masensio
|
a69c04d8e9
|
Fix bug: audio are not refreshed when delete them from the app
|
2015-01-27 14:31:44 +01:00 |
|
masensio
|
8ebaba45e7
|
Show status icons in gridview
|
2015-01-27 13:51:44 +01:00 |
|
David A. Velasco
|
0df1eeaac4
|
Fixed download of folder after updating credentials in the app
|
2015-01-27 13:50:14 +01:00 |
|
masensio
|
281a6b8e1a
|
Fix bug (Media Scan) Files are not refreshed when delete from the app)
|
2015-01-26 15:15:00 +01:00 |
|
David A. Velasco
|
e89e030077
|
Commented excess of logs
|
2015-01-26 13:37:46 +01:00 |
|
David A. Velasco
|
7d16de3c07
|
Fixed cancellation of SynchronizeOperationFolder
|
2015-01-26 13:32:54 +01:00 |
|
masensio
|
d2d20d9ec1
|
Fix bug: Footer is not shown correct in the grid view
|
2015-01-26 13:09:07 +01:00 |
|
David A. Velasco
|
d860ae7cd4
|
Added indexed tree of synchronizing folders to SyncFolderHandler
|
2015-01-26 09:42:44 +01:00 |
|
David A. Velasco
|
9093ef8f9f
|
Refactored SyncFolderHandler out of OperationsService
|
2015-01-23 09:34:45 +01:00 |
|
David A. Velasco
|
a07937cb6f
|
Minimize refresh of list of files on reception of events from FileDownloader
|
2015-01-22 22:15:08 +01:00 |
|
David A. Velasco
|
265e32dee6
|
Added cancelation for subtrees
|
2015-01-22 20:01:41 +01:00 |
|
David A. Velasco
|
5b54915209
|
Added indexed tree of folders downloading anything
|
2015-01-22 17:06:09 +01:00 |
|
jabarros
|
68eb22929d
|
'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings
|
2015-01-22 13:49:31 +01:00 |
|
jabarros
|
18b45ff589
|
Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...'
|
2015-01-22 13:14:57 +01:00 |
|
jabarros
|
81a8604f7f
|
Fixed. Remove size from folders in the Upload view
|
2015-01-21 18:18:39 +01:00 |
|
jabarros
|
38ea01dc1e
|
Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/
|
2015-01-21 17:51:16 +01:00 |
|
jabarros
|
d57a472a93
|
Merge branch 'imageGrid' into imageGrid_footer
|
2015-01-21 13:06:00 +01:00 |
|
jabarros
|
6cc3596ce8
|
Fixed. Size of the folders is shown in the file list when it should not
|
2015-01-21 12:37:28 +01:00 |
|
jabarros
|
e548665897
|
Fixed. App crashes when accessing to some folders in upload view
|
2015-01-21 12:15:52 +01:00 |
|
jabarros
|
9b1b5f5e3b
|
Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.
|
2015-01-21 11:08:15 +01:00 |
|
jabarros
|
dea36157e7
|
Update unsuccessful downloaded file
|
2015-01-20 13:00:37 +01:00 |
|
jabarros
|
d8ac7b2241
|
Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
|
2015-01-20 12:42:27 +01:00 |
|
jabarros
|
05c236ba62
|
Store file on db with 'downloading' state after adding it to pending downloads
|
2015-01-20 12:27:40 +01:00 |
|
David A. Velasco
|
d2883905c6
|
Revert changes for files uploading
|
2015-01-20 11:28:36 +01:00 |
|
jabarros
|
6674379a5f
|
Remove is_uploading field from database
|
2015-01-20 11:07:44 +01:00 |
|
David A. Velasco
|
49849786e5
|
Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile
|
2015-01-20 09:42:58 +01:00 |
|
jabarros
|
d0cee8be85
|
Merge branch 'develop' into SettingsGreyedOut
|
2015-01-20 09:25:20 +01:00 |
|
tobiasKaminsky
|
3c79991b12
|
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library
|
2015-01-19 22:24:33 +01:00 |
|
tobiasKaminsky
|
b5fdba576f
|
changes as requested
|
2015-01-19 22:13:45 +01:00 |
|
tobiasKaminsky
|
04b77aa2f4
|
rebased
footer view disabled due to GridView does not support it
|
2015-01-19 22:10:29 +01:00 |
|
tobiasKaminsky
|
d4e0f3bdb1
|
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2015-01-19 21:02:37 +01:00 |
|
jabarros
|
115268008e
|
Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile
|
2015-01-19 14:41:34 +01:00 |
|
David A. Velasco
|
b6e4f0f4ae
|
Merge pull request #798 from LukeOwncloud/develop
On downgrading upload db, delete and re-create
|
2015-01-19 13:44:30 +01:00 |
|
jabarros
|
3515ab160c
|
Added uploading and downloading fields into filelist table
|
2015-01-19 13:10:21 +01:00 |
|
jabarros
|
e98fc8b141
|
Merge branch 'develop' into download_folder
|
2015-01-19 12:49:28 +01:00 |
|
jabarros
|
6022456fd5
|
Trigger Media Scan on parent folder when deleting a file or a folder from locally
|
2015-01-19 10:39:23 +01:00 |
|
tobiasKaminsky
|
6d5c6f86e5
|
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2015-01-18 17:00:29 +01:00 |
|
David A. Velasco
|
2275f2eca4
|
Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope
|
2015-01-13 20:07:43 +01:00 |
|
jabarros
|
72942b5cb7
|
Add context description tag to action bar title
|
2015-01-13 14:08:57 +01:00 |
|
jabarros
|
6c70154a50
|
Merge branch 'develop' into thumbnailForUpload
|
2015-01-12 14:30:06 +01:00 |
|
jabarros
|
b7e80e6ace
|
Other minor changes after CR
|
2015-01-12 14:17:29 +01:00 |
|
David A. Velasco
|
5ee9c129a9
|
Fixed stuck 'downloading' icon in download of folders
|
2015-01-12 13:51:30 +01:00 |
|
jabarros
|
5d228838e2
|
Changes after CR
|
2015-01-12 12:52:40 +01:00 |
|
David A. Velasco
|
76904d2c8e
|
Fix on search of operation to cancel
|
2015-01-12 10:43:40 +01:00 |
|
jabarros
|
6fee98e6a4
|
Fix. Subfolders are not cancelled correctly
|
2015-01-09 15:16:52 +01:00 |
|
jabarros
|
cc15321173
|
Fixed. In the upload view, videos does not have the correct icon
|
2015-01-09 09:46:43 +01:00 |
|
David A. Velasco
|
74d4f5302e
|
Fixed icon for MIME type application/javascript
|
2015-01-09 09:44:02 +01:00 |
|
tobiasKaminsky
|
d54345d040
|
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java
|
2015-01-08 22:41:41 +01:00 |
|
tobiasKaminsky
|
6b742de58e
|
- removed uneccessary improts
|
2015-01-08 22:33:28 +01:00 |
|
David A. Velasco
|
1975f9e776
|
Aesthetic fixes
|
2015-01-08 16:56:21 +01:00 |
|
David A. Velasco
|
cb5f8b3fcd
|
Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up
|
2015-01-08 16:43:25 +01:00 |
|
jabarros
|
e6fc5d13ad
|
Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel
|
2015-01-08 15:02:42 +01:00 |
|
jabarros
|
737381eaad
|
Fix for downloads that are not cancelled
|
2015-01-08 14:59:27 +01:00 |
|