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
Andy Scherzinger [Wed, 21 Oct 2015 09:05:11 +0000 (11:05 +0200)]
center align radio buttons
Jenkins for ownCloud [Wed, 21 Oct 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Tue, 20 Oct 2015 14:26:52 +0000 (16:26 +0200)]
fixed icon (+naming) to use resolution depended icon and don't scale
Andy Scherzinger [Tue, 20 Oct 2015 14:22:36 +0000 (16:22 +0200)]
download icon
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
tobiasKaminsky [Sun, 18 Oct 2015 14:32:39 +0000 (16:32 +0200)]
add missing file
tobiasKaminsky [Sun, 18 Oct 2015 14:26:35 +0000 (16:26 +0200)]
refresh after chage
tobiasKaminsky [Sun, 18 Oct 2015 14:06:43 +0000 (16:06 +0200)]
wip
tobiasKaminsky [Sun, 18 Oct 2015 13:44:23 +0000 (15:44 +0200)]
enabled all occurrences.
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
tobiasKaminsky [Sat, 17 Oct 2015 15:36:31 +0000 (17:36 +0200)]
fixed according to andys comments
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
tobiasKaminsky [Mon, 12 Oct 2015 18:21:19 +0000 (20:21 +0200)]
cache size is read from cache on preference start
tobiasKaminsky [Mon, 12 Oct 2015 06:30:30 +0000 (08:30 +0200)]
cache resize
tobiasKaminsky [Mon, 12 Oct 2015 05:40:21 +0000 (07:40 +0200)]
add preference for cache size
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
tobiasKaminsky [Mon, 5 Oct 2015 05:53:10 +0000 (07:53 +0200)]
show big thumbnails for videos
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
tobiasKaminsky [Wed, 30 Sep 2015 16:42:17 +0000 (18:42 +0200)]
Merge remote-tracking branch 'remotes/upstream/multiSelect' into multiSelect
tobiasKaminsky [Wed, 30 Sep 2015 16:40:13 +0000 (18:40 +0200)]
Merge branch 'master' of github.com:owncloud/android into multiSelect
tobiasKaminsky [Wed, 30 Sep 2015 16:39:35 +0000 (18:39 +0200)]
wip
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
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
tobiasKaminsky [Tue, 29 Sep 2015 19:13:31 +0000 (21:13 +0200)]
Merge branch 'master' of github.com:owncloud/android into multiSelect
tobiasKaminsky [Tue, 29 Sep 2015 19:13:26 +0000 (21:13 +0200)]
wip
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'
David A. Velasco [Mon, 28 Sep 2015 09:21:33 +0000 (11:21 +0200)]
Upload operations end in conflict if overriding a version different than the last known
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 [Sun, 27 Sep 2015 18:43:18 +0000 (20:43 +0200)]
added a divider to the bottom part
Andy Scherzinger [Sun, 27 Sep 2015 18:32:44 +0000 (20:32 +0200)]
16dp right and left for checkpoxed
Andy Scherzinger [Sun, 27 Sep 2015 18:21:09 +0000 (20:21 +0200)]
custom list preference implementation for visual material consistency on pre-lollipop
Andy Scherzinger [Sun, 27 Sep 2015 16:19:34 +0000 (18:19 +0200)]
changed the background color two #FFFFFF
tobiasKaminsky [Fri, 25 Sep 2015 15:51:52 +0000 (17:51 +0200)]
wip
tobiasKaminsky [Fri, 25 Sep 2015 15:48:11 +0000 (17:48 +0200)]
changed highlighted color
tobiasKaminsky [Fri, 25 Sep 2015 15:30:30 +0000 (17:30 +0200)]
added 16dp padding
tobiasKaminsky [Fri, 25 Sep 2015 15:23:31 +0000 (17:23 +0200)]
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
tobiasKaminsky [Fri, 25 Sep 2015 15:22:40 +0000 (17:22 +0200)]
fixed bug: behaviour is now obeyed for files that are uploaded after connection switch (no wlan to wlan)
tobiasKaminsky [Fri, 25 Sep 2015 15:21:58 +0000 (17:21 +0200)]
default value: do nothing
show summary for behaviour
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 13:15:17 +0000 (15:15 +0200)]
Updated reference to library after rebase
David A. Velasco [Fri, 28 Aug 2015 16:19:20 +0000 (18:19 +0200)]
Updated error message for failed folder synchronization ('download' not anymore)
David A. Velasco [Mon, 24 Aug 2015 10:43:32 +0000 (12:43 +0200)]
Removed some logs
David A. Velasco [Mon, 24 Aug 2015 10:37:47 +0000 (12:37 +0200)]
Clean-up: removed unused imports and methods, and commented code
projects / pub / Android / ownCloud.git / log