Commit graph

3144 commits

Author SHA1 Message Date
David A. Velasco
a07937cb6f Minimize refresh of list of files on reception of events from FileDownloader 2015-01-22 22:15:08 +01:00
David A. Velasco
265e32dee6 Added cancelation for subtrees 2015-01-22 20:01:41 +01:00
David A. Velasco
5b54915209 Added indexed tree of folders downloading anything 2015-01-22 17:06:09 +01:00
jabarros
68eb22929d 'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings 2015-01-22 13:49:31 +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
David A. Velasco
9ae0f10495 Merge pull request #846 from owncloud/usermanual
Add user manual to Android repo
2015-01-21 12:51:46 +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
Jenkins for ownCloud
9fcb1612fe [tx-robot] updated from transifex 2015-01-21 01:13:32 -05:00
jabarros
f01156527a Fix. Uploads view is not shown correctly 2015-01-20 14:38:32 +01:00
David A. Velasco
e2a7138e0e Merge pull request #851 from owncloud/download_folder_update_database
Download folder update database
2015-01-20 13:07:50 +01:00
jabarros
dea36157e7 Update unsuccessful downloaded file 2015-01-20 13:00:37 +01:00
jabarros
d8ac7b2241 Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database 2015-01-20 12:42:27 +01:00
jabarros
05c236ba62 Store file on db with 'downloading' state after adding it to pending downloads 2015-01-20 12:27:40 +01:00
David A. Velasco
d2883905c6 Revert changes for files uploading 2015-01-20 11:28:36 +01:00
jabarros
6674379a5f Remove is_uploading field from database 2015-01-20 11:07:44 +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
David A. Velasco
49849786e5 Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile 2015-01-20 09:42:58 +01:00
jabarros
d0cee8be85 Merge branch 'develop' into SettingsGreyedOut 2015-01-20 09:25:20 +01:00
Jenkins for ownCloud
99276bae85 [tx-robot] updated from transifex 2015-01-20 01:13:34 -05:00
Carla Schroder
376cf5cfc9 Add user manual to Android repo 2015-01-19 13:57:23 -08: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
jabarros
115268008e Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile 2015-01-19 14:41:34 +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
jabarros
3515ab160c Added uploading and downloading fields into filelist table 2015-01-19 13:10:21 +01:00
jabarros
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
David A. Velasco
e99583ef68 Updated library reference 2015-01-19 11:29:43 +01:00
jabarros
9b653a1d9d Merge branch 'develop' into delete_local_files 2015-01-19 11:03:05 +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
jabarros
6022456fd5 Trigger Media Scan on parent folder when deleting a file or a folder from locally 2015-01-19 10:39:23 +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
David A. Velasco
2275f2eca4 Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope 2015-01-13 20:07:43 +01:00