Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 5 Nov 2015 21:26:56 +0000 (22:26 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 5 Nov 2015 21:26:56 +0000 (22:26 +0100)
commit8e057b45041897e80e4cbfd44a14c515c0ef5605
treec8423e35e6f6c199817be348ee24e52cb193d45c
parent21cacceea00a4181566b4c41ee50cdf2ed1cd55f
parentce841a3c4f7e32d5f54972dbc8d9b950174ed2ca
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
32 files changed:
AndroidManifest.xml
build.gradle
owncloud-android-library
res/layout/grid_image.xml
res/layout/grid_item.xml
res/layout/list_item.xml
res/menu/file_actions_menu.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-hu-rHU/strings.xml
res/values-lt-rLT/strings.xml
res/values-nl/strings.xml
res/values-th-rTH/strings.xml
res/values/strings.xml
res/values/styles.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/operations/RefreshFolderOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java