Andy Scherzinger [Mon, 2 Nov 2015 13:17:31 +0000 (14:17 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Andy Scherzinger [Mon, 2 Nov 2015 11:32:15 +0000 (12:32 +0100)]
fixed another typo
Andy Scherzinger [Mon, 2 Nov 2015 11:22:49 +0000 (12:22 +0100)]
typos fixed
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
tobiasKaminsky [Sun, 1 Nov 2015 11:42:43 +0000 (12:42 +0100)]
add apk
tobiasKaminsky [Sun, 1 Nov 2015 08:16:55 +0000 (09:16 +0100)]
Merge remote-tracking branch 'remotes/upstream/streaming' into beta
tobiasKaminsky [Sun, 1 Nov 2015 08:16:33 +0000 (09:16 +0100)]
show external streaming only for not downloaded files
tobiasKaminsky [Sun, 1 Nov 2015 08:14:09 +0000 (09:14 +0100)]
Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
tobiasKaminsky [Sun, 1 Nov 2015 08:07:58 +0000 (09:07 +0100)]
Merge remote-tracking branch 'remotes/upstream/streaming' into beta
tobiasKaminsky [Sun, 1 Nov 2015 07:59:34 +0000 (08:59 +0100)]
add missing check for context menu
tobiasKaminsky [Sun, 1 Nov 2015 07:52:04 +0000 (08:52 +0100)]
tidy up once more
tobiasKaminsky [Sun, 1 Nov 2015 07:29:10 +0000 (08:29 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into streaming
tobiasKaminsky [Sun, 1 Nov 2015 07:28:59 +0000 (08:28 +0100)]
tidy up
Jenkins for ownCloud [Sun, 1 Nov 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 31 Oct 2015 12:31:10 +0000 (13:31 +0100)]
removed NPE & build APK again
tobiasKaminsky [Sat, 31 Oct 2015 12:29:04 +0000 (13:29 +0100)]
removed NPE
tobiasKaminsky [Sat, 31 Oct 2015 12:26:59 +0000 (13:26 +0100)]
updated changelod
tobiasKaminsky [Sat, 31 Oct 2015 12:22:07 +0000 (13:22 +0100)]
remove todo
tobiasKaminsky [Sat, 31 Oct 2015 12:18:44 +0000 (13:18 +0100)]
remove todo
tobiasKaminsky [Sat, 31 Oct 2015 12:18:20 +0000 (13:18 +0100)]
implements #1233
tobiasKaminsky [Sat, 31 Oct 2015 09:36:50 +0000 (10:36 +0100)]
delete file
tobiasKaminsky [Sat, 31 Oct 2015 09:35:35 +0000 (10:35 +0100)]
link to latest beta
add apk
tobiasKaminsky [Sat, 31 Oct 2015 09:17:54 +0000 (10:17 +0100)]
show toggle list/grid
tobiasKaminsky [Sat, 31 Oct 2015 08:05:45 +0000 (09:05 +0100)]
update
tobiasKaminsky [Sat, 31 Oct 2015 07:48:10 +0000 (08:48 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Sat, 31 Oct 2015 07:37:33 +0000 (08:37 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Sat, 31 Oct 2015 07:36:39 +0000 (08:36 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
tobiasKaminsky [Sat, 31 Oct 2015 07:30:13 +0000 (08:30 +0100)]
fixed storing thumbnails by correct imageKey
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
Jenkins for ownCloud [Sat, 31 Oct 2015 05:13:54 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
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
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
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
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
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
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.
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
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
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
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
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
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
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
tobiasKaminsky [Sun, 25 Oct 2015 11:50:54 +0000 (12:50 +0100)]
wip
tobiasKaminsky [Sun, 25 Oct 2015 07:13:56 +0000 (08:13 +0100)]
Merge branch 'master' of github.com:owncloud/android into streaming
tobiasKaminsky [Sun, 25 Oct 2015 07:13:38 +0000 (08:13 +0100)]
wip
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
projects / pub / Android / ownCloud.git / log