tobiasKaminsky [Fri, 13 Nov 2015 17:23:46 +0000 (18:23 +0100)]
update
tobiasKaminsky [Fri, 13 Nov 2015 16:54:25 +0000 (17:54 +0100)]
fix merge errors
tobiasKaminsky [Fri, 13 Nov 2015 16:52:18 +0000 (17:52 +0100)]
Merge branch 'beta' of github.com:owncloud/android into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:51:09 +0000 (17:51 +0100)]
updated PRs
tobiasKaminsky [Fri, 13 Nov 2015 16:49:03 +0000 (17:49 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:45:04 +0000 (17:45 +0100)]
Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:44:03 +0000 (17:44 +0100)]
Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:43:19 +0000 (17:43 +0100)]
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:42:02 +0000 (17:42 +0100)]
Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:41:49 +0000 (17:41 +0100)]
Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
tobiasKaminsky [Fri, 13 Nov 2015 16:39:24 +0000 (17:39 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into beta
Jenkins for ownCloud [Fri, 13 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 12 Nov 2015 18:02:05 +0000 (19:02 +0100)]
Merge pull request #1254 from owncloud/droid-update
User manual updated with new images and text for 1.8
David A. Velasco [Thu, 12 Nov 2015 09:32:36 +0000 (10:32 +0100)]
Merge pull request #1274 from owncloud/read_capabilities_for_showing_share_options
Adapt availability of "Share with users" depending on server capabilities
masensio [Wed, 11 Nov 2015 10:08:32 +0000 (11:08 +0100)]
Read capabilities for showing Share Options
Updated library reference after merge in master
David A. Velasco [Thu, 12 Nov 2015 08:29:31 +0000 (09:29 +0100)]
Recovered version code in AndroidManifest.xml to support Ant based build
David A. Velasco [Thu, 12 Nov 2015 08:17:29 +0000 (09:17 +0100)]
Updated library reference to get OwnCloudVersion#supportsNativeGallery
Andy Scherzinger [Wed, 11 Nov 2015 17:44:06 +0000 (18:44 +0100)]
revert to head
Maria Asensio [Wed, 11 Nov 2015 16:13:42 +0000 (17:13 +0100)]
Merge pull request #1269 from owncloud/fix_video_not_previewed
Fix video not previewed #1180
Jenkins for ownCloud [Wed, 11 Nov 2015 06:13:45 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Andy Scherzinger [Tue, 10 Nov 2015 10:48:53 +0000 (11:48 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into beta
Andy Scherzinger [Tue, 10 Nov 2015 10:41:05 +0000 (11:41 +0100)]
fixed background color
Andy Scherzinger [Tue, 10 Nov 2015 10:27:23 +0000 (11:27 +0100)]
Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta
Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
src/com/owncloud/android/ui/activity/Uploader.java
Jenkins for ownCloud [Tue, 10 Nov 2015 06:13:45 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 9 Nov 2015 20:45:17 +0000 (21:45 +0100)]
updated readme
Andy Scherzinger [Mon, 9 Nov 2015 17:24:57 +0000 (18:24 +0100)]
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
Andy Scherzinger [Mon, 9 Nov 2015 09:53:14 +0000 (10:53 +0100)]
Merge branch 'beta' of https://github.com/owncloud/android into beta
Andy Scherzinger [Mon, 9 Nov 2015 09:50:22 +0000 (10:50 +0100)]
bump java source/target to 7
tobiasKaminsky [Mon, 9 Nov 2015 07:12:55 +0000 (08:12 +0100)]
add apk
tobiasKaminsky [Mon, 9 Nov 2015 07:11:18 +0000 (08:11 +0100)]
fix #1265
Jenkins for ownCloud [Mon, 9 Nov 2015 06:13:41 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 8 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 7 Nov 2015 06:13:50 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 6 Nov 2015 18:47:19 +0000 (19:47 +0100)]
Minimal cleaning
tobiasKaminsky [Fri, 6 Nov 2015 17:20:57 +0000 (18:20 +0100)]
revert lib
tobiasKaminsky [Fri, 6 Nov 2015 17:19:50 +0000 (18:19 +0100)]
do not show "switch" menu item on file details/preview text/video/audio
tobiasKaminsky [Fri, 6 Nov 2015 17:16:29 +0000 (18:16 +0100)]
do not show "switch" menu item on file details/preview text/video/audio
tobiasKaminsky [Fri, 6 Nov 2015 16:35:52 +0000 (17:35 +0100)]
Merge branch 'setAsWallpaper' into beta
tobiasKaminsky [Fri, 6 Nov 2015 16:25:46 +0000 (17:25 +0100)]
fixed sharing
tobiasKaminsky [Fri, 6 Nov 2015 15:02:01 +0000 (16:02 +0100)]
Versionstring shows YYYYMMDD
tobiasKaminsky [Fri, 6 Nov 2015 14:23:19 +0000 (15:23 +0100)]
menu item only visible for images
tobiasKaminsky [Fri, 6 Nov 2015 14:21:53 +0000 (15:21 +0100)]
menu item only visible for video/audio
David A. Velasco [Fri, 6 Nov 2015 14:02:57 +0000 (15:02 +0100)]
Fixed local URI to video files passed to VideoView
Andy Scherzinger [Fri, 6 Nov 2015 11:03:16 +0000 (12:03 +0100)]
Merge branch 'material_fab' of https://github.com/owncloud/android into target_marshmallow
Andy Scherzinger [Fri, 6 Nov 2015 11:00:35 +0000 (12:00 +0100)]
update lib
Andy Scherzinger [Fri, 6 Nov 2015 10:54:28 +0000 (11:54 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Fri, 6 Nov 2015 10:43:56 +0000 (11:43 +0100)]
lib update
Andy Scherzinger [Fri, 6 Nov 2015 10:38:51 +0000 (11:38 +0100)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts:
res/layout/list_item.xml
Maria Asensio [Fri, 6 Nov 2015 10:23:30 +0000 (11:23 +0100)]
Merge pull request #1184 from Wikinaut/show-certificate-digest
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
Jenkins for ownCloud [Fri, 6 Nov 2015 06:14:02 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Thu, 5 Nov 2015 22:00:32 +0000 (23:00 +0100)]
update latest.apk
tobiasKaminsky [Thu, 5 Nov 2015 21:59:53 +0000 (22:59 +0100)]
update apk
tobiasKaminsky [Thu, 5 Nov 2015 21:59:12 +0000 (22:59 +0100)]
update changelog url
tobiasKaminsky [Thu, 5 Nov 2015 21:58:19 +0000 (22:58 +0100)]
update version url
tobiasKaminsky [Thu, 5 Nov 2015 21:55:42 +0000 (22:55 +0100)]
add last latest.apk ;)
tobiasKaminsky [Thu, 5 Nov 2015 21:52:19 +0000 (22:52 +0100)]
add apk
tobiasKaminsky [Thu, 5 Nov 2015 21:51:26 +0000 (22:51 +0100)]
wip
tobiasKaminsky [Thu, 5 Nov 2015 21:30:45 +0000 (22:30 +0100)]
wip
tobiasKaminsky [Thu, 5 Nov 2015 21:26:56 +0000 (22:26 +0100)]
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
tobiasKaminsky [Thu, 5 Nov 2015 21:04:57 +0000 (22:04 +0100)]
Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
tobiasKaminsky [Thu, 5 Nov 2015 20:58:02 +0000 (21:58 +0100)]
fixed #1244
tobiasKaminsky [Thu, 5 Nov 2015 20:37:08 +0000 (21:37 +0100)]
check available beta version
Carla Schroder [Thu, 5 Nov 2015 17:48:53 +0000 (09:48 -0800)]
more file management options
Maria Asensio [Thu, 5 Nov 2015 12:19:24 +0000 (13:19 +0100)]
Merge pull request #1252 from owncloud/share_with_users
Share with users & groups
masensio [Thu, 5 Nov 2015 12:16:32 +0000 (13:16 +0100)]
Update Library Reference, share_with_users branch
David A. Velasco [Thu, 5 Nov 2015 09:24:38 +0000 (10:24 +0100)]
Removed spurious file
Jenkins for ownCloud [Thu, 5 Nov 2015 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Carla Schroder [Wed, 4 Nov 2015 23:18:15 +0000 (15:18 -0800)]
Updated with new images and text for 1.8
Andy Scherzinger [Wed, 4 Nov 2015 09:52:08 +0000 (10:52 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
Andy Scherzinger [Wed, 4 Nov 2015 09:51:43 +0000 (10:51 +0100)]
moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232
Andy Scherzinger [Wed, 4 Nov 2015 09:26:46 +0000 (10:26 +0100)]
library update
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:11:39 +0000 (10:11 +0100)]
Merge branch 'beta' of https://github.com/owncloud/android into beta
Andy Scherzinger [Wed, 4 Nov 2015 09:11:27 +0000 (10:11 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Andy Scherzinger [Wed, 4 Nov 2015 09:06:45 +0000 (10:06 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Wed, 4 Nov 2015 09:04:03 +0000 (10:04 +0100)]
Fix visibility of file size and separator for folder see #1232
Jenkins for ownCloud [Wed, 4 Nov 2015 06:13:47 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 3 Nov 2015 08:37:27 +0000 (09:37 +0100)]
Update Library Reference: add unit test for Sharee operations
Jenkins for ownCloud [Tue, 3 Nov 2015 06:13:49 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 2 Nov 2015 21:29:16 +0000 (22:29 +0100)]
update
tobiasKaminsky [Mon, 2 Nov 2015 21:14:59 +0000 (22:14 +0100)]
fixed lib
tobiasKaminsky [Mon, 2 Nov 2015 21:11:22 +0000 (22:11 +0100)]
Merge branch 'master' of github.com:owncloud/android into setAsWallpaper
tobiasKaminsky [Mon, 2 Nov 2015 21:09:29 +0000 (22:09 +0100)]
updated for future use with later PRs
tobiasKaminsky [Mon, 2 Nov 2015 21:02:24 +0000 (22:02 +0100)]
update
tobiasKaminsky [Mon, 2 Nov 2015 20:53:24 +0000 (21:53 +0100)]
fixed sending cached images
tobiasKaminsky [Mon, 2 Nov 2015 19:10:21 +0000 (20:10 +0100)]
Merge remote-tracking branch 'upstream/beta' into beta
tobiasKaminsky [Mon, 2 Nov 2015 18:53:54 +0000 (19:53 +0100)]
fixed according to review
tobiasKaminsky [Mon, 2 Nov 2015 18:51:14 +0000 (19:51 +0100)]
wip
Andy Scherzinger [Mon, 2 Nov 2015 17:06:30 +0000 (18:06 +0100)]
force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-
153075076)
Andy Scherzinger [Mon, 2 Nov 2015 16:59:08 +0000 (17:59 +0100)]
force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-
153075076)
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 14:24:57 +0000 (15:24 +0100)]
change color of devider to #f8f8f8
Andy Scherzinger [Mon, 2 Nov 2015 14:23:24 +0000 (15:23 +0100)]
beta launcher icon variant
Andy Scherzinger [Mon, 2 Nov 2015 13:50:51 +0000 (14:50 +0100)]
corrected text view names
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 12:27:28 +0000 (13:27 +0100)]
owncloud library update
Andy Scherzinger [Mon, 2 Nov 2015 11:32:48 +0000 (12:32 +0100)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
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
projects / pub / Android / ownCloud.git / log