269 commits

Author	SHA1	Message	Date
masensio	5f4b46015f	Update string: 'New folder' instead of 'Create directory'	2014-03-31 10:32:49 +02:00
David A. Velasco	d2ff7d4755	Merge branch 'develop' into release-1.5.5	2014-03-24 10:23:05 +01:00
David A. Velasco	a3bf6883fc	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-21 11:02:36 +01:00
masensio	c6f0847866	Changes from comments in PR#443	2014-03-20 16:15:59 +01:00
David A. Velasco	8a9f504138	Fixed contrast of text in notifications for Android 2.x and 3.x	2014-03-20 12:56:44 +01:00
masensio	b0cfec7a00	Add auth_unsupported_basic_auth string	2014-03-20 09:08:02 +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	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
masensio	834c98644b	Remove some import warnings	2014-03-12 10:53:32 +01:00
masensio	41efad3804	Merge branch 'develop' into check_server_certificates_in_SSO_webview	2014-03-12 08:44:56 +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	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
masensio	6944503874	OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one	2014-03-07 14:48:42 +01: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
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	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
David A. Velasco	42fc189367	Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends	2014-02-19 18:00:49 +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
David A. Velasco	0f99af779e	Merge branch 'share_link__unshare_file' into release-1.5.4	2014-02-18 11:16:22 +01:00
masensio	6cf78042b0	OC-2968: Filter out ownCloud from the list of apps able to receive the file	2014-02-17 13:54:02 +01:00
masensio	85db28795d	OC-2982: Update Settings	2014-02-17 13:11:28 +01:00
masensio	a5db2c2f68	HotFix to add Send File option, after PR#311	2014-02-17 09:16:29 +01:00
masensio	99686805e1	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-17 08:45:52 +01:00
masensio	7ead9a0fe4	Merge pull request #311 from tobiasKaminsky/develop ... Added support for sharing files:	2014-02-14 14:59:24 +01:00
masensio	42834b213a	OC-2966: Change name of the action from 'Share' to 'Send'	2014-02-14 12:38:38 +01:00
masensio	065a9c0046	OC-2966: Change name of the action from 'Share' to 'Send'	2014-02-14 12:13:58 +01:00
masensio	296df1bb65	Merge branch 'pr/311' into pull_request_311_with_develop	2014-02-14 10:59:26 +01:00
masensio	eb7bbebc08	OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown	2014-02-07 12:54:52 +01:00
masensio	3662fda2de	Merge pull request #388 from owncloud/setup_additions ... Setup additions	2014-02-06 18:42:33 +01:00
David A. Velasco	4db5295f56	Merge branch 'share_link__new_share' into setup_additions	2014-02-06 13:58:41 +01:00
David A. Velasco	a9bf3f334d	Some high-priority strings needing translation	2014-02-06 13:16:16 +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	e2af381b88	OC-2823: Show toast message when CreateShareOperation failes	2014-02-05 09:01:46 +01:00
David A. Velasco	77d22d5a31	Added filtered chooser dialog for activities that can receive a link	2014-02-03 14:24:28 +01:00
David A. Velasco	59513cd56d	Merge branch 'share_link__new_share' into share_link__new_share_menu	2014-02-03 09:46:26 +01:00
masensio	261d8a5167	OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server	2014-02-03 09:26:36 +01:00
masensio	0f7d8d8453	OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected	2014-02-01 19:38:36 +01:00
David A. Velasco	fbe5f83aee	Adding custom dialog to let the user choose what app should received a shared link [WIP]	2014-01-31 15:38:53 +01:00
David A. Velasco	ef0df64070	Added entry menu to share files, whereever actions on files can be triggered	2014-01-22 13:31:52 +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	81e906bc34	Updated hint in URL input field	2013-12-10 13:53:21 +01:00
tobiasKaminsky	0d01bf30c3	Added support for sharing files: ... - Long press on file list - Add option on ImageViewer	2013-11-24 10:00:04 +01:00
David A. Velasco	e1245bbda7	Merge branch 'develop' into refactor_remote_operation_to_create_folder	2013-11-18 14:10:16 +01:00
David A. Velasco	73849d822d	Add check of characters in file name before starting rename/createFolder operations	2013-11-18 14:10:11 +01:00