Jenkins for ownCloud [Wed, 21 Jan 2015 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 20 Jan 2015 13:38:32 +0000 (14:38 +0100)]
Fix. Uploads view is not shown correctly
David A. Velasco [Tue, 20 Jan 2015 12:07:50 +0000 (13:07 +0100)]
Merge pull request #851 from owncloud/download_folder_update_database
Download folder update database
jabarros [Tue, 20 Jan 2015 12:00:37 +0000 (13:00 +0100)]
Update unsuccessful downloaded file
jabarros [Tue, 20 Jan 2015 11:42:27 +0000 (12:42 +0100)]
Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
jabarros [Tue, 20 Jan 2015 11:27:40 +0000 (12:27 +0100)]
Store file on db with 'downloading' state after adding it to pending downloads
David A. Velasco [Tue, 20 Jan 2015 10:28:36 +0000 (11:28 +0100)]
Revert changes for files uploading
jabarros [Tue, 20 Jan 2015 10:07:44 +0000 (11:07 +0100)]
Remove is_uploading field from database
jabarros [Tue, 20 Jan 2015 09:43:39 +0000 (10:43 +0100)]
Add Scrollview in list fragment layout for showing text message
jabarros [Tue, 20 Jan 2015 08:59:34 +0000 (09:59 +0100)]
Update android library reference
jabarros [Tue, 20 Jan 2015 08:56:45 +0000 (09:56 +0100)]
Merge branch 'develop' into imageGrid
David A. Velasco [Mon, 19 Jan 2015 12:39:32 +0000 (13:39 +0100)]
Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile
jabarros [Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)]
Merge branch 'develop' into SettingsGreyedOut
Jenkins for ownCloud [Tue, 20 Jan 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Carla Schroder [Mon, 19 Jan 2015 21:57:23 +0000 (13:57 -0800)]
Add user manual to Android repo
tobiasKaminsky [Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)]
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library
tobiasKaminsky [Mon, 19 Jan 2015 21:13:45 +0000 (22:13 +0100)]
changes as requested
tobiasKaminsky [Mon, 19 Jan 2015 21:10:29 +0000 (22:10 +0100)]
rebased
footer view disabled due to GridView does not support it
tobiasKaminsky [Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)]
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
jabarros [Mon, 19 Jan 2015 13:41:34 +0000 (14:41 +0100)]
Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile
David A. Velasco [Mon, 19 Jan 2015 12:44:30 +0000 (13:44 +0100)]
Merge pull request #798 from LukeOwncloud/develop
On downgrading upload db, delete and re-create
jabarros [Mon, 19 Jan 2015 12:10:21 +0000 (13:10 +0100)]
Added uploading and downloading fields into filelist table
jabarros [Mon, 19 Jan 2015 11:49:28 +0000 (12:49 +0100)]
Merge branch 'develop' into download_folder
David A. Velasco [Mon, 19 Jan 2015 10:29:43 +0000 (11:29 +0100)]
Updated library reference
jabarros [Mon, 19 Jan 2015 10:03:05 +0000 (11:03 +0100)]
Merge branch 'develop' into delete_local_files
jabarros [Mon, 19 Jan 2015 09:44:51 +0000 (10:44 +0100)]
Merge pull request #843 from owncloud/update_Android_Gradle_plug_in
Updated Android Gradle plug-in for compatibility with Android Studio 1.0...
jabarros [Mon, 19 Jan 2015 09:39:23 +0000 (10:39 +0100)]
Trigger Media Scan on parent folder when deleting a file or a folder from locally
David A. Velasco [Mon, 19 Jan 2015 08:58:06 +0000 (09:58 +0100)]
Updated Android Gradle plug-in for compatibility with Android Studio 1.0+
Jenkins for ownCloud [Mon, 19 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sun, 18 Jan 2015 16:00:29 +0000 (17:00 +0100)]
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
Jenkins for ownCloud [Sun, 18 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 17 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 15 Jan 2015 06:13:33 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 14 Jan 2015 07:25:04 +0000 (08:25 +0100)]
Merge pull request #746 from owncloud/thumbnailForUpload
Thumbnails added to Upload activity
Jenkins for ownCloud [Wed, 14 Jan 2015 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 13 Jan 2015 19:07:43 +0000 (20:07 +0100)]
Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope
jabarros [Tue, 13 Jan 2015 13:08:57 +0000 (14:08 +0100)]
Add context description tag to action bar title
Jenkins for ownCloud [Tue, 13 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Mon, 12 Jan 2015 13:30:06 +0000 (14:30 +0100)]
Merge branch 'develop' into thumbnailForUpload
jabarros [Mon, 12 Jan 2015 13:17:29 +0000 (14:17 +0100)]
Other minor changes after CR
David A. Velasco [Mon, 12 Jan 2015 12:51:30 +0000 (13:51 +0100)]
Fixed stuck 'downloading' icon in download of folders
jabarros [Mon, 12 Jan 2015 12:24:20 +0000 (13:24 +0100)]
Add contentDescription tag into main menu items
jabarros [Mon, 12 Jan 2015 11:52:40 +0000 (12:52 +0100)]
Changes after CR
David A. Velasco [Mon, 12 Jan 2015 09:50:47 +0000 (10:50 +0100)]
Merge pull request #837 from owncloud/download_folder_fix_cancel_subfolders
Fix for bug on cancelation of subfolders download
David A. Velasco [Mon, 12 Jan 2015 09:43:40 +0000 (10:43 +0100)]
Fix on search of operation to cancel
David A. Velasco [Mon, 12 Jan 2015 08:44:00 +0000 (09:44 +0100)]
Removed ... from content description
Jenkins for ownCloud [Mon, 12 Jan 2015 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 10 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Fri, 9 Jan 2015 14:16:52 +0000 (15:16 +0100)]
Fix. Subfolders are not cancelled correctly
jabarros [Fri, 9 Jan 2015 08:46:11 +0000 (09:46 +0100)]
Fixed. In the upload view, videos does not have the correct icon
David A. Velasco [Fri, 9 Jan 2015 08:44:02 +0000 (09:44 +0100)]
Fixed icon for MIME type application/javascript
tobiasKaminsky [Thu, 8 Jan 2015 21:41:41 +0000 (22:41 +0100)]
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java
tobiasKaminsky [Thu, 8 Jan 2015 21:33:28 +0000 (22:33 +0100)]
- removed uneccessary improts
David A. Velasco [Thu, 8 Jan 2015 16:05:35 +0000 (17:05 +0100)]
Merge pull request #836 from owncloud/download_folder__fixing_recursive_cancellation
Fix of recursive cancellation
David A. Velasco [Thu, 8 Jan 2015 15:56:21 +0000 (16:56 +0100)]
Aesthetic fixes
David A. Velasco [Thu, 8 Jan 2015 15:43:25 +0000 (16:43 +0100)]
Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up
jabarros [Thu, 8 Jan 2015 14:02:42 +0000 (15:02 +0100)]
Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel
jabarros [Thu, 8 Jan 2015 13:59:27 +0000 (14:59 +0100)]
Fix for downloads that are not cancelled
jabarros [Thu, 8 Jan 2015 13:26:38 +0000 (14:26 +0100)]
Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation
jabarros [Thu, 8 Jan 2015 12:07:54 +0000 (13:07 +0100)]
Add content description tag into EditText in account_setup
David A. Velasco [Thu, 8 Jan 2015 09:55:42 +0000 (10:55 +0100)]
Consider application/xml for XML files
David A. Velasco [Thu, 8 Jan 2015 08:08:42 +0000 (09:08 +0100)]
Merge pull request #820 from owncloud/obeySortOrder_fixmerge
Obey sort order in gallery of images.
David A. Velasco [Wed, 7 Jan 2015 17:23:53 +0000 (18:23 +0100)]
First try
jabarros [Wed, 7 Jan 2015 13:04:46 +0000 (14:04 +0100)]
Merge branch 'develop' into download_folder
jabarros [Wed, 7 Jan 2015 12:47:38 +0000 (13:47 +0100)]
Change error message when trying download a folder that does not exist
jabarros [Wed, 7 Jan 2015 12:04:46 +0000 (13:04 +0100)]
Added folder name to 'file not found' error message
David A. Velasco [Wed, 7 Jan 2015 11:51:59 +0000 (12:51 +0100)]
Merge pull request #823 from owncloud/rename_with_special_character
Removed spurious check of "%" character when renaming.
jabarros [Wed, 7 Jan 2015 10:22:24 +0000 (11:22 +0100)]
Fix. App does not realize that the folder does not exist
Jenkins for ownCloud [Wed, 7 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 6 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 5 Jan 2015 18:53:40 +0000 (19:53 +0100)]
update
Jenkins for ownCloud [Mon, 5 Jan 2015 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 4 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Jan 2015 06:13:28 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 2 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Thu, 1 Jan 2015 12:55:06 +0000 (13:55 +0100)]
- fix #667
tobiasKaminsky [Thu, 1 Jan 2015 12:07:31 +0000 (13:07 +0100)]
- last whitespace
tobiasKaminsky [Thu, 1 Jan 2015 12:06:25 +0000 (13:06 +0100)]
- removed whitespaces
- renamed pin description
Jenkins for ownCloud [Thu, 1 Jan 2015 06:13:33 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Wed, 31 Dec 2014 13:25:24 +0000 (14:25 +0100)]
Fix. Some icons are not correct. Showed default file icon when there is not mimetype
jabarros [Wed, 31 Dec 2014 12:48:36 +0000 (13:48 +0100)]
Fix. App does not realize that the folder does not exits when traying to download a folder
Jenkins for ownCloud [Wed, 31 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 30 Dec 2014 10:55:13 +0000 (11:55 +0100)]
Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct
tobiasKaminsky [Tue, 30 Dec 2014 08:35:48 +0000 (09:35 +0100)]
- clarify pin description
tobiasKaminsky [Tue, 30 Dec 2014 08:32:33 +0000 (09:32 +0100)]
fix double pin entry on start
Jenkins for ownCloud [Tue, 30 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 29 Dec 2014 21:36:15 +0000 (22:36 +0100)]
- fix #47
jabarros [Mon, 29 Dec 2014 16:06:33 +0000 (17:06 +0100)]
Create getThumbnailDimension and add some comments
jabarros [Mon, 29 Dec 2014 13:54:45 +0000 (14:54 +0100)]
Refactor ThumbnailsCacheManager to reduce repeated code
jabarros [Mon, 29 Dec 2014 08:27:50 +0000 (09:27 +0100)]
Merge branch 'develop' into thumbnailForUpload
jabarros [Mon, 29 Dec 2014 08:26:44 +0000 (09:26 +0100)]
Move isImage method to BitmapUtils class
tobiasKaminsky [Mon, 29 Dec 2014 08:15:51 +0000 (09:15 +0100)]
- moved check to PinCheck
- hardcoded 10s time-out
Jenkins for ownCloud [Mon, 29 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 27 Dec 2014 15:48:40 +0000 (16:48 +0100)]
temp
tobiasKaminsky [Sat, 27 Dec 2014 15:20:34 +0000 (16:20 +0100)]
- fix #76
jabarros [Fri, 26 Dec 2014 13:27:52 +0000 (14:27 +0100)]
Merge branch 'develop' into rename_with_special_character
jabarros [Fri, 26 Dec 2014 10:10:22 +0000 (11:10 +0100)]
Merge branch 'develop' into obeySortOrder_fixmerge
jabarros [Fri, 26 Dec 2014 08:13:58 +0000 (09:13 +0100)]
Merge pull request #755 from owncloud/OpenWithInContextMenu
"open with" in ContextMenu of downloaded files
jabarros [Fri, 26 Dec 2014 08:04:02 +0000 (09:04 +0100)]
Merge pull request #784 from ekeitho/develop
subject mail populated when user shares >>file/folder<<
projects / pub / Android / ownCloud.git / log