David A. Velasco
68482e5f66
Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
2014-03-19 16:58:10 +01:00
masensio
a9c0d1c62b
Update auth_fail_get_user_name string
2014-03-19 10:31:18 +01:00
masensio
71e049394e
OC-3390: Shows message about 'not support authentication' under server address
2014-03-19 10:07:56 +01:00
masensio
3e108163bc
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-19 08:55:37 +01:00
Mr. Jenkins
d3980d480f
[tx-robot] updated from transifex
2014-03-19 01:14:34 -04:00
masensio
705bee08fa
OC-3390: Message is shown in the login screen instead of an alert message: Change the alert dialog by an error message under server address
2014-03-18 15:13:50 +01:00
masensio
407fb8f912
Update versionName and versionCode in AndroidManifest.xml (oc and workaround))
2014-03-18 14:54:00 +01:00
masensio
1fff2077a0
OC-3311: Update background color of image preview to black
2014-03-18 14:52:05 +01:00
masensio
0d2c764638
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-18 14:43:34 +01:00
masensio
c80357f750
OC-3386:(Fix bug) An alert saying 'trying to login' is shown before clicking the to connect
2014-03-18 14:41:25 +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
masensio
3806916a48
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-18 14:21:26 +01:00
masensio
d10c10532f
OC-3381: (Fix bug) In preferences, the 'instant upload via WIFI' field is multiline but only use two lines instead of three
2014-03-18 13:40:28 +01:00
masensio
6e86dfb001
OC-3376: 'manage account' field is multiline, in preferences
2014-03-18 13:36:16 +01:00
masensio
d9da1e9ba3
Merge branch 'develop' into share_link__reuse_link_shared_in_server
2014-03-18 12:52:24 +01:00
masensio
a043bcd8de
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
2014-03-18 12:51:15 +01:00
Mr. Jenkins
ee28694a31
[tx-robot] updated from transifex
2014-03-18 01:14:30 -04:00
Philippe MARASSE
28ef4217e5
updated menu from github comments
2014-03-17 22:15:41 +01: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
masensio
92c9049091
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-17 13:40:11 +01:00
masensio
d01e065586
OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method
2014-03-17 13:39:03 +01: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
masensio
eda6ddd98f
OC-3260: Detect authentication method
2014-03-17 10:29:24 +01:00
Mr. Jenkins
1c5754ef51
[tx-robot] updated from transifex
2014-03-15 01:18:34 -04:00
David A. Velasco
7ab8ee7d4a
Progress bar in notifications is hidden when download/upload finishes
2014-03-14 14:29:25 +01:00
David A. Velasco
35bf347759
Grant that notifications of finished downloads can be removed from notification are without clicking on
2014-03-14 14:18:52 +01:00
Mr. Jenkins
c7eb56b0f0
[tx-robot] updated from transifex
2014-03-14 01:14:51 -04:00
masensio
4299d1e650
Correction in license of CheckBoxPreferenceWithLongTitle
2014-03-13 15:59:40 +01:00
masensio
9b2e4a6063
Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
2014-03-13 15:49:17 +01: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
2ab9496b6e
Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
2014-03-13 10:39:22 +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
Thomas Keller
5eccd08bc7
Notification improvements:
...
- use NotificationCompat.Builder from the support library and remove the custom progressbar layout; this will give platform users the expected look and feel of a notificati
- remove OCNotificationManager (it contained the old layout references, but was unused)
- add new notification icons that follow the Android style guidelines (http://developer.android.com/design/style/iconography.html#notification )
2014-03-12 00:08:51 +01: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
