Andy Scherzinger [Tue, 27 Oct 2015 16:24:25 +0000 (17:24 +0100)]
bumped travis to android 23 and latest build tools 23.0.1
Andy Scherzinger [Tue, 27 Oct 2015 16:00:54 +0000 (17:00 +0100)]
new 23.1.0 files
Andy Scherzinger [Tue, 27 Oct 2015 16:00:18 +0000 (17:00 +0100)]
fixed AppCompat 23.1.0 for ant
Andy Scherzinger [Tue, 27 Oct 2015 15:51:30 +0000 (16:51 +0100)]
added missing empty src folder for ant build
Andy Scherzinger [Tue, 27 Oct 2015 15:49:36 +0000 (16:49 +0100)]
upgrade to 23.1.0 AppCompat and bumping Compile Target to 23 (Android M, needed in order to use AppCompat 23+)
Andy Scherzinger [Tue, 27 Oct 2015 15:37:36 +0000 (16:37 +0100)]
Move to NotificationCompat.Builder to create/replace notification (done for Android M compatibility @ compile target)
Andy Scherzinger [Tue, 27 Oct 2015 15:36:46 +0000 (16:36 +0100)]
material style play icon added
Andy Scherzinger [Tue, 27 Oct 2015 13:00:52 +0000 (14:00 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Tue, 27 Oct 2015 12:56:32 +0000 (13:56 +0100)]
removed old FAB lib version
Andy Scherzinger [Tue, 27 Oct 2015 12:55:22 +0000 (13:55 +0100)]
updating FAB lib to 1.10.1
Andy Scherzinger [Tue, 27 Oct 2015 12:39:50 +0000 (13:39 +0100)]
hide FAB in copy/move folder chooser
Jenkins for ownCloud [Tue, 27 Oct 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 26 Oct 2015 12:56:35 +0000 (13:56 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Jenkins for ownCloud [Fri, 23 Oct 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Thu, 22 Oct 2015 11:03:53 +0000 (13:03 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
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
Andy Scherzinger [Mon, 19 Oct 2015 13:15:00 +0000 (15:15 +0200)]
added accents color definition on missed out top level theme definitions.
Andy Scherzinger [Mon, 19 Oct 2015 10:59:39 +0000 (12:59 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Jenkins for ownCloud [Mon, 19 Oct 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
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
Andy Scherzinger [Fri, 16 Oct 2015 12:47:12 +0000 (14:47 +0200)]
Merge branch 'fix_1192_date_time' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Fri, 16 Oct 2015 09:41:26 +0000 (11:41 +0200)]
flipped the if/else for performance optimization
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
Andy Scherzinger [Fri, 16 Oct 2015 08:41:02 +0000 (10:41 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
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
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
Andy Scherzinger [Wed, 14 Oct 2015 08:32:16 +0000 (10:32 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
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:51:53 +0000 (18:51 +0200)]
Merge branch '1182_Open_With_Fix' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Mon, 5 Oct 2015 16:51:00 +0000 (18:51 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
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
Andy Scherzinger [Mon, 28 Sep 2015 16:31:23 +0000 (18:31 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
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:58:49 +0000 (21:58 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Sun, 27 Sep 2015 19:48:23 +0000 (21:48 +0200)]
Merge branch 'notification_coloring' of https://github.com/owncloud/android into material_fab
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
Andy Scherzinger [Fri, 25 Sep 2015 14:09:01 +0000 (16:09 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Fri, 25 Sep 2015 14:08:24 +0000 (16:08 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
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
Andy Scherzinger [Thu, 24 Sep 2015 07:46:58 +0000 (09:46 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Thu, 24 Sep 2015 07:46:23 +0000 (09:46 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
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 …
Andy Scherzinger [Tue, 22 Sep 2015 08:01:46 +0000 (10:01 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Tue, 22 Sep 2015 08:01:14 +0000 (10:01 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Tue, 22 Sep 2015 08:00:18 +0000 (10:00 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Tue, 22 Sep 2015 07:59:53 +0000 (09:59 +0200)]
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
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 14:58:54 +0000 (16:58 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Thu, 17 Sep 2015 13:39:27 +0000 (15:39 +0200)]
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons
Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml
Andy Scherzinger [Thu, 17 Sep 2015 13:38:59 +0000 (15:38 +0200)]
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_fab
Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml
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
Andy Scherzinger [Wed, 16 Sep 2015 15:38:17 +0000 (17:38 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java
Andy Scherzinger [Wed, 16 Sep 2015 15:34:29 +0000 (17:34 +0200)]
fix for refrsh icon in text view in landscape mode
Andy Scherzinger [Wed, 16 Sep 2015 15:31:27 +0000 (17:31 +0200)]
fix click listener
Andy Scherzinger [Wed, 16 Sep 2015 15:21:53 +0000 (17:21 +0200)]
fix for refresh bug
Andy Scherzinger [Wed, 16 Sep 2015 15:16:38 +0000 (17:16 +0200)]
minor refresh button fixes
masensio [Wed, 16 Sep 2015 14:54:07 +0000 (16:54 +0200)]
Update versionName and versionCode for version 1.8. Also in workaround
projects / pub / Android / ownCloud.git / log