tobiasKaminsky [Thu, 29 Oct 2015 17:02:00 +0000 (18:02 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
# Conflicts:
# res/menu/file_actions_menu.xml
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
# src/com/owncloud/android/utils/DisplayUtils.java
tobiasKaminsky [Thu, 29 Oct 2015 16:55:56 +0000 (17:55 +0100)]
Merge branch 'switchListVsGridMaster' into beta
tobiasKaminsky [Thu, 29 Oct 2015 16:55:13 +0000 (17:55 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
tobiasKaminsky [Thu, 29 Oct 2015 16:42:26 +0000 (17:42 +0100)]
renamed app to "Owncloud Beta" -> possibility to have both installed
Jenkins for ownCloud [Thu, 29 Oct 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Tue, 27 Oct 2015 20:46:46 +0000 (21:46 +0100)]
merged PR 1111 animatedGif
tobiasKaminsky [Tue, 27 Oct 2015 20:31:22 +0000 (21:31 +0100)]
Merge remote-tracking branch 'remotes/upstream/animatedGif' into beta
tobiasKaminsky [Tue, 27 Oct 2015 20:24:36 +0000 (21:24 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into animatedGif
Jenkins for ownCloud [Tue, 27 Oct 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 26 Oct 2015 22:04:20 +0000 (23:04 +0100)]
updated readme
tobiasKaminsky [Mon, 26 Oct 2015 21:58:20 +0000 (22:58 +0100)]
add apk
changed Readme
tobiasKaminsky [Mon, 26 Oct 2015 21:54:43 +0000 (22:54 +0100)]
updated changelog
tobiasKaminsky [Mon, 26 Oct 2015 21:52:31 +0000 (22:52 +0100)]
Add apk
tobiasKaminsky [Mon, 26 Oct 2015 21:49:00 +0000 (22:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
tobiasKaminsky [Mon, 26 Oct 2015 21:15:56 +0000 (22:15 +0100)]
Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta
tobiasKaminsky [Mon, 26 Oct 2015 21:13:55 +0000 (22:13 +0100)]
Updated readme, changelod
tobiasKaminsky [Mon, 26 Oct 2015 20:50:20 +0000 (21:50 +0100)]
Updated readme description
Jenkins for ownCloud [Fri, 23 Oct 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 22 Oct 2015 07:10:10 +0000 (09:10 +0200)]
Merge pull request #1177 from owncloud/notification_coloring
Add ownCloud color to notifications for lollipop
Andy Scherzinger [Wed, 21 Oct 2015 09:31:58 +0000 (11:31 +0200)]
removed primary color usage for textColor of the input fields on the loginscreen
Jenkins for ownCloud [Wed, 21 Oct 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 20 Oct 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 19 Oct 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sun, 18 Oct 2015 10:51:08 +0000 (12:51 +0200)]
split "on charging" to photo and video
tobiasKaminsky [Sun, 18 Oct 2015 10:50:54 +0000 (12:50 +0200)]
Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
tobiasKaminsky [Sun, 18 Oct 2015 08:21:29 +0000 (10:21 +0200)]
update according to jan
tobiasKaminsky [Sun, 18 Oct 2015 08:08:46 +0000 (10:08 +0200)]
Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
Jenkins for ownCloud [Sun, 18 Oct 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 17 Oct 2015 05:13:48 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
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 [Wed, 14 Oct 2015 08:34:48 +0000 (10:34 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
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
Andy Scherzinger [Fri, 9 Oct 2015 13:46:35 +0000 (15:46 +0200)]
actual lib reference
Andy Scherzinger [Fri, 9 Oct 2015 13:04:39 +0000 (15:04 +0200)]
directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.
Andy Scherzinger [Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
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
Andy Scherzinger [Sun, 27 Sep 2015 19:40:52 +0000 (21:40 +0200)]
Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background
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
tobiasKaminsky [Wed, 16 Sep 2015 18:15:46 +0000 (20:15 +0200)]
- variables with m
- onMeasure sets always width/height
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
projects / pub / Android / ownCloud.git / log