Andy Scherzinger [Wed, 4 Nov 2015 09:22:26 +0000 (10:22 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into target_marshmallow
Andy Scherzinger [Wed, 4 Nov 2015 09:04:03 +0000 (10:04 +0100)]
Fix visibility of file size and separator for folder see #1232
Andy Scherzinger [Mon, 2 Nov 2015 14:26:00 +0000 (15:26 +0100)]
correct text field names
Andy Scherzinger [Mon, 2 Nov 2015 14:25:43 +0000 (15:25 +0100)]
change devider color to #f8f8f8
Andy Scherzinger [Mon, 2 Nov 2015 11:32:15 +0000 (12:32 +0100)]
fixed another typo
Andy Scherzinger [Mon, 2 Nov 2015 11:29:13 +0000 (12:29 +0100)]
Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_marshmallow
Andy Scherzinger [Mon, 2 Nov 2015 11:24:02 +0000 (12:24 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Mon, 2 Nov 2015 11:22:49 +0000 (12:22 +0100)]
typos fixed
Andy Scherzinger [Mon, 2 Nov 2015 11:16:27 +0000 (12:16 +0100)]
Revert "target_marshmallow branch push"
This reverts commit
7bec1569f70349bcc1e71c4e04c2adf18572bbfe.
Andy Scherzinger [Mon, 2 Nov 2015 11:11:22 +0000 (12:11 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Mon, 2 Nov 2015 11:05:52 +0000 (12:05 +0100)]
setting divider color to #eee as decided by @jancborchardt
Andy Scherzinger [Mon, 2 Nov 2015 07:41:51 +0000 (08:41 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Mon, 2 Nov 2015 07:40:18 +0000 (08:40 +0100)]
flipped size and mod date
Jenkins for ownCloud [Mon, 2 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 1 Nov 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 31 Oct 2015 05:13:54 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 30 Oct 2015 13:21:45 +0000 (14:21 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
Andy Scherzinger [Fri, 30 Oct 2015 13:20:53 +0000 (14:20 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Maria Asensio [Fri, 30 Oct 2015 13:14:52 +0000 (14:14 +0100)]
Merge pull request #1109 from owncloud/sync_full_folder
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
masensio [Fri, 30 Oct 2015 13:11:01 +0000 (14:11 +0100)]
Update library reference, sync_full_folder
David A. Velasco [Fri, 30 Oct 2015 12:59:02 +0000 (13:59 +0100)]
Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog
Maria Asensio [Fri, 30 Oct 2015 09:38:14 +0000 (10:38 +0100)]
Merge pull request #1200 from owncloud/fix_1192_date_time
fix for #1192
Jenkins for ownCloud [Fri, 30 Oct 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
LukeOwncloud [Thu, 29 Oct 2015 20:03:32 +0000 (21:03 +0100)]
MC: Updated comment only
Comment did not reflect last commit change.
David A. Velasco [Thu, 29 Oct 2015 18:03:41 +0000 (19:03 +0100)]
Merge pull request #1105 from owncloud/fixLegacyTravis
Switch from Travis legacy infrastructure to container-based
masensio [Thu, 29 Oct 2015 16:13:24 +0000 (17:13 +0100)]
Detect conflict when local and server version are changed
Andy Scherzinger [Thu, 29 Oct 2015 09:24:15 +0000 (10:24 +0100)]
return standard date string as fallback
Jenkins for ownCloud [Thu, 29 Oct 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Tue, 27 Oct 2015 16:29:02 +0000 (17:29 +0100)]
tabs due to notepad++ (fixed)
Andy Scherzinger [Tue, 27 Oct 2015 16:27:23 +0000 (17:27 +0100)]
readding Android 22 und 19 for travis
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
masensio [Tue, 27 Oct 2015 13:32:42 +0000 (14:32 +0100)]
Fix Select Local Version or Keep Both behaviour when solving file coflict
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
masensio [Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)]
Merge branch 'master' into sync_full_folder
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
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:57:04 +0000 (13:57 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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:05:06 +0000 (13:05 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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 11:00:15 +0000 (13:00 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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:32 +0000 (10:41 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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:33:49 +0000 (10:33 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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
Andy Scherzinger [Sun, 11 Oct 2015 10:30:05 +0000 (12:30 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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
Andy Scherzinger [Wed, 7 Oct 2015 17:03:23 +0000 (19:03 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
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 [Thu, 1 Oct 2015 08:37:37 +0000 (10:37 +0200)]
Fix: Long press menu shows two extra options: old cancel download and old cancel upload
masensio [Wed, 30 Sep 2015 15:59:12 +0000 (17:59 +0200)]
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
masensio [Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)]
Merge branch 'master' into sync_full_folder
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
masensio [Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)]
Merge branch 'master' of github.com:owncloud/android
Conflicts:
CHANGELOG.md
projects / pub / Android / ownCloud.git / log