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
Jenkins for ownCloud [Tue, 20 Jan 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
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
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
David A. Velasco [Mon, 19 Jan 2015 10:29:43 +0000 (11:29 +0100)]
Updated library reference
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...
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
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
jabarros [Mon, 12 Jan 2015 11:52:40 +0000 (12:52 +0100)]
Changes after CR
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 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
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
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 11:51:59 +0000 (12:51 +0100)]
Merge pull request #823 from owncloud/rename_with_special_character
Removed spurious check of "%" character when renaming.
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
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
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
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
Jenkins for ownCloud [Tue, 30 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
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
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
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<<
Jenkins for ownCloud [Fri, 26 Dec 2014 06:13:28 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Tue, 23 Dec 2014 17:38:38 +0000 (09:38 -0800)]
fix tab indent
Keith Abdulla [Tue, 23 Dec 2014 17:31:59 +0000 (09:31 -0800)]
create an extra string resource
Jenkins for ownCloud [Tue, 23 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Dec 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Sat, 20 Dec 2014 04:11:25 +0000 (20:11 -0800)]
fix string format and context method
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
jabarros [Fri, 19 Dec 2014 09:58:08 +0000 (10:58 +0100)]
Merge branch 'develop' into thumbnailForUpload
Jenkins for ownCloud [Fri, 19 Dec 2014 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Thu, 18 Dec 2014 20:19:39 +0000 (21:19 +0100)]
renamed sortDirectory to sortFolder
Jenkins for ownCloud [Thu, 18 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Wed, 17 Dec 2014 12:36:38 +0000 (13:36 +0100)]
Removed specific check for character '%' when renaming a folder
Jenkins for ownCloud [Wed, 17 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 16 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
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
Jenkins for ownCloud [Mon, 15 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
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
Jenkins for ownCloud [Fri, 12 Dec 2014 06:13:36 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Thu, 11 Dec 2014 09:23:03 +0000 (10:23 +0100)]
Merge branch 'develop' into community_image-preview-save-position
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)
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.
jabarros [Thu, 11 Dec 2014 07:51:31 +0000 (08:51 +0100)]
Merge branch 'develop' into community_rotateImage
Luke Owncloud [Thu, 11 Dec 2014 07:32:38 +0000 (08:32 +0100)]
on downgrading upload db, delete and re-create
jabarros [Wed, 10 Dec 2014 13:13:32 +0000 (14:13 +0100)]
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
David A. Velasco [Wed, 10 Dec 2014 11:48:31 +0000 (12:48 +0100)]
Hurry up release of source bitmap 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)
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
Keith Abdulla [Wed, 10 Dec 2014 07:01:48 +0000 (23:01 -0800)]
fix tab
Jenkins for ownCloud [Wed, 10 Dec 2014 06:13:40 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Wed, 10 Dec 2014 01:51:10 +0000 (17:51 -0800)]
move subject message strings into strings.xml
Jenkins for ownCloud [Mon, 8 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Dec 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Sat, 6 Dec 2014 10:07:35 +0000 (02:07 -0800)]
subject mail populated when user shares file/folder
Jenkins for ownCloud [Sat, 6 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Fri, 5 Dec 2014 13:33:04 +0000 (14:33 +0100)]
Fix. Avoid load logs again when changing device orientation
jabarros [Fri, 5 Dec 2014 09:12:57 +0000 (10:12 +0100)]
Remove unused imports and split long lines modified
Sam [Fri, 5 Dec 2014 09:07:48 +0000 (10:07 +0100)]
Merge branch 'develop' of https://github.com/owncloud/android into multi2
jabarros [Fri, 5 Dec 2014 08:33:34 +0000 (09:33 +0100)]
Fixed. App crashes when previewing an image
Jenkins for ownCloud [Fri, 5 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Dec 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)]
Merge branch 'master' into develop
jabarros [Wed, 3 Dec 2014 09:10:26 +0000 (10:10 +0100)]
Merge pull request #773 from owncloud/triggerMediaScan
Trigger media scan
projects / pub / Android / ownCloud.git / log