David A. Velasco [Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)]
Merge branch 'develop'
Conflicts FIXED:
owncloud-android-library
David A. Velasco [Fri, 7 Aug 2015 08:10:57 +0000 (10:10 +0200)]
Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
Updated documents and .gitmodules with new policy: PRs should go to m…
David A. Velasco [Thu, 6 Aug 2015 11:00:45 +0000 (13:00 +0200)]
Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop
Jenkins for ownCloud [Fri, 7 Aug 2015 05:13:50 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Thu, 6 Aug 2015 09:00:59 +0000 (11:00 +0200)]
Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml
change the subject when sharing in saml
masensio [Thu, 6 Aug 2015 08:53:35 +0000 (10:53 +0200)]
Update library reference with fix for saml username
masensio [Thu, 6 Aug 2015 08:44:55 +0000 (10:44 +0200)]
Update library reference
David A. Velasco [Mon, 3 Aug 2015 09:21:11 +0000 (11:21 +0200)]
Added username to SAML credentials
purigarcia [Thu, 9 Jul 2015 08:40:47 +0000 (10:40 +0200)]
change the subject
Jenkins for ownCloud [Thu, 6 Aug 2015 05:14:11 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 5 Aug 2015 10:53:03 +0000 (12:53 +0200)]
Merge pull request #1068 from owncloud/conflictDialog_newWording
Conflict dialog: new wording
David A. Velasco [Tue, 4 Aug 2015 15:29:42 +0000 (17:29 +0200)]
Updated conflict message (same as in web app)
David A. Velasco [Tue, 4 Aug 2015 14:47:46 +0000 (16:47 +0200)]
Fixed double request for ConflictsResolveActivity
tobiasKaminsky [Mon, 3 Aug 2015 20:42:58 +0000 (22:42 +0200)]
download file if "use server version"
tobiasKaminsky [Wed, 22 Jul 2015 19:38:43 +0000 (21:38 +0200)]
re-added values-tzl
tobiasKaminsky [Wed, 22 Jul 2015 17:02:09 +0000 (19:02 +0200)]
tobiasKaminsky [Fri, 17 Jul 2015 14:29:17 +0000 (16:29 +0200)]
renamed string values
David A. Velasco [Tue, 4 Aug 2015 10:36:24 +0000 (12:36 +0200)]
Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1
Update buildTools version to 22.0.1
David A. Velasco [Tue, 4 Aug 2015 10:28:57 +0000 (12:28 +0200)]
Updated reference to library
masensio [Tue, 4 Aug 2015 09:14:51 +0000 (11:14 +0200)]
Update buildTools version to 22.0.1
David A. Velasco [Tue, 4 Aug 2015 08:38:15 +0000 (10:38 +0200)]
Merge pull request #1083 from owncloud/update_jackrabbit_library
Update JackRabbit library
Jenkins for ownCloud [Tue, 4 Aug 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 3 Aug 2015 13:07:20 +0000 (15:07 +0200)]
Update build.gradle to 1.2.3
masensio [Fri, 31 Jul 2015 13:21:18 +0000 (15:21 +0200)]
Update library reference
masensio [Fri, 31 Jul 2015 10:36:42 +0000 (12:36 +0200)]
Update library refernce: Upgrade jackrabbit to 2.10.1
Jenkins for ownCloud [Fri, 31 Jul 2015 05:14:01 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 30 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 29 Jul 2015 06:47:14 +0000 (08:47 +0200)]
Merge pull request #1051 from owncloud/fix_send
Fix sending of files to external apps when their pathname includes charactes requireing URL encoding.
Jenkins for ownCloud [Wed, 29 Jul 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
purigarcia [Tue, 28 Jul 2015 08:47:08 +0000 (10:47 +0200)]
merge develop
purigarcia [Tue, 28 Jul 2015 08:46:13 +0000 (10:46 +0200)]
merge develop
Jenkins for ownCloud [Tue, 28 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
AndyScherzinger [Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into develop
Andy Scherzinger [Sun, 26 Jul 2015 20:16:06 +0000 (22:16 +0200)]
Update README.md
Added more information for contributing code, development setup and build status
Jenkins for ownCloud [Sat, 25 Jul 2015 05:13:46 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 24 Jul 2015 05:14:12 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 23 Jul 2015 07:37:13 +0000 (09:37 +0200)]
Merge pull request #1050 from owncloud/favourites_context_menu
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
Jenkins for ownCloud [Thu, 23 Jul 2015 05:13:51 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
purigarcia [Wed, 22 Jul 2015 16:13:45 +0000 (18:13 +0200)]
change the name of the method from keepInSync to favorite. Other changes commented in the review
David A. Velasco [Mon, 20 Jul 2015 10:27:52 +0000 (12:27 +0200)]
Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList
ShareWithMe icon in file list
purigarcia [Mon, 20 Jul 2015 10:20:15 +0000 (12:20 +0200)]
remove empty line
purigarcia [Mon, 20 Jul 2015 10:18:44 +0000 (12:18 +0200)]
modify for the review
David A. Velasco [Mon, 20 Jul 2015 09:18:15 +0000 (11:18 +0200)]
Merge pull request #1053 from owncloud/pincode_request_is_not_starting_when_rotating
Fixed: pass code request not restarted anymore when the device is rotated
purigarcia [Mon, 20 Jul 2015 08:57:53 +0000 (10:57 +0200)]
modify code to be simpler
Jenkins for ownCloud [Mon, 20 Jul 2015 05:14:05 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Jul 2015 05:14:06 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 17 Jul 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 13 Jul 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Jul 2015 05:14:06 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
purigarcia [Fri, 10 Jul 2015 06:53:03 +0000 (08:53 +0200)]
Merge branch 'develop' into pincode_request_is_not_starting_when_rotating
purigarcia [Fri, 10 Jul 2015 06:49:35 +0000 (08:49 +0200)]
remove a space
purigarcia [Fri, 10 Jul 2015 06:46:48 +0000 (08:46 +0200)]
Merge branch 'develop' into fix_send
purigarcia [Fri, 10 Jul 2015 06:44:56 +0000 (08:44 +0200)]
Merge branch 'develop' into favourites_context_menu
purigarcia [Fri, 10 Jul 2015 06:43:23 +0000 (08:43 +0200)]
Merge branch 'develop' into shareWithYou_icon_in_fileList
Jenkins for ownCloud [Fri, 10 Jul 2015 05:14:03 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
purigarcia [Thu, 9 Jul 2015 14:40:29 +0000 (16:40 +0200)]
save the state before rotate
purigarcia [Thu, 9 Jul 2015 07:35:28 +0000 (09:35 +0200)]
Remove code that should not be in this pr
purigarcia [Thu, 9 Jul 2015 07:30:30 +0000 (09:30 +0200)]
encode the path
Jenkins for ownCloud [Thu, 9 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
purigarcia [Wed, 8 Jul 2015 16:18:51 +0000 (18:18 +0200)]
shareByLink in folder in gridview is shown is shown
purigarcia [Wed, 8 Jul 2015 16:14:38 +0000 (18:14 +0200)]
in gridview in the folder, icons are not shown
purigarcia [Wed, 8 Jul 2015 15:41:41 +0000 (17:41 +0200)]
shareWithMe is shown in the file list
purigarcia [Wed, 8 Jul 2015 14:54:39 +0000 (16:54 +0200)]
update the menu in the preview of the video
purigarcia [Wed, 8 Jul 2015 12:40:07 +0000 (14:40 +0200)]
refresh menu in the preview of an image
purigarcia [Wed, 8 Jul 2015 11:33:14 +0000 (13:33 +0200)]
add action finished in FileActivity
purigarcia [Wed, 8 Jul 2015 09:15:22 +0000 (11:15 +0200)]
remove a log
purigarcia [Wed, 8 Jul 2015 08:57:37 +0000 (10:57 +0200)]
add actions in the preview
purigarcia [Wed, 8 Jul 2015 08:32:58 +0000 (10:32 +0200)]
Actions in the detail view
purigarcia [Wed, 8 Jul 2015 08:22:41 +0000 (10:22 +0200)]
toggleKeepInSync is moved to FileOperationsHelper
purigarcia [Wed, 8 Jul 2015 08:17:27 +0000 (10:17 +0200)]
add the action in the context menu
purigarcia [Wed, 8 Jul 2015 07:12:40 +0000 (09:12 +0200)]
reuse a existing method, remove the new one
purigarcia [Wed, 8 Jul 2015 07:08:49 +0000 (09:08 +0200)]
first step to detect if the file is favorite
purigarcia [Wed, 8 Jul 2015 06:58:06 +0000 (08:58 +0200)]
options are not shown if it is a foler
purigarcia [Wed, 8 Jul 2015 06:55:41 +0000 (08:55 +0200)]
this two options are not shown if the file is downloading or uploading
purigarcia [Wed, 8 Jul 2015 06:50:24 +0000 (08:50 +0200)]
add unfavorite option in context menu
purigarcia [Wed, 8 Jul 2015 06:43:49 +0000 (08:43 +0200)]
change the name from favorites to keep_up_to_date
purigarcia [Wed, 8 Jul 2015 06:36:10 +0000 (08:36 +0200)]
add keep up to date option in the menu
Jenkins for ownCloud [Wed, 8 Jul 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 7 Jul 2015 11:15:35 +0000 (13:15 +0200)]
Merge branch 'master' into develop
masensio [Tue, 7 Jul 2015 08:41:22 +0000 (10:41 +0200)]
delete values-tzl
masensio [Mon, 6 Jul 2015 11:55:36 +0000 (13:55 +0200)]
Merge branch 'release-1.7.2'
masensio [Mon, 6 Jul 2015 11:53:18 +0000 (13:53 +0200)]
Update library reference
masensio [Mon, 6 Jul 2015 09:48:52 +0000 (11:48 +0200)]
Update CHANGELOG.MD
Jenkins for ownCloud [Sun, 5 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 Jul 2015 05:15:16 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 2 Jul 2015 12:03:12 +0000 (14:03 +0200)]
Fixed SAML SSO
David A. Velasco [Thu, 2 Jul 2015 11:03:48 +0000 (13:03 +0200)]
Fixed title in action bar when user clicks on upload notification in progress / failed
David A. Velasco [Thu, 2 Jul 2015 10:08:36 +0000 (12:08 +0200)]
Fixed condition to browse up when current file shown is uploading for first time or a failed upload
Jenkins for ownCloud [Wed, 1 Jul 2015 05:14:53 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 30 Jun 2015 05:13:52 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Jun 2015 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Jun 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 27 Jun 2015 19:48:34 +0000 (21:48 +0200)]
revert previous commit
tobiasKaminsky [Sat, 27 Jun 2015 19:16:03 +0000 (21:16 +0200)]
enabling video thumbnails
Jenkins for ownCloud [Sat, 27 Jun 2015 05:13:58 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 26 Jun 2015 07:07:51 +0000 (09:07 +0200)]
Fixed bug in access to same folder than last time when a file is shared with OC to upload
David A. Velasco [Thu, 25 Jun 2015 12:43:04 +0000 (14:43 +0200)]
Merge branch 'develop' into release-1.7.2
masensio [Thu, 25 Jun 2015 11:29:50 +0000 (13:29 +0200)]
Merge pull request #1027 from owncloud/auto_grid_only_with_all_pictures
Auto grid only in folders with only pictures and server with remote thumbnails support
projects / pub / Android / ownCloud.git / log