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 |
|
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 |
|
David A. Velasco
|
5ee9c129a9
|
Fixed stuck 'downloading' icon in download of folders
|
2015-01-12 13:51:30 +01:00 |
|
jabarros
|
5d228838e2
|
Changes after CR
|
2015-01-12 12:52:40 +01:00 |
|
David A. Velasco
|
5042fe42ca
|
Merge pull request #837 from owncloud/download_folder_fix_cancel_subfolders
Fix for bug on cancelation of subfolders download
|
2015-01-12 10:50:47 +01:00 |
|
David A. Velasco
|
76904d2c8e
|
Fix on search of operation to cancel
|
2015-01-12 10:43: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
|
6fee98e6a4
|
Fix. Subfolders are not cancelled correctly
|
2015-01-09 15:16:52 +01: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
|
eb6ec5dcf3
|
Merge pull request #836 from owncloud/download_folder__fixing_recursive_cancellation
Fix of recursive cancellation
|
2015-01-08 17:05:35 +01:00 |
|
David A. Velasco
|
1975f9e776
|
Aesthetic fixes
|
2015-01-08 16:56:21 +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 |
|
jabarros
|
e6fc5d13ad
|
Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel
|
2015-01-08 15:02:42 +01:00 |
|
jabarros
|
737381eaad
|
Fix for downloads that are not cancelled
|
2015-01-08 14:59:27 +01:00 |
|
jabarros
|
46d045fd62
|
Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation
|
2015-01-08 14:26:38 +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
|
14bbe5bf01
|
First try
|
2015-01-07 18:23:53 +01:00 |
|
jabarros
|
d05d5ffe1a
|
Merge branch 'develop' into download_folder
|
2015-01-07 14:04:46 +01:00 |
|
jabarros
|
f737785b4f
|
Change error message when trying download a folder that does not exist
|
2015-01-07 13:47:38 +01:00 |
|
jabarros
|
90e49a96e4
|
Added folder name to 'file not found' error message
|
2015-01-07 13:04:46 +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 |
|
jabarros
|
1db11eb586
|
Fix. App does not realize that the folder does not exist
|
2015-01-07 11:22:24 +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 |
|