David A. Velasco
|
f5a9c9600e
|
Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop
Allow multiline preferences, not just checkboxes
|
2014-03-19 16:59:24 +01:00 |
|
David A. Velasco
|
68482e5f66
|
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
|
2014-03-19 16:58:10 +01:00 |
|
Mr. Jenkins
|
d3980d480f
|
[tx-robot] updated from transifex
|
2014-03-19 01:14:34 -04: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 |
|
masensio
|
6e86dfb001
|
OC-3376: 'manage account' field is multiline, in preferences
|
2014-03-18 13:36:16 +01:00 |
|
Mr. Jenkins
|
ee28694a31
|
[tx-robot] updated from transifex
|
2014-03-18 01:14:30 -04:00 |
|
masensio
|
7c19578421
|
OC-3354: (Fix bug) In the pincode field, it the field doesn't fit, suspension points doesn't appear
|
2014-03-17 14:04:18 +01:00 |
|
masensio
|
9284d44907
|
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
|
2014-03-17 13:44:32 +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 |
|
masensio
|
2ab9496b6e
|
Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
|
2014-03-13 10:39:22 +01:00 |
|
Mr. Jenkins
|
7f40c50f6a
|
[tx-robot] updated from transifex
|
2014-03-13 01:14:57 -04: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 |
|
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
|
65d590b8e7
|
Merge branch 'develop' into check_server_certificates_in_SSO_webview
|
2014-03-11 10:54:10 +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 |
|
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 |
|
masensio
|
348c24b7ed
|
Merge branch 'develop' into check_server_certificates_in_SSO_webview
|
2014-03-07 09:42:23 +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 |
|
Mr. Jenkins
|
444ec398ba
|
[tx-robot] updated from transifex
|
2014-03-06 01:14:55 -05:00 |
|
Mr. Jenkins
|
6d8cb3f5e5
|
[tx-robot] updated from transifex
|
2014-03-05 01:14:55 -05:00 |
|
masensio
|
56853acff0
|
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 df4d0355f2 .
|
2014-03-04 13:28:07 +01:00 |
|
masensio
|
df4d0355f2
|
OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file
|
2014-03-04 11:58:30 +01:00 |
|
masensio
|
c492555b1b
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-03-03 08:46:26 +01:00 |
|
Mr. Jenkins
|
410e4ac373
|
[tx-robot] updated from transifex
|
2014-03-02 01:14:29 -05:00 |
|
Mr. Jenkins
|
fc0eea1d59
|
[tx-robot] updated from transifex
|
2014-03-01 01:14:31 -05:00 |
|
masensio
|
32ee961d02
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-28 08:30:54 +01:00 |
|
Mr. Jenkins
|
2805dc76d6
|
[tx-robot] updated from transifex
|
2014-02-28 01:14:30 -05:00 |
|
masensio
|
ac836eddb7
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-27 08:40:17 +01:00 |
|
Mr. Jenkins
|
0641afc93d
|
[tx-robot] updated from transifex
|
2014-02-27 01:14:38 -05:00 |
|
masensio
|
54d99ee9f6
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-26 10:15:37 +01:00 |
|
Mr. Jenkins
|
1948d435d7
|
[tx-robot] updated from transifex
|
2014-02-26 01:14:35 -05:00 |
|
masensio
|
e183acd650
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-25 11:12:48 +01:00 |
|
Mr. Jenkins
|
e8cb4a594e
|
[tx-robot] updated from transifex
|
2014-02-25 01:14:46 -05:00 |
|
masensio
|
af1f880b27
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-24 13:33:23 +01:00 |
|
masensio
|
271078a403
|
Merge branch 'master' into develop
|
2014-02-24 13:16:57 +01:00 |
|