Commit graph

1789 commits

Author SHA1 Message Date
masensio
d326d100ed Revert "Prevent that full synchronization process browses deeper when already knows no change exists under the current folder"
This reverts commit dabcf4dce4.
2014-03-19 17:00:27 +01:00
masensio
0d2c764638 Merge branch 'develop' into remove_refresh_of_shares_in_full_sync 2014-03-18 14:43:34 +01:00
masensio
b124167f50 Merge pull request #395 from dontcallmedom/master
allow multi-line checkbox for preferences with long titles
2014-03-18 14:28:17 +01:00
Mr. Jenkins
ee28694a31 [tx-robot] updated from transifex 2014-03-18 01:14:30 -04:00
David A. Velasco
d150299b1c Updated reference to ownCloud library with reduced logs in operations in shares 2014-03-17 13:15:18 +01:00
David A. Velasco
dabcf4dce4 Prevent that full synchronization process browses deeper when already knows no change exists under the current folder 2014-03-17 13:02:36 +01:00
David A. Velasco
5d53f3c0ba Recursive refresh of folders in full synchronization does not retrieve information about shares 2014-03-17 12:28:54 +01:00
Mr. Jenkins
1c5754ef51 [tx-robot] updated from transifex 2014-03-15 01:18:34 -04:00
Mr. Jenkins
c7eb56b0f0 [tx-robot] updated from transifex 2014-03-14 01:14:51 -04:00
David A. Velasco
7d29132af1 Merge pull request #351 from owncloud/introduce-travis-ci
Starting off with travis-ci integration based on https://github.com/emba...
2014-03-13 11:57:50 +01:00
Thomas Müller
ca6b92cba1 API14 was missing - don't start the emulator for now 2014-03-13 11:29:18 +01:00
Thomas Müller
42cfc93469 move setup_env.sh to before_install 2014-03-13 11:25:47 +01:00
Thomas Müller
f38d4baf33 trying to avoid maven call 2014-03-13 11:22:58 +01:00
Thomas Müller
6b1cab8b28 trying to avoid maven call 2014-03-13 11:06:32 +01:00
Thomas Müller
c0b85157a9 Merge branch 'develop' into introduce-travis-ci 2014-03-13 11:01:19 +01:00
Thomas Müller
2e03bef227 Update required APIs 2014-03-13 11:00:51 +01:00
masensio
b231951585 Update library reference 2014-03-13 08:58:21 +01:00
Mr. Jenkins
7f40c50f6a [tx-robot] updated from transifex 2014-03-13 01:14:57 -04:00
masensio
68271bbf82 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
2014-03-12 11:36:25 +01:00
masensio
834c98644b Remove some import warnings 2014-03-12 10:53:32 +01:00
David A. Velasco
5338b93604 Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it 2014-03-12 10:32:05 +01:00
masensio
41efad3804 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-12 08:44:56 +01:00
Mr. Jenkins
a4362b2535 [tx-robot] updated from transifex 2014-03-12 01:20:34 -04:00
David A. Velasco
a5fc7533aa Merge pull request #436 from owncloud/add_fail_getUserName_error_message
OC-3242: Add new error message for fail in GetUserName
2014-03-11 14:45:47 +01:00
masensio
207a52f422 OC-3242: Add new error message for fail in GetUserName. No changes in library reference 2014-03-11 14:43:48 +01:00
masensio
660f97baab Revert "OC-3242: Add new error message for fail in GetUserName"
This reverts commit 564bbf7bb8.
2014-03-11 14:40:38 +01:00
masensio
564bbf7bb8 OC-3242: Add new error message for fail in GetUserName 2014-03-11 13:56:41 +01:00
masensio
2ca8f56962 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 ...
2014-03-11 11:52:54 +01:00
David A. Velasco
8c6f415ed4 Ssl-error dialogs joint in a single one that uses different adapters to update its view depending on the classes providing the information 2014-03-11 11:39:19 +01:00
masensio
65d590b8e7 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-11 10:54:10 +01:00
masensio
84c6fc36c3 Merge pull request #432 from owncloud/fix_headers_of_OCS_requests
Updated library reference to get fix of headers in OCS requests
2014-03-11 10:44:57 +01:00
Mr. Jenkins
340fd98c0c [tx-robot] updated from transifex 2014-03-11 01:14:12 -04:00
masensio
101cbbe492 Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-10 11:08:42 +01:00
masensio
45bc02fbe5 OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient 2014-03-10 10:53:11 +01:00
David A. Velasco
07a6e079ca Updated library reference to get fix of headers in OCS requests 2014-03-10 10:38:50 +01:00
Mr. Jenkins
6695b9442e [tx-robot] updated from transifex 2014-03-09 01:14:15 -05:00
Mr. Jenkins
cf91037016 [tx-robot] updated from transifex 2014-03-08 01:14:22 -05:00
masensio
9cac3b60a5 Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview 2014-03-07 15:11:59 +01:00
David A. Velasco
e3be24b472 Fix buttons out of screen in SSL warning dialogs for small screens in landspace 2014-03-07 14:54:04 +01:00
masensio
6944503874 OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one 2014-03-07 14:48:42 +01:00
David A. Velasco
a2be11ad54 Improved view of certificate details for SSL dialog based on SslCertificate 2014-03-07 14:39:30 +01:00
David A. Velasco
6bab28424a Added new dialog for SSL errors showing information saved in SslCertificate 2014-03-07 13:44:13 +01:00
David A. Velasco
30ac4cc870 Merge pull request #420 from owncloud/send_file_pr311_with_develop
'Send file to other apps' optimized
2014-03-07 12:42:31 +01:00
masensio
348c24b7ed Merge branch 'develop' into check_server_certificates_in_SSO_webview 2014-03-07 09:42:23 +01:00
masensio
b9e9e06052 Update library reference 2014-03-07 09:42:04 +01:00
masensio
517bde6aae OC-3196: Rewrite according to comments in PR#420 2014-03-07 09:38:42 +01:00
masensio
c86d3cedec Merge branch 'develop' into send_file_pr311_with_develop 2014-03-07 08:53:24 +01:00
Mr. Jenkins
62e62bb062 [tx-robot] updated from transifex 2014-03-07 01:14:59 -05:00
masensio
8e1a2573b9 OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly 2014-03-06 18:26:35 +01:00
David A. Velasco
ebcc9b98e3 Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange 2014-03-06 16:29:21 +01:00