Commit graph

2918 commits

Author SHA1 Message Date
masensio
051265620c Add share icons and localFileIndicator to grid_image and grid_item layout 2015-01-27 09:46:19 +01:00
masensio
d2d20d9ec1 Fix bug: Footer is not shown correct in the grid view 2015-01-26 13:09:07 +01:00
jabarros
18b45ff589 Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...' 2015-01-22 13:14:57 +01:00
jabarros
0470de47e0 Fixed. Line behind the folder is not shown in the upload view 2015-01-22 09:29:36 +01:00
jabarros
81a8604f7f Fixed. Remove size from folders in the Upload view 2015-01-21 18:18:39 +01:00
David A. Velasco
70dd4d0653 Merge pull request #858 from owncloud/imageGrid_footer
Fixed. Footer message should be showed in the list view mode. Also added...
2015-01-21 18:14:45 +01:00
jabarros
38ea01dc1e Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/ 2015-01-21 17:51:16 +01:00
jabarros
d57a472a93 Merge branch 'imageGrid' into imageGrid_footer 2015-01-21 13:06:00 +01:00
jabarros
6cc3596ce8 Fixed. Size of the folders is shown in the file list when it should not 2015-01-21 12:37:28 +01:00
jabarros
e548665897 Fixed. App crashes when accessing to some folders in upload view 2015-01-21 12:15:52 +01:00
jabarros
9b1b5f5e3b Fixed. Footer message should be showed in the list view mode. Also added in grid view mode. 2015-01-21 11:08:15 +01:00
jabarros
f01156527a Fix. Uploads view is not shown correctly 2015-01-20 14:38:32 +01:00
jabarros
d751df3daa Add Scrollview in list fragment layout for showing text message 2015-01-20 10:43:39 +01:00
jabarros
3a44122b53 Update android library reference 2015-01-20 09:59:34 +01:00
jabarros
451783be22 Merge branch 'develop' into imageGrid 2015-01-20 09:56:45 +01:00
Jenkins for ownCloud
99276bae85 [tx-robot] updated from transifex 2015-01-20 01:13:34 -05:00
tobiasKaminsky
3c79991b12 Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
2015-01-19 22:24:33 +01:00
tobiasKaminsky
b5fdba576f changes as requested 2015-01-19 22:13:45 +01:00
tobiasKaminsky
04b77aa2f4 rebased
footer view disabled due to GridView does not support it
2015-01-19 22:10:29 +01:00
tobiasKaminsky
d4e0f3bdb1 Merge branch 'develop2' into imageGrid2
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-01-19 21:02:37 +01:00
David A. Velasco
b6e4f0f4ae Merge pull request #798 from LukeOwncloud/develop
On downgrading upload db, delete and re-create
2015-01-19 13:44:30 +01:00
David A. Velasco
e99583ef68 Updated library reference 2015-01-19 11:29:43 +01:00
jabarros
0a8469ec1b Merge pull request #843 from owncloud/update_Android_Gradle_plug_in
Updated Android Gradle plug-in for compatibility with Android Studio 1.0...
2015-01-19 10:44:51 +01:00
David A. Velasco
e874789382 Updated Android Gradle plug-in for compatibility with Android Studio 1.0+ 2015-01-19 09:58:06 +01:00
Jenkins for ownCloud
880ffab34c [tx-robot] updated from transifex 2015-01-19 01:13:30 -05:00
tobiasKaminsky
6d5c6f86e5 Merge branch 'develop2' into imageGrid2
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-01-18 17:00:29 +01:00
Jenkins for ownCloud
bdb959f2e2 [tx-robot] updated from transifex 2015-01-18 01:13:30 -05:00
Jenkins for ownCloud
46427dad18 [tx-robot] updated from transifex 2015-01-17 01:13:31 -05:00
Jenkins for ownCloud
86f9d43e8a [tx-robot] updated from transifex 2015-01-15 01:13:33 -05:00
David A. Velasco
9bf4e0f7b9 Merge pull request #746 from owncloud/thumbnailForUpload
Thumbnails added to Upload activity
2015-01-14 08:25:04 +01:00
Jenkins for ownCloud
369fb6a0be [tx-robot] updated from transifex 2015-01-14 01:13:29 -05:00
Jenkins for ownCloud
f206d8c674 [tx-robot] updated from transifex 2015-01-13 01:13:31 -05:00
jabarros
6c70154a50 Merge branch 'develop' into thumbnailForUpload 2015-01-12 14:30:06 +01:00
jabarros
b7e80e6ace Other minor changes after CR 2015-01-12 14:17:29 +01:00
jabarros
5d228838e2 Changes after CR 2015-01-12 12:52:40 +01:00
Jenkins for ownCloud
26403abd0a [tx-robot] updated from transifex 2015-01-12 01:13:29 -05:00
Jenkins for ownCloud
acd19c911b [tx-robot] updated from transifex 2015-01-10 01:13:30 -05:00
jabarros
cc15321173 Fixed. In the upload view, videos does not have the correct icon 2015-01-09 09:46:43 +01:00
David A. Velasco
74d4f5302e Fixed icon for MIME type application/javascript 2015-01-09 09:44:02 +01:00
David A. Velasco
cb5f8b3fcd Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up 2015-01-08 16:43:25 +01:00
David A. Velasco
643162cac9 Consider application/xml for XML files 2015-01-08 10:55:42 +01:00
David A. Velasco
8da1926f02 Merge pull request #820 from owncloud/obeySortOrder_fixmerge
Obey sort order in gallery of images.
2015-01-08 09:08:42 +01:00
David A. Velasco
4ae8ac19c3 Merge pull request #823 from owncloud/rename_with_special_character
Removed spurious check of "%" character when renaming.
2015-01-07 12:51:59 +01:00
Jenkins for ownCloud
f670cfad8f [tx-robot] updated from transifex 2015-01-07 01:13:30 -05:00
Jenkins for ownCloud
464db6b4c5 [tx-robot] updated from transifex 2015-01-06 01:13:30 -05:00
Jenkins for ownCloud
ea101df8f5 [tx-robot] updated from transifex 2015-01-05 01:13:29 -05:00
Jenkins for ownCloud
c8dc970121 [tx-robot] updated from transifex 2015-01-04 01:13:31 -05:00
Jenkins for ownCloud
57a840c92e [tx-robot] updated from transifex 2015-01-03 01:13:28 -05:00
Jenkins for ownCloud
c03ea61704 [tx-robot] updated from transifex 2015-01-02 01:13:30 -05:00
Jenkins for ownCloud
2fb89a9238 [tx-robot] updated from transifex 2015-01-01 01:13:33 -05:00