David A. Velasco
|
2946d8dd69
|
Merge branch 'develop' into oauth_login
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authentication/AccountAuthenticator.java
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/eu/alefzero/webdav/WebdavClient.java
|
2013-04-25 19:39:22 +02:00 |
|
David A. Velasco
|
bdc0332c23
|
Copyright note fixes
|
2013-04-17 12:26:13 +02:00 |
|
David A. Velasco
|
07a8938270
|
Improvements in load of images: progress wheel while loading and better scaling
|
2013-03-01 11:17:12 +01:00 |
|
David A. Velasco
|
427a3e6331
|
Progress wheel shown in gallery while an image is getting loaded
|
2013-03-01 10:49:35 +01:00 |
|
David A. Velasco
|
6cfa24f55a
|
Improved error messages in gallery for images that can not be loaded
|
2013-03-01 09:54:49 +01:00 |
|
David A. Velasco
|
31827bce0c
|
Removed excess of logs
|
2013-02-28 17:52:15 +01:00 |
|
David A. Velasco
|
638b7767cb
|
Gallery in full screen, action bar shown on tap
|
2013-02-28 17:09:00 +01:00 |
|
David A. Velasco
|
86cec34b25
|
Gallery handles multiple downloads gracefully
|
2013-02-27 14:08:58 +01:00 |
|
David A. Velasco
|
becf52226e
|
Improved layout for downloads in image gallery
|
2013-02-26 14:01:32 +01:00 |
|
David A. Velasco
|
fc2af5b03e
|
Automatic preview after download in PreviewImageActivity
|
2013-02-26 12:33:28 +01:00 |
|