tobiasKaminsky [Sat, 31 Oct 2015 07:10:34 +0000 (08:10 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
tobiasKaminsky [Sat, 31 Oct 2015 07:09:49 +0000 (08:09 +0100)]
fixed rotating resized image
tobiasKaminsky [Fri, 30 Oct 2015 16:47:30 +0000 (17:47 +0100)]
lowercase
tobiasKaminsky [Fri, 30 Oct 2015 16:34:34 +0000 (17:34 +0100)]
Show "Beta" in root directory
tobiasKaminsky [Fri, 30 Oct 2015 11:52:12 +0000 (12:52 +0100)]
fixed #1230
tobiasKaminsky [Fri, 30 Oct 2015 10:01:00 +0000 (11:01 +0100)]
fixed #1228
tobiasKaminsky [Fri, 30 Oct 2015 06:59:35 +0000 (07:59 +0100)]
add apk
tobiasKaminsky [Fri, 30 Oct 2015 06:52:21 +0000 (07:52 +0100)]
fix
tobiasKaminsky [Fri, 30 Oct 2015 06:48:04 +0000 (07:48 +0100)]
fix
tobiasKaminsky [Thu, 29 Oct 2015 18:14:45 +0000 (19:14 +0100)]
updated APK
tobiasKaminsky [Thu, 29 Oct 2015 18:09:08 +0000 (19:09 +0100)]
using new github infrastructure
tobiasKaminsky [Thu, 29 Oct 2015 18:00:56 +0000 (19:00 +0100)]
merge multi select
tobiasKaminsky [Thu, 29 Oct 2015 17:54:02 +0000 (18:54 +0100)]
merged "multi select"
tobiasKaminsky [Thu, 29 Oct 2015 17:53:05 +0000 (18:53 +0100)]
Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:49:00 +0000 (18:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:41:52 +0000 (18:41 +0100)]
Merge remote-tracking branch 'remotes/upstream/sortInUploadFilesActivity' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:38:55 +0000 (18:38 +0100)]
Merged PR 1187
tobiasKaminsky [Thu, 29 Oct 2015 17:38:07 +0000 (18:38 +0100)]
Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:37:28 +0000 (18:37 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:34:28 +0000 (18:34 +0100)]
merged pr #1205
tobiasKaminsky [Thu, 29 Oct 2015 17:29:35 +0000 (18:29 +0100)]
Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:25:53 +0000 (18:25 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
# Conflicts:
# src/com/owncloud/android/ui/activity/FileDisplayActivity.java
tobiasKaminsky [Thu, 29 Oct 2015 17:21:20 +0000 (18:21 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
tobiasKaminsky [Thu, 29 Oct 2015 17:20:51 +0000 (18:20 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
# Conflicts:
# src/com/owncloud/android/ui/activity/FileDisplayActivity.java
tobiasKaminsky [Thu, 29 Oct 2015 17:09:14 +0000 (18:09 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
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
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
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
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
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
projects / pub / Android / ownCloud.git / log