masensio [Tue, 18 Mar 2014 11:52:24 +0000 (12:52 +0100)]
Merge branch 'develop' into share_link__reuse_link_shared_in_server
masensio [Tue, 18 Mar 2014 11:51:15 +0000 (12:51 +0100)]
OC-3314: Modify CreateShareOperation#run in the application so that it uses GetRemoteSharesForFileOperation() to get a remote link in the server (if exists) and use it without creating a new one
Mr. Jenkins [Tue, 18 Mar 2014 05:14:30 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 15 Mar 2014 05:18:34 +0000 (01:18 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Fri, 14 Mar 2014 05:14:51 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 13 Mar 2014 10:57:50 +0000 (11:57 +0100)]
Merge pull request #351 from owncloud/introduce-travis-ci
Starting off with travis-ci integration based on https://github.com/emba...
Thomas Müller [Thu, 13 Mar 2014 10:29:18 +0000 (11:29 +0100)]
API14 was missing - don't start the emulator for now
Thomas Müller [Thu, 13 Mar 2014 10:25:47 +0000 (11:25 +0100)]
move setup_env.sh to before_install
Thomas Müller [Thu, 13 Mar 2014 10:22:58 +0000 (11:22 +0100)]
trying to avoid maven call
Thomas Müller [Thu, 13 Mar 2014 10:06:32 +0000 (11:06 +0100)]
trying to avoid maven call
Thomas Müller [Thu, 13 Mar 2014 10:01:19 +0000 (11:01 +0100)]
Merge branch 'develop' into introduce-travis-ci
Thomas Müller [Thu, 13 Mar 2014 10:00:51 +0000 (11:00 +0100)]
Update required APIs
masensio [Thu, 13 Mar 2014 07:58:21 +0000 (08:58 +0100)]
Update library reference
Mr. Jenkins [Thu, 13 Mar 2014 05:14:57 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 12 Mar 2014 10:36:25 +0000 (11:36 +0100)]
Merge pull request #437 from owncloud/check_server_certificates_in_SSO_webview
Check server certificates in SAML SSO webview and allow the user trust or not in case of problems
masensio [Wed, 12 Mar 2014 09:53:32 +0000 (10:53 +0100)]
Remove some import warnings
David A. Velasco [Wed, 12 Mar 2014 09:25:54 +0000 (10:25 +0100)]
Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it
masensio [Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)]
Merge branch 'develop' into check_server_certificates_in_SSO_webview
Mr. Jenkins [Wed, 12 Mar 2014 05:20:34 +0000 (01:20 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 11 Mar 2014 13:45:47 +0000 (14:45 +0100)]
Merge pull request #436 from owncloud/add_fail_getUserName_error_message
OC-3242: Add new error message for fail in GetUserName
masensio [Tue, 11 Mar 2014 13:43:48 +0000 (14:43 +0100)]
OC-3242: Add new error message for fail in GetUserName. No changes in library reference
masensio [Tue, 11 Mar 2014 13:40:38 +0000 (14:40 +0100)]
Revert "OC-3242: Add new error message for fail in GetUserName"
This reverts commit
564bbf7bb832881ee56fe90ea520b5f4becf491d.
masensio [Tue, 11 Mar 2014 12:56:41 +0000 (13:56 +0100)]
OC-3242: Add new error message for fail in GetUserName
masensio [Tue, 11 Mar 2014 10:52:54 +0000 (11:52 +0100)]
Merge pull request #435 from owncloud/ssl_dialogs_refactored_in_just_one
Ssl-error dialogs joint in a single one that uses different adapters to ...
David A. Velasco [Tue, 11 Mar 2014 10:39:19 +0000 (11:39 +0100)]
Ssl-error dialogs joint in a single one that uses different adapters to update its view depending on the classes providing the information
masensio [Tue, 11 Mar 2014 09:54:10 +0000 (10:54 +0100)]
Merge branch 'develop' into check_server_certificates_in_SSO_webview
masensio [Tue, 11 Mar 2014 09:44:57 +0000 (10:44 +0100)]
Merge pull request #432 from owncloud/fix_headers_of_OCS_requests
Updated library reference to get fix of headers in OCS requests
Mr. Jenkins [Tue, 11 Mar 2014 05:14:12 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 10 Mar 2014 10:08:42 +0000 (11:08 +0100)]
Merge branch 'develop' into check_server_certificates_in_SSO_webview
masensio [Mon, 10 Mar 2014 09:53:11 +0000 (10:53 +0100)]
OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient
David A. Velasco [Mon, 10 Mar 2014 08:45:21 +0000 (09:45 +0100)]
Updated library reference to get fix of headers in OCS requests
Mr. Jenkins [Sun, 9 Mar 2014 06:14:15 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 8 Mar 2014 06:14:22 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 7 Mar 2014 14:11:59 +0000 (15:11 +0100)]
Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview
David A. Velasco [Fri, 7 Mar 2014 13:54:04 +0000 (14:54 +0100)]
Fix buttons out of screen in SSL warning dialogs for small screens in landspace
masensio [Fri, 7 Mar 2014 13:48:42 +0000 (14:48 +0100)]
OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one
David A. Velasco [Fri, 7 Mar 2014 13:39:30 +0000 (14:39 +0100)]
Improved view of certificate details for SSL dialog based on SslCertificate
David A. Velasco [Fri, 7 Mar 2014 12:44:13 +0000 (13:44 +0100)]
Added new dialog for SSL errors showing information saved in SslCertificate
David A. Velasco [Fri, 7 Mar 2014 11:42:31 +0000 (12:42 +0100)]
Merge pull request #420 from owncloud/send_file_pr311_with_develop
'Send file to other apps' optimized
masensio [Fri, 7 Mar 2014 08:42:23 +0000 (09:42 +0100)]
Merge branch 'develop' into check_server_certificates_in_SSO_webview
masensio [Fri, 7 Mar 2014 08:42:04 +0000 (09:42 +0100)]
Update library reference
masensio [Fri, 7 Mar 2014 08:38:42 +0000 (09:38 +0100)]
OC-3196: Rewrite according to comments in PR#420
masensio [Fri, 7 Mar 2014 07:53:24 +0000 (08:53 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Fri, 7 Mar 2014 06:14:59 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Thu, 6 Mar 2014 17:26:35 +0000 (18:26 +0100)]
OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly
David A. Velasco [Thu, 6 Mar 2014 15:29:21 +0000 (16:29 +0100)]
Alternative solution for fix in
10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange
Mr. Jenkins [Thu, 6 Mar 2014 06:14:55 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Wed, 5 Mar 2014 11:44:09 +0000 (12:44 +0100)]
Add License in LoadindDialog
masensio [Wed, 5 Mar 2014 11:16:48 +0000 (12:16 +0100)]
OC-3163: Check if the certificate is in the app cetificates repository (mKnownServers of NetworkUtils)
masensio [Wed, 5 Mar 2014 09:20:56 +0000 (10:20 +0100)]
OC-3111: Check in SsoWebViewClient#onReceivedSslError() if the failed X509Certificate is accesible
Mr. Jenkins [Wed, 5 Mar 2014 06:14:55 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 4 Mar 2014 12:28:07 +0000 (13:28 +0100)]
Won't Fix:
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"
This reverts commit
df4d0355f25795914dd0fcb9d53a9113da047c15.
masensio [Tue, 4 Mar 2014 10:58:30 +0000 (11:58 +0100)]
OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file
masensio [Mon, 3 Mar 2014 07:46:26 +0000 (08:46 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Sun, 2 Mar 2014 06:14:29 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 1 Mar 2014 06:14:31 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 28 Feb 2014 12:56:33 +0000 (13:56 +0100)]
OC-3097: (fix bug) When the connection is lost during a download, app thinks that the download is finished
masensio [Fri, 28 Feb 2014 07:30:54 +0000 (08:30 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Fri, 28 Feb 2014 06:14:30 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Luke Owncloud [Thu, 27 Feb 2014 13:37:44 +0000 (14:37 +0100)]
tiny SETUP.md correction
masensio [Thu, 27 Feb 2014 11:32:28 +0000 (12:32 +0100)]
Hotfix on develop: Show share file instead send_file for folders
masensio [Thu, 27 Feb 2014 07:40:17 +0000 (08:40 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Thu, 27 Feb 2014 06:14:38 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Wed, 26 Feb 2014 16:23:18 +0000 (17:23 +0100)]
OC-3097:(fix bug) When the connection is lost during a download, app thinks that the download is finished
David A. Velasco [Wed, 26 Feb 2014 12:07:12 +0000 (13:07 +0100)]
Merge pull request #414 from owncloud/remove_folder_size_info
Removed folder size from list of files, and folder size updates in database
masensio [Wed, 26 Feb 2014 10:05:25 +0000 (11:05 +0100)]
OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file
masensio [Wed, 26 Feb 2014 09:28:21 +0000 (10:28 +0100)]
OC-3087: (fix bug) The loading doesn't deissapear during the download process
masensio [Wed, 26 Feb 2014 09:15:37 +0000 (10:15 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Wed, 26 Feb 2014 06:14:35 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 25 Feb 2014 13:40:44 +0000 (14:40 +0100)]
OC-3082: The file list is white after send a not downloaded file
masensio [Tue, 25 Feb 2014 10:18:43 +0000 (11:18 +0100)]
OC-3078: (Fix bug) Appear 'Copy link' option on the send menu
masensio [Tue, 25 Feb 2014 10:12:48 +0000 (11:12 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
Mr. Jenkins [Tue, 25 Feb 2014 06:14:46 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Mon, 24 Feb 2014 12:54:03 +0000 (13:54 +0100)]
OC-3050: Grant the filelist doesn't refresh unnecessary because of the old update folder size
masensio [Mon, 24 Feb 2014 12:37:48 +0000 (13:37 +0100)]
Merge branch 'develop' into remove_folder_size_info
masensio [Mon, 24 Feb 2014 12:33:23 +0000 (13:33 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
masensio [Mon, 24 Feb 2014 12:16:57 +0000 (13:16 +0100)]
Merge branch 'master' into develop
masensio [Mon, 24 Feb 2014 12:02:10 +0000 (13:02 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
masensio [Mon, 24 Feb 2014 09:51:44 +0000 (10:51 +0100)]
OC-3049: Remove the database update for the folder size data: modify FileContentProvider and FileSyncAdapter.
Mr. Jenkins [Sat, 22 Feb 2014 06:14:58 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 21 Feb 2014 13:52:46 +0000 (14:52 +0100)]
Fix import in AccountUtilsTest
masensio [Fri, 21 Feb 2014 13:46:09 +0000 (14:46 +0100)]
OC-3049: Remove the database update for the folder size data
masensio [Fri, 21 Feb 2014 13:06:02 +0000 (14:06 +0100)]
OC-3047: Hide the file size when the file is a folder
masensio [Fri, 21 Feb 2014 08:22:32 +0000 (09:22 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
David A. Velasco [Thu, 20 Feb 2014 16:51:13 +0000 (17:51 +0100)]
Updated .gitmodules for easier access to ownCloud library from different environments
David A. Velasco [Thu, 20 Feb 2014 14:00:52 +0000 (15:00 +0100)]
Fixed problems unsharing links when other kind of shares exist on a file
David A. Velasco [Thu, 20 Feb 2014 13:48:32 +0000 (14:48 +0100)]
Updated reference to library after filtering not public shares
David A. Velasco [Thu, 20 Feb 2014 11:59:41 +0000 (12:59 +0100)]
Updated reference to library after fixing crash browsing into Shared folder
Mr. Jenkins [Thu, 20 Feb 2014 07:29:39 +0000 (02:29 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 19 Feb 2014 17:00:49 +0000 (18:00 +0100)]
Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends
David A. Velasco [Wed, 19 Feb 2014 15:28:08 +0000 (16:28 +0100)]
Updated library reference
Mr. Jenkins [Wed, 19 Feb 2014 14:43:23 +0000 (09:43 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 19 Feb 2014 11:28:24 +0000 (12:28 +0100)]
Version server is checked every time the root folder is refreshed, and both version and versionstring are in the server are saved locally
masensio [Wed, 19 Feb 2014 09:33:27 +0000 (10:33 +0100)]
OC-3016: Add option 'send_files_to_other_apps' with default value 'on'
masensio [Wed, 19 Feb 2014 08:08:45 +0000 (09:08 +0100)]
Update with develop
masensio [Wed, 19 Feb 2014 07:51:58 +0000 (08:51 +0100)]
Merge branch 'develop' into send_file_pr311_with_develop
David A. Velasco [Tue, 18 Feb 2014 14:20:18 +0000 (15:20 +0100)]
Updated library reference
masensio [Tue, 18 Feb 2014 14:16:22 +0000 (15:16 +0100)]
Merge pull request #405 from owncloud/wide_scope_library_clean_up
Wide scope library clean up
masensio [Tue, 18 Feb 2014 14:15:22 +0000 (15:15 +0100)]
Update License in OwnCloudAccount.java
masensio [Tue, 18 Feb 2014 10:36:06 +0000 (11:36 +0100)]
OC-2765: App crashes when loging in servers without the patch
projects / pub / Android / ownCloud.git / log