Andy Scherzinger [Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time
Maria Asensio [Fri, 16 Oct 2015 07:03:34 +0000 (09:03 +0200)]
Merge pull request #1199 from owncloud/display_thumbnails_details_view_PR_1065
Display thumbnails details view pr 1065
tobiasKaminsky [Wed, 14 Oct 2015 18:10:01 +0000 (20:10 +0200)]
fixed missing refresh of thumbnail after sync
masensio [Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)]
Merge remote-tracking branch 'origin/develop'
masensio [Thu, 15 Oct 2015 14:12:06 +0000 (16:12 +0200)]
Merge branch 'zmatsuo-detailThumbnail' into develop
masensio [Thu, 15 Oct 2015 14:10:55 +0000 (16:10 +0200)]
Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail
Conflicts:
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Andy Scherzinger [Thu, 15 Oct 2015 12:04:56 +0000 (14:04 +0200)]
fix for #1192
Jenkins for ownCloud [Wed, 14 Oct 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 13 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 12 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 11 Oct 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 10 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 9 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Maria Asensio [Wed, 7 Oct 2015 09:19:16 +0000 (11:19 +0200)]
Merge pull request #1190 from owncloud/1182_Open_With_Fix
Fix for #1182 on Android 5
Jenkins for ownCloud [Wed, 7 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Maria Asensio [Tue, 6 Oct 2015 12:51:14 +0000 (14:51 +0200)]
Merge pull request #1117 from owncloud/sortAccents
Sort accents
Andy Scherzinger [Tue, 6 Oct 2015 07:58:16 +0000 (09:58 +0200)]
Code review
Jenkins for ownCloud [Tue, 6 Oct 2015 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 5 Oct 2015 16:44:50 +0000 (18:44 +0200)]
Fix for #1182 on Android 5
Jenkins for ownCloud [Sun, 4 Oct 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 2 Oct 2015 14:04:18 +0000 (16:04 +0200)]
Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
masensio [Thu, 1 Oct 2015 16:45:01 +0000 (18:45 +0200)]
Merge pull request #839 from fluffy88/develop
Trigger media scan after file upload
masensio [Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)]
Merge branch 'master' of github.com:owncloud/android
Conflicts:
CHANGELOG.md
masensio [Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)]
Merge branch 'stable'
masensio [Wed, 30 Sep 2015 08:43:56 +0000 (10:43 +0200)]
Update Changelog for 1.8 version
Raquel Pérez Bartolomé [Tue, 29 Sep 2015 13:53:57 +0000 (15:53 +0200)]
Update CHANGELOG.md
Updated 1.8.0 changelog
Jenkins for ownCloud [Tue, 29 Sep 2015 05:13:58 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 28 Sep 2015 11:57:22 +0000 (13:57 +0200)]
Remove strings for values-en_DE
masensio [Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)]
Merge branch 'release-1.8'
Jenkins for ownCloud [Mon, 28 Sep 2015 06:33:53 +0000 (02:33 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 25 Sep 2015 11:54:53 +0000 (13:54 +0200)]
Same style for log-in buttons in potrait and landscape
David A. Velasco [Fri, 25 Sep 2015 09:11:46 +0000 (11:11 +0200)]
Fixed lost background color for icon in login view
masensio [Thu, 24 Sep 2015 15:33:22 +0000 (17:33 +0200)]
Merge pull request #1174 from owncloud/release_bug_fixes
Fixed a couple of tiny bugs
David A. Velasco [Thu, 24 Sep 2015 15:03:56 +0000 (17:03 +0200)]
Close dangling Cursors in FileContentProvider
David A. Velasco [Thu, 24 Sep 2015 14:52:03 +0000 (16:52 +0200)]
Set default static values to prevent weird crash
David A. Velasco [Thu, 24 Sep 2015 14:13:58 +0000 (16:13 +0200)]
Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view
masensio [Tue, 22 Sep 2015 10:57:50 +0000 (12:57 +0200)]
Merge pull request #1171 from owncloud/fix_lock_of_upload_til_generation_of_thumbnails_finishes
Grant that cancellations of tasks generating thumbnails really works …
David A. Velasco [Tue, 22 Sep 2015 07:29:33 +0000 (09:29 +0200)]
Fixed crashed on cancelled download in gallery
Jenkins for ownCloud [Tue, 22 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 21 Sep 2015 19:25:11 +0000 (21:25 +0200)]
Grant that cancellations of tasks generating thumbnails really works for reused icon views
Jenkins for ownCloud [Mon, 21 Sep 2015 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 18 Sep 2015 12:18:04 +0000 (14:18 +0200)]
Merge pull request #1163 from owncloud/Fix_refreshClickException
Fix refresh click on login screen
Andy Scherzinger [Thu, 17 Sep 2015 09:46:37 +0000 (11:46 +0200)]
Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192
Jenkins for ownCloud [Thu, 17 Sep 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 16 Sep 2015 14:54:07 +0000 (16:54 +0200)]
Update versionName and versionCode for version 1.8. Also in workaround
masensio [Wed, 16 Sep 2015 10:55:45 +0000 (12:55 +0200)]
Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8
masensio [Wed, 16 Sep 2015 10:54:28 +0000 (12:54 +0200)]
Update library reference
masensio [Wed, 16 Sep 2015 10:54:28 +0000 (12:54 +0200)]
Update library reference
masensio [Wed, 16 Sep 2015 10:34:30 +0000 (12:34 +0200)]
Merge pull request #1157 from owncloud/fix_file_list_icon_alignment
center aligned the folder icon with the drawer icon
masensio [Wed, 16 Sep 2015 09:44:51 +0000 (11:44 +0200)]
Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment
Andy Scherzinger [Mon, 14 Sep 2015 19:49:45 +0000 (21:49 +0200)]
center aligned the folder icon with the drawer icon
masensio [Wed, 16 Sep 2015 09:39:26 +0000 (11:39 +0200)]
Merge pull request #1149 from owncloud/new_filetype_icons
New icon detection in general + support for additional mimetype icons
David A. Velasco [Tue, 15 Sep 2015 16:04:22 +0000 (18:04 +0200)]
Removed unneeded LDPI drawables
David A. Velasco [Tue, 15 Sep 2015 16:02:56 +0000 (18:02 +0200)]
Added icons for file type TEXT
Andy Scherzinger [Tue, 15 Sep 2015 16:02:34 +0000 (18:02 +0200)]
adapting web's way of choosing icons
David A. Velasco [Tue, 15 Sep 2015 11:55:57 +0000 (13:55 +0200)]
Merge pull request #1155 from owncloud/update_setup_guide
Update setup, changes from the issue #1154
Andy Scherzinger [Mon, 14 Sep 2015 19:49:45 +0000 (21:49 +0200)]
center aligned the folder icon with the drawer icon
David A. Velasco [Mon, 14 Sep 2015 12:58:28 +0000 (14:58 +0200)]
Merge pull request #1154 from owncloud/update_share_link_for_OC_8.2
Update share link for oc 8.2
masensio [Mon, 14 Sep 2015 12:07:05 +0000 (14:07 +0200)]
Update setup, changes from the issue #1154
masensio [Mon, 14 Sep 2015 11:23:29 +0000 (13:23 +0200)]
Merge branch 'update_share_link_for_OC_8.2' of github.com:owncloud/android into update_share_link_for_OC_8.2
masensio [Mon, 14 Sep 2015 11:21:48 +0000 (13:21 +0200)]
Update library reference
masensio [Fri, 11 Sep 2015 13:05:41 +0000 (15:05 +0200)]
Update library reference: get share link
Jenkins for ownCloud [Mon, 14 Sep 2015 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 12 Sep 2015 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 11 Sep 2015 13:05:41 +0000 (15:05 +0200)]
Update library reference: get share link
David A. Velasco [Fri, 11 Sep 2015 10:37:04 +0000 (12:37 +0200)]
Merge pull request #1141 from owncloud/559_longpress_filename
Show file name in the contextual menu, see #559
Andy Scherzinger [Fri, 11 Sep 2015 09:15:55 +0000 (11:15 +0200)]
further cleanup, moving folder icon determination into util class
Andy Scherzinger [Fri, 11 Sep 2015 08:57:11 +0000 (10:57 +0200)]
Add further javadoc descsribing how to maintain further mappings in the future
Jenkins for ownCloud [Fri, 11 Sep 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Thu, 10 Sep 2015 16:20:26 +0000 (18:20 +0200)]
remove commented out test code
Andy Scherzinger [Thu, 10 Sep 2015 16:16:35 +0000 (18:16 +0200)]
added mapping for bin to be iconized with "application"
Andy Scherzinger [Thu, 10 Sep 2015 15:55:26 +0000 (17:55 +0200)]
rewrite for icon determination with refactoring into its own class + fixed a typo
Andy Scherzinger [Thu, 10 Sep 2015 15:54:05 +0000 (17:54 +0200)]
shortened this prediction, since it will always be image...
Andy Scherzinger [Thu, 10 Sep 2015 07:18:12 +0000 (09:18 +0200)]
Merge pull request #1147 from Kernald/additional-filetype-icons
Add additional filetype icons
Marc Plano-Lesay [Wed, 9 Sep 2015 21:30:09 +0000 (23:30 +0200)]
Add additional filetype icons
masensio [Wed, 9 Sep 2015 06:50:50 +0000 (08:50 +0200)]
Merge pull request #1124 from Kernald/new-filetype-icons
New filetype icons
Jenkins for ownCloud [Wed, 9 Sep 2015 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 8 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 7 Sep 2015 10:24:01 +0000 (12:24 +0200)]
showing the filename in the long press menu on file list, see #559
masensio [Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)]
Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop
Text file preview pr 707 with develop
masensio [Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)]
Merge branch 'master' into text_file_preview_pr_707_with_develop
David A. Velasco [Mon, 7 Sep 2015 08:07:47 +0000 (10:07 +0200)]
HOT FIX: recovered lost strings
David A. Velasco [Mon, 7 Sep 2015 07:13:44 +0000 (09:13 +0200)]
Fixed text preview filter to take into account local knowledge about MIME types
Jenkins for ownCloud [Mon, 7 Sep 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 6 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 5 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 4 Sep 2015 13:01:25 +0000 (15:01 +0200)]
Reverse filter for preview of text files: all text/ but those in black list
masensio [Fri, 4 Sep 2015 12:31:10 +0000 (14:31 +0200)]
Merge branch 'master' into text_file_preview_pr_707_with_develop
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
masensio [Fri, 4 Sep 2015 09:14:42 +0000 (11:14 +0200)]
Merge pull request #1102 from owncloud/copy
Copy files
masensio [Fri, 4 Sep 2015 09:03:31 +0000 (11:03 +0200)]
Update library reference: Copy operation
Jenkins for ownCloud [Fri, 4 Sep 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 2 Sep 2015 11:29:14 +0000 (13:29 +0200)]
Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop
masensio [Wed, 2 Sep 2015 11:21:17 +0000 (13:21 +0200)]
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Jenkins for ownCloud [Wed, 2 Sep 2015 11:06:14 +0000 (07:06 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 2 Sep 2015 09:00:30 +0000 (11:00 +0200)]
Merge pull request #1114 from owncloud/tryFix1113
Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)
Jenkins for ownCloud [Tue, 1 Sep 2015 17:02:18 +0000 (13:02 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)]
Merge branch 'master' into copy
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
David A. Velasco [Tue, 1 Sep 2015 16:15:22 +0000 (18:15 +0200)]
Updated reference to library after upate copy request implementation
Marc Plano-Lesay [Mon, 31 Aug 2015 17:15:36 +0000 (19:15 +0200)]
Use new filetype icons
projects / pub / Android / ownCloud.git / log