pub/Android/ownCloud.git
10 years agoChanges after CR
jabarros [Mon, 12 Jan 2015 11:52:40 +0000 (12:52 +0100)]
Changes after CR

10 years agoFixed. In the upload view, videos does not have the correct icon
jabarros [Fri, 9 Jan 2015 08:46:11 +0000 (09:46 +0100)]
Fixed. In the upload view, videos does not have the correct icon

10 years agoFixed icon for MIME type application/javascript
David A. Velasco [Fri, 9 Jan 2015 08:44:02 +0000 (09:44 +0100)]
Fixed icon for MIME type application/javascript

10 years agoConsidered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up
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

10 years agoConsider application/xml for XML files
David A. Velasco [Thu, 8 Jan 2015 09:55:42 +0000 (10:55 +0100)]
Consider application/xml for XML files

11 years agoFix. Some icons are not correct. Showed default file icon when there is not mimetype
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

11 years agoFixed. Icons which have extensions in UpperCase, in the uploads view are not correct
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

11 years agoCreate getThumbnailDimension and add some comments
jabarros [Mon, 29 Dec 2014 16:06:33 +0000 (17:06 +0100)]
Create getThumbnailDimension and add some comments

11 years agoRefactor ThumbnailsCacheManager to reduce repeated code
jabarros [Mon, 29 Dec 2014 13:54:45 +0000 (14:54 +0100)]
Refactor ThumbnailsCacheManager to reduce repeated code

11 years agoMerge branch 'develop' into thumbnailForUpload
jabarros [Mon, 29 Dec 2014 08:27:50 +0000 (09:27 +0100)]
Merge branch 'develop' into thumbnailForUpload

11 years agoMove isImage method to BitmapUtils class
jabarros [Mon, 29 Dec 2014 08:26:44 +0000 (09:26 +0100)]
Move isImage method to BitmapUtils class

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoMerge pull request #755 from owncloud/OpenWithInContextMenu
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

11 years agoMerge pull request #784 from ekeitho/develop
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<<

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 26 Dec 2014 06:13:28 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agofix tab indent
Keith Abdulla [Tue, 23 Dec 2014 17:38:38 +0000 (09:38 -0800)]
fix tab indent

11 years agocreate an extra string resource
Keith Abdulla [Tue, 23 Dec 2014 17:31:59 +0000 (09:31 -0800)]
create an extra string resource

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 23 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Dec 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agofix string format and context method
Keith Abdulla [Sat, 20 Dec 2014 04:11:25 +0000 (20:11 -0800)]
fix string format and context method

11 years agoMerge pull request #718 from owncloudChalmers/multi2
David A. Velasco [Fri, 19 Dec 2014 11:56:14 +0000 (12:56 +0100)]
Merge pull request #718 from owncloudChalmers/multi2

Multiselect functionalty targeting https://github.com/owncloud/android/issues/596

11 years agoMerge branch 'develop' into thumbnailForUpload
jabarros [Fri, 19 Dec 2014 09:58:08 +0000 (10:58 +0100)]
Merge branch 'develop' into thumbnailForUpload

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 19 Dec 2014 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 18 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 17 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 16 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoMerge pull request #801 from owncloud/community_image-preview-save-position
David A. Velasco [Mon, 15 Dec 2014 09:22:10 +0000 (10:22 +0100)]
Merge pull request #801 from owncloud/community_image-preview-save-position

Restore the current image when the preview activity is hidden

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 15 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoMerge pull request #766 from owncloud/feedbackWithVersionNumber
jabarros [Fri, 12 Dec 2014 09:05:49 +0000 (10:05 +0100)]
Merge pull request #766 from owncloud/feedbackWithVersionNumber

Email from feedback contains version number

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 12 Dec 2014 06:13:36 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoMerge branch 'develop' into community_image-preview-save-position
jabarros [Thu, 11 Dec 2014 09:23:03 +0000 (10:23 +0100)]
Merge branch 'develop' into community_image-preview-save-position

11 years agoMerge pull request #781 from owncloud/fix_logs_change_orientation
David A. Velasco [Thu, 11 Dec 2014 09:21:41 +0000 (10:21 +0100)]
Merge pull request #781 from owncloud/fix_logs_change_orientation

User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)

11 years agoMerge pull request #799 from owncloud/community_rotateImage
David A. Velasco [Thu, 11 Dec 2014 08:16:00 +0000 (09:16 +0100)]
Merge pull request #799 from owncloud/community_rotateImage

Rotate image according to EXIF attributes.

11 years agoMerge branch 'develop' into community_rotateImage
jabarros [Thu, 11 Dec 2014 07:51:31 +0000 (08:51 +0100)]
Merge branch 'develop' into community_rotateImage

11 years agoMerge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
jabarros [Wed, 10 Dec 2014 13:13:32 +0000 (14:13 +0100)]
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation

11 years agoHurry up release of source bitmap in rotations
David A. Velasco [Wed, 10 Dec 2014 11:48:31 +0000 (12:48 +0100)]
Hurry up release of source bitmap in rotations

11 years agoCancel load task when fragment becomes invisible (fixes crash in rotations)
David A. Velasco [Wed, 10 Dec 2014 11:46:34 +0000 (12:46 +0100)]
Cancel load task when fragment becomes invisible (fixes crash in rotations)

11 years agoMerge pull request #754 from owncloud/RadioListOnAccounts
jabarros [Wed, 10 Dec 2014 07:45:12 +0000 (08:45 +0100)]
Merge pull request #754 from owncloud/RadioListOnAccounts

Account list is now a radiobutton list

11 years agofix tab
Keith Abdulla [Wed, 10 Dec 2014 07:01:48 +0000 (23:01 -0800)]
fix tab

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 10 Dec 2014 06:13:40 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agomove subject message strings into strings.xml
Keith Abdulla [Wed, 10 Dec 2014 01:51:10 +0000 (17:51 -0800)]
move subject message strings into strings.xml

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 8 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Dec 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agosubject mail populated when user shares file/folder
Keith Abdulla [Sat, 6 Dec 2014 10:07:35 +0000 (02:07 -0800)]
subject mail populated when user shares file/folder

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoFix. Avoid load logs again when changing device orientation
jabarros [Fri, 5 Dec 2014 13:33:04 +0000 (14:33 +0100)]
Fix. Avoid load logs again when changing device orientation

11 years agoRemove unused imports and split long lines modified
jabarros [Fri, 5 Dec 2014 09:12:57 +0000 (10:12 +0100)]
Remove unused imports and split long lines modified

11 years agoMerge branch 'develop' of https://github.com/owncloud/android into multi2
Sam [Fri, 5 Dec 2014 09:07:48 +0000 (10:07 +0100)]
Merge branch 'develop' of https://github.com/owncloud/android into multi2

11 years agoFixed. App crashes when previewing an image
jabarros [Fri, 5 Dec 2014 08:33:34 +0000 (09:33 +0100)]
Fixed. App crashes when previewing an image

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 5 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Dec 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoMerge branch 'master' into develop
David A. Velasco [Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)]
Merge branch 'master' into develop

11 years agoMerge pull request #773 from owncloud/triggerMediaScan
jabarros [Wed, 3 Dec 2014 09:10:26 +0000 (10:10 +0100)]
Merge pull request #773 from owncloud/triggerMediaScan

Trigger media scan

11 years agoMerged with owncloud develop
Sam [Wed, 3 Dec 2014 09:04:39 +0000 (10:04 +0100)]
Merged with owncloud develop

11 years agoRemoved empty method, and some unused imports
David A. Velasco [Wed, 3 Dec 2014 08:41:49 +0000 (09:41 +0100)]
Removed empty method, and some unused imports

11 years agoMerge branch 'release-1.6.2' oc-android-1.6.2
jabarros [Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)]
Merge branch 'release-1.6.2'

11 years agoUpdate owncloud library reference to 0.9.4
jabarros [Wed, 3 Dec 2014 08:31:41 +0000 (09:31 +0100)]
Update owncloud library reference to 0.9.4

11 years agoTrigger MediaScan for every downloaded file in a renamed or moved folder
David A. Velasco [Tue, 2 Dec 2014 13:23:49 +0000 (14:23 +0100)]
Trigger MediaScan for every downloaded file in a renamed or moved folder

11 years agoRefactoring: removed old FileDataStorageManager#moveFolder method, redirected to...
David A. Velasco [Tue, 2 Dec 2014 12:33:57 +0000 (13:33 +0100)]
Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile

11 years agoBug fixed (and some refactoring): crash on local removal of a folder
David A. Velasco [Tue, 2 Dec 2014 10:17:47 +0000 (11:17 +0100)]
Bug fixed (and some refactoring): crash on local removal of a folder

11 years agoRemoves build version magic numbers
Magnus Sjoqvist [Tue, 2 Dec 2014 10:11:34 +0000 (11:11 +0100)]
Removes build version magic numbers

11 years agoLet Gradle out of Travis for the moment - needs additional review
David A. Velasco [Tue, 2 Dec 2014 08:47:02 +0000 (09:47 +0100)]
Let Gradle out of Travis for the moment - needs additional review

11 years agoRefactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment
David A. Velasco [Tue, 2 Dec 2014 08:29:26 +0000 (09:29 +0100)]
Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment

11 years agoRefactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader...
David A. Velasco [Tue, 2 Dec 2014 08:21:35 +0000 (09:21 +0100)]
Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager

11 years agoRefactoring: move all the intents for MediaScanner in FileDataStorageManager to a...
David A. Velasco [Tue, 2 Dec 2014 08:16:56 +0000 (09:16 +0100)]
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method

11 years agoRefactoring: get MediaScan trigger out of OCFile for renaming
David A. Velasco [Tue, 2 Dec 2014 08:08:48 +0000 (09:08 +0100)]
Refactoring: get MediaScan trigger out of OCFile for renaming

11 years agoMerge pull request #662 from tobiasKaminsky/fileCount
jabarros [Tue, 2 Dec 2014 07:31:54 +0000 (08:31 +0100)]
Merge pull request #662 from tobiasKaminsky/fileCount

File count

11 years agoMerge remote-tracking branch 'upstream/develop' into triggerMediaScan
tobiasKaminsky [Sat, 29 Nov 2014 11:18:02 +0000 (12:18 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
-fr/strings.xml

Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java

11 years ago- test fix for android 4
tobiasKaminsky [Sat, 29 Nov 2014 11:13:46 +0000 (12:13 +0100)]
- test fix for android 4

11 years ago- restore some files :/
tobiasKaminsky [Sat, 29 Nov 2014 10:32:00 +0000 (11:32 +0100)]
- restore some files :/

11 years agoTemporary fix of missing escape for apostrophe
tobiasKaminsky [Tue, 18 Nov 2014 16:30:27 +0000 (17:30 +0100)]
Temporary fix of missing escape for apostrophe

11 years agocleanup
tobiasKaminsky [Sat, 29 Nov 2014 10:23:16 +0000 (11:23 +0100)]
cleanup

11 years ago- trigger mediaScan when files are deleted remote
tobiasKaminsky [Sat, 29 Nov 2014 10:12:03 +0000 (11:12 +0100)]
- trigger mediaScan when files are deleted remote

11 years ago- trigger works when moving files
tobiasKaminsky [Sat, 29 Nov 2014 09:37:13 +0000 (10:37 +0100)]
- trigger works when moving files

11 years agoMerge pull request #768 from owncloudChalmers/owncloud_submodule
jabarros [Fri, 28 Nov 2014 13:25:32 +0000 (14:25 +0100)]
Merge pull request #768 from owncloudChalmers/owncloud_submodule

Change submodule from owncloudChalmers/android-library to owncloud/android-library

11 years agoChange submodule from owncloudChalmers/android-library to ownCloud/android-library
Jorge Antonio Diaz-Benito Soriano [Fri, 28 Nov 2014 11:16:34 +0000 (12:16 +0100)]
Change submodule from owncloudChalmers/android-library to ownCloud/android-library

11 years agoUpdate owncloud library reference
jabarros [Fri, 28 Nov 2014 09:55:39 +0000 (10:55 +0100)]
Update owncloud library reference

11 years agoMerge pull request #661 from owncloudChalmers/gradleWithInternalDependency
jabarros [Fri, 28 Nov 2014 08:10:45 +0000 (09:10 +0100)]
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency

Gradle support (squashed history)

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 28 Nov 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

11 years agoEmail from feedback contains version number
tobiasKaminsky [Thu, 27 Nov 2014 07:25:57 +0000 (08:25 +0100)]
Email from feedback contains version number

11 years agoMerge pull request #752 from owncloud/instant_uploads_set_path
David A. Velasco [Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)]
Merge pull request #752 from owncloud/instant_uploads_set_path

Better UI for settings path of instant uploads

11 years agoChanged var to parcelable in FolderPickerActivity
jabarros [Wed, 26 Nov 2014 12:06:00 +0000 (13:06 +0100)]
Changed var to parcelable in FolderPickerActivity

11 years agoRefactor after CR
jabarros [Wed, 26 Nov 2014 11:51:16 +0000 (12:51 +0100)]
Refactor after CR

11 years agoChanges after CR
jabarros [Wed, 26 Nov 2014 08:05:23 +0000 (09:05 +0100)]
Changes after CR

11 years agoUpdate the submodule version to the restored .gitignore
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:34:20 +0000 (21:34 +0100)]
Update the submodule version to the restored .gitignore

11 years agoRestore .gitignore and SETUP.md, remove files that were added
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 19:46:44 +0000 (20:46 +0100)]
Restore .gitignore and SETUP.md, remove files that were added

11 years ago"open with" in ContextMenu of downloaded files
tobiasKaminsky [Tue, 25 Nov 2014 17:01:20 +0000 (18:01 +0100)]
"open with" in ContextMenu of downloaded files

11 years ago- Account list is now a radiobutton list
tobiasKaminsky [Tue, 25 Nov 2014 16:42:41 +0000 (17:42 +0100)]
- Account list is now a radiobutton list

11 years ago- bugfix
tobiasKaminsky [Tue, 25 Nov 2014 15:59:21 +0000 (16:59 +0100)]
- bugfix

11 years agoUpdate owncloud library reference
jabarros [Tue, 25 Nov 2014 13:23:17 +0000 (14:23 +0100)]
Update owncloud library reference

11 years agobugfix
tobiasKaminsky [Mon, 24 Nov 2014 19:15:57 +0000 (20:15 +0100)]
bugfix

11 years agoUpdate reference to library
David A. Velasco [Mon, 24 Nov 2014 13:15:38 +0000 (14:15 +0100)]
Update reference to library

11 years agoUpdate submodule to version with updated .gitignore
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:37:12 +0000 (12:37 +0100)]
Update submodule to version with updated .gitignore