Luke Owncloud
97aa4e266b
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
...
Conflicts:
src/com/owncloud/android/files/services/FileUploadService.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2014-11-20 13:36:46 +01:00
Jenkins for ownCloud
ddfe992cbf
[tx-robot] updated from transifex
2014-11-20 01:13:29 -05:00
David A. Velasco
a98f14ecc3
Merge pull request #721 from owncloud/nea_upload_files
...
Fix upload of files from DocumentsProvider in Android > 4.4
2014-11-19 11:26:27 +01:00
David A. Velasco
d737103a77
Merge branch 'develop' into nea_upload_files
2014-11-19 11:11:15 +01:00
David A. Velasco
703366c459
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
2014-11-19 11:05:32 +01:00
David A. Velasco
3aed2954f3
Merge pull request #736 from owncloud/fix_refresh_account_lollipop
...
Fix 'refresh account' action in Lollipop
2014-11-19 10:50:36 +01:00
Raquel
4e72aac677
Merge branch 'develop' into fix_refresh_account_lollipop
2014-11-19 09:31:19 +01:00
Jenkins for ownCloud
bb8a10f735
[tx-robot] updated from transifex
2014-11-19 01:13:30 -05:00
jabarros
387374bed2
Fix errors in Frechn translations and reaname var in FileDisplayActivity
2014-11-18 10:35:52 +01:00
jabarros
3137438cd5
Merge branch 'develop' into nea_upload_files
2014-11-18 10:22:04 +01:00
Jenkins for ownCloud
d3bfbb8568
[tx-robot] updated from transifex
2014-11-18 01:13:34 -05:00
jabarros
bd6f9b384b
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
...
Update reference to library after upgrading TLS support
2014-11-17 15:26:08 +01:00
David A. Velasco
4d04e70d12
Update reference to library after upgrading TLS support
2014-11-17 15:18:38 +01:00
jabarros
6224f73544
Fix crash in Android Lollipop when cliking on refresh the whole account
2014-11-17 14:07:48 +01:00
jabarros
05cb87c172
Update library reference
2014-11-17 13:51:04 +01:00
jabarros
a7c4814e28
Merge branch 'develop' into nea_upload_files
2014-11-17 13:49:17 +01:00
jabarros
297cb6b5c3
Refactoring to avoid maintenance after CR
2014-11-17 11:32:46 +01:00
Jenkins for ownCloud
3f5b3f0d1d
[tx-robot] updated from transifex
2014-11-17 01:13:35 -05:00
Luke Owncloud
537434d9ea
use file icon
2014-11-16 21:44:03 +01:00
Luke Owncloud
2ec1c65bd6
fix onclick
2014-11-16 21:40:49 +01:00
Luke Owncloud
b2d8cecfff
sort by date
2014-11-16 21:35:54 +01:00
Luke Owncloud
263164a948
fix: do upload removed files
2014-11-16 20:44:17 +01:00
Jenkins for ownCloud
1dbd577166
[tx-robot] updated from transifex
2014-11-15 01:13:35 -05:00
Luke Owncloud
2b85ed59b4
working on UploadListActivity
2014-11-14 17:02:58 +01:00
Luke Owncloud
1664d9ec68
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-14 13:09:01 +01:00
David A. Velasco
1b36e1ca08
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
...
Relative time stamps in the list of files.
2014-11-13 12:21:49 +01:00
tobiasKaminsky
7874dc4a9d
- reference bug 716
2014-11-13 10:10:57 +01:00
Jenkins for ownCloud
02a11c3b91
[tx-robot] updated from transifex
2014-11-13 01:13:37 -05:00
jabarros
5d784d98b4
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
2014-11-12 16:07:37 +01:00
tobiasKaminsky
6e34ccb817
fix Problem with < Android 3.0
2014-11-12 14:51:56 +01:00
jabarros
e4d6f267f7
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
2014-11-12 12:46:33 +01:00
David A. Velasco
17afcb0251
Merge pull request #683 from tobiasKaminsky/videoFullsize
...
Bugfix: video is now playing in fullscreen
2014-11-12 09:29:28 +01:00
tobiasKaminsky
79cb6106fd
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4
< 60 seconds -> "seconds ago"
2014-11-12 08:56:53 +01:00
jabarros
3cae3d3eb8
Modify kitkat document provider implementation in order to cover all 'content://' cases
2014-11-12 08:46:29 +01:00
Jenkins for ownCloud
1efefbd22c
[tx-robot] updated from transifex
2014-11-12 01:13:41 -05:00
jabarros
903b66595f
Add workaround for Drive app in which a creation of a temporal copy is needed
2014-11-11 12:27:57 +01:00
Jenkins for ownCloud
3c19c59d9e
[tx-robot] updated from transifex
2014-11-11 01:13:34 -05:00
tobiasKaminsky
4560776ecc
- use match_parent instead
2014-11-10 20:14:45 +01:00
Jenkins for ownCloud
54b814a604
[tx-robot] updated from transifex
2014-11-10 01:13:34 -05:00
Jenkins for ownCloud
ae67bbb648
[tx-robot] updated from transifex
2014-11-09 01:13:35 -05:00
tobiasKaminsky
39f7ee996a
fix scenario 1
2014-11-08 08:45:09 +01:00
Jenkins for ownCloud
2f058ad70e
[tx-robot] updated from transifex
2014-11-08 01:13:37 -05:00
Luke Owncloud
d59fd3b77a
consistently use UploadList (instead UploadsList)
2014-11-07 15:38:21 +01:00
Luke Owncloud
79c3756857
undo unintended change
2014-11-07 15:32:41 +01:00
Luke Owncloud
ba7e62e9f3
added first draft of uploadListActivity
2014-11-07 15:26:21 +01:00
jabarros
da7e13ed5c
Include impelementation of Storage Access Framework when device is KITKAT or over
2014-11-07 14:57:47 +01:00
Jenkins for ownCloud
4ab6d85c47
[tx-robot] updated from transifex
2014-11-07 01:13:38 -05:00
Luke Owncloud
503bcc3f41
remove mDb.recreateDb()
2014-11-06 17:54:10 +01:00
Luke Owncloud
3e9ecca719
now upload works again as good (or as bad) as before.
...
check FileUploadService.java:
//How does this work? Is it thread-safe to set mCurrentUpload here?
//What happens if other mCurrentUpload is currently in progress?
//
//It seems that upload does work, however the upload state is not set
//back of the first upload when a second upload starts while first is
//in progress (yellow up-arrow does not disappear of first upload)
2014-11-06 17:51:19 +01:00
