masensio 432d696432 Merge branch 'develop' into regular_authentication_in_saml_server		2014-03-19 17:57:56 +01:00
..
activity	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
adapter	Remove some import warnings	2014-03-12 10:53:32 +01:00
dialog	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
fragment	OC-3196: Rewrite according to comments in PR#420	2014-03-07 09:38:42 +01:00
preview	Merge branch 'develop' into check_server_certificates_in_SSO_webview	2014-03-10 11:08:42 +01:00
ActionItem.java	Update packageName	2013-10-29 14:10:42 +01:00
CheckBoxPreferenceWithLongTitle.java	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
CustomPopup.java	Update packageName	2013-10-29 14:10:42 +01:00
ExtendedListView.java	Update packageName	2013-10-29 14:10:42 +01:00
PreferenceMultiline.java	OC-3376: 'manage account' field is multiline, in preferences	2014-03-18 13:36:16 +01:00
QuickAction.java	Update packageName	2013-10-29 14:10:42 +01:00