40 commits

Author	SHA1	Message	Date
masensio	af1f880b27	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-24 13:33:23 +01:00
masensio	8db07c67b6	OC-3016: Add option 'send_files_to_other_apps' with default value 'on'	2014-02-19 10:33:27 +01:00
masensio	85db28795d	OC-2982: Update Settings	2014-02-17 13:11:28 +01:00
David A. Velasco	08cec8f7a2	Allow setup of display name in the action bar for root folder	2014-02-05 19:10:08 +01:00
masensio	ae61e2d7d4	OC-2587:Add new string to setup.xml: share_api_link	2014-01-17 14:35:00 +01:00
David A. Velasco	cc39a76a90	Reviewed integration with sychronization framework to fix problems in Android 4.4	2013-11-11 10:08:16 +01:00
David A. Velasco	a0efedc99d	Merge branch 'develop' into setup_buttons	2013-11-06 11:43:22 +01:00
David A. Velasco	850a3dd09a	Let setting up the visibility of the link for new users in the login view	2013-11-06 11:30:15 +01:00
masensio	39688fe30f	Remove custom_buttons option from setup.xml. Review account_setup and pincodelock	2013-10-31 16:59:38 +01:00
masensio	19e065538b	Update setup	2013-10-30 10:24:15 +01:00
masensio	e86d7cd9b4	Update setup and strings	2013-10-29 14:36:09 +01:00
masensio	6ace8ab1c1	Update packageName	2013-10-29 14:10:42 +01:00
David A. Velasco	a103eb3f96	Included in setup.xml the background color for logo in login view	2013-10-29 11:12:57 +01:00
masensio	b3752166e4	OC-1833: New color button_text_color in setup.xml	2013-10-28 13:38:15 +01:00
masensio	6e21c84026	Customize buttons	2013-10-25 15:06:10 +02:00
masensio	de9b09fd3b	Update colors	2013-10-25 13:55:15 +02:00
masensio	3889bea7c9	Update Social Links	2013-10-25 11:09:21 +02:00
masensio	21f491aab4	Update strings	2013-10-25 10:18:34 +02:00
David A. Velasco	56645d9640	Removed urls.xml and moved last URLs to setup.xml	2013-10-25 09:44:26 +02:00
masensio	7656cff3bb	Update package name	2013-10-24 18:12:00 +02:00
masensio	75d58e44a6	Update data_folder value	2013-10-22 13:24:08 +02:00
masensio	fc5608de76	Merge branch 'setup_colors' into setup_app_name	2013-10-18 15:00:16 +02:00
masensio	a1f8d76188	OC-1769: Modify background_color and login_background_color works fine	2013-10-18 14:59:42 +02:00
masensio	b66e309dfa	Merge branch 'contact_settings' into setup_app_name ... Conflicts: res/values/setup.xml	2013-10-18 12:42:00 +02:00
masensio	31f6e61f89	Merge branch 'setup_multiaccount' into setup_app_name ... Conflicts: res/values/setup.xml src/com/owncloud/android/authentication/AccountAuthenticator.java	2013-10-18 12:32:22 +02:00
masensio	ea7f8fe491	Merge branch 'setup_colors' into setup_app_name	2013-10-18 12:24:29 +02:00
masensio	7488345470	OC-1663: Replace references to app_name in code	2013-10-17 16:54:43 +02:00
masensio	5b8a5718cf	OC-1662: app_name to setup.xml	2013-10-16 09:37:28 +02:00
masensio	9681b8687e	OC-1656: Disable/enable help-imprint-feedback options	2013-10-16 08:56:41 +02:00
masensio	152ab88d90	OC-1668: Block creation of account from device settings	2013-10-15 11:32:46 +02:00
masensio	9fcc118b8a	0C-1647: Enable/Disable Create Account option	2013-10-14 13:39:22 +02:00
masensio	76ed9aa72e	OC-1646: Adding multiaccount_support property	2013-10-14 12:55:21 +02:00
masensio	1809997dc1	OC-1671: ActionBar Color	2013-10-11 15:14:41 +02:00
masensio	b78eb416a4	OC-1670: owncloud_white --> background_color	2013-10-11 15:08:32 +02:00
masensio	52500fac9a	Set SSO flag to OFF	2013-08-27 14:58:56 +02:00
masensio	b458c92be0	Update server-url	2013-08-14 09:15:47 +02:00
masensio	9dacdbec0b	Move WebView to Dialog	2013-08-13 12:08:46 +02:00
David A. Velasco	5ede3e9909	Improved status messages for authentication through SAML-based federated SSO	2013-08-01 17:44:23 +02:00
David A. Velasco	5a65ff53c2	AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point	2013-07-26 13:05:01 +02:00
David A. Velasco	0713ba613d	Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration	2013-07-25 17:29:52 +02:00