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
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
David A. Velasco
87aa0fcfb7
Enable 'up' navigation from home button
2014-10-31 15:20:48 +01:00
David A. Velasco
dbd981f012
Fixed crash and remembered location when there are multiple accounts
2014-10-31 15:08:08 +01:00
David A. Velasco
9709593ccf
Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()
2014-10-31 15:06:45 +01:00
Luke Owncloud
64827cf4ad
refactoring, commenting, understanding code. added TODO for FileUploadService.
2014-10-31 15:05:56 +01:00
jabarros
f345e3fed2
Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server
2014-10-31 13:52:26 +01:00
Luke Owncloud
ac002ced1d
rename DbHandler to UploadDbHandler. Increase DB version. Fix UploadStatus enum.
2014-10-31 13:42:59 +01:00
Luke Owncloud
5af3c6d389
cleanup uploader. add comments. uncomment unused functions. rename.
2014-10-31 13:32:25 +01:00
jabarros
639d122721
Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated
2014-10-31 13:30:26 +01:00
Jenkins for ownCloud
ca0eac841a
[tx-robot] updated from transifex
2014-10-31 01:13:34 -04:00
jabarros
0a39462210
Merge pull request #697 from owncloud/fix_https_access_via_proxy
...
Update reference to library with bugfix
2014-10-30 14:33:58 +01:00
David A. Velasco
c71b0de051
Update reference to library with bugfix
2014-10-30 14:26:58 +01:00
tobiasKaminsky
595a63bc39
Bugfix
2014-10-30 08:20:55 +01:00
grecep
fd7a940dee
Merge pull request #669 from grecep/master
...
Add "select all" option to photo (or other) upload screen
2014-10-29 22:29:38 +01:00
jabarros
945c584f34
Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect
...
Bugfix multiple select
2014-10-29 18:09:16 +01:00
Jenkins for ownCloud
068b826b32
[tx-robot] updated from transifex
2014-10-29 01:13:41 -04:00
grecep
8d29b6318c
removed unnecessary code
2014-10-28 20:50:09 +01:00
David A. Velasco
fe299fc8a1
Merge pull request #673 from owncloud/idn_hosts
...
Suuport for URLs to ownCloud servers running on IDN
2014-10-28 14:35:06 +01:00
jabarros
d9604bf99e
Merge branch 'develop' into idn_hosts
2014-10-28 13:27:32 +01:00
Jenkins for ownCloud
5acc314524
[tx-robot] updated from transifex
2014-10-28 01:13:38 -04:00
jabarros
dcb985481b
Merge branch 'develop' into thumbnails_from_server
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-27 15:12:48 +01:00
jabarros
13fab9321e
Add check of server version before requesting remote thumbnails
2014-10-27 12:36:11 +01:00
Jenkins for ownCloud
495c812671
[tx-robot] updated from transifex
2014-10-27 01:13:33 -04:00
Jenkins for ownCloud
3507ff8003
[tx-robot] updated from transifex
2014-10-26 01:13:34 -04:00
Jenkins for ownCloud
27bcd4de0a
[tx-robot] updated from transifex
2014-10-25 01:13:41 -04:00
tobiasKaminsky
3c53502efa
rebase
2014-10-24 18:45:09 +02:00
