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
Oliver Gasser
e398ad0c63
Convert IDN from ASCII to Unicode in Upload Dialog
...
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708 .
2014-11-14 00:55:53 +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
Luke Owncloud
6d3a3e218c
Merge remote-tracking branch 'upstream/develop' into reliable_uploads
2014-11-06 16:37:12 +01:00
Luke Owncloud
9d28e9e524
commenting, commenting, commenting!
2014-11-06 16:33:04 +01:00
Luke Owncloud
8ddb9db4e4
test commit
2014-11-06 11:17:18 +01:00
Jenkins for ownCloud
5b37b99af3
[tx-robot] updated from transifex
2014-11-06 01:13:41 -05:00
Luke Owncloud
05d29d9154
test commit
2014-11-05 19:54:50 +01:00
Luke Owncloud
0d12225ec6
Merge remote-tracking branch 'upstream/develop' into retry_uploads
2014-11-05 19:46:34 +01:00
Luke Owncloud
87d1c0e262
mActiveUploads
2014-11-05 16:17:12 +01:00
Luke Owncloud
1369ef8f28
made UploadDbObject serializable
2014-11-05 15:49:03 +01:00
David A. Velasco
80cfc55fda
Merge pull request #706 from owncloud/christmas_app
...
Winter holidays fix
2014-11-05 09:09:48 +01:00
jabarros
eb77fe1da1
Merge pull request #700 from owncloud/remember_last_share_location_fixed
...
Remember last share location
2014-11-05 08:36:16 +01:00
Jenkins for ownCloud
02b8ac0d91
[tx-robot] updated from transifex
2014-11-05 01:13:37 -05:00
Luke Owncloud
efe184939e
using enums
...
cleaning up FileUploadService.onStartCommand
preparing persistant uploads
2014-11-04 16:49:10 +01:00
jabarros
2790c2379d
Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another
2014-11-04 11:15:59 +01:00
David A. Velasco
183cd732d0
Merge pull request #687 from owncloud/thumbnails_from_server
...
Get remote thumbnails from server (OC8)
2014-11-03 13:38:58 +01:00
jabarros
7283f54158
Fixed. App crashes when selecting an account where you have not accessed yet
2014-11-03 13:00:13 +01:00
David A. Velasco
58040881bd
Some clean-up in ThumbnailsCacheManager
2014-11-03 11:30:44 +01:00
David A. Velasco
a09a837585
Adjust the thumbnails size to the size used on screen
2014-11-03 11:27:51 +01:00
jabarros
e53c6001dd
Merge branch 'develop' into christmas_app
2014-11-03 10:41:49 +01:00
jabarros
9f1dd62c90
Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients
2014-11-03 10:37:56 +01:00
Jenkins for ownCloud
8de92ba3b0
[tx-robot] updated from transifex
2014-11-01 01:13:35 -04:00
David A. Velasco
0bedcb9128
Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
2014-10-31 15:23:59 +01:00
