3164 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	64435cab25	Revert "Enable session support for all authentication methods in the app" ... This reverts commit 02372fde24.	2015-02-09 10:35:25 +01:00
David A. Velasco	170c041505	Revert "Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password" ... This reverts commit 3605bd70da.	2015-02-09 10:34:39 +01:00
Jenkins for ownCloud	62c54ac2ad	[tx-robot] updated from transifex	2015-02-09 01:13:30 -05:00
Jenkins for ownCloud	7d8cbde64f	[tx-robot] updated from transifex	2015-02-08 01:13:31 -05:00
Jenkins for ownCloud	fa0b91d7fb	[tx-robot] updated from transifex	2015-02-07 01:13:34 -05:00
David A. Velasco	f7c2909a7e	Updated link to library with relaxed timeouts	2015-02-06 14:51:48 +01:00
masensio	3605bd70da	Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password	2015-02-06 13:05:48 +01:00
Jenkins for ownCloud	b047882001	[tx-robot] updated from transifex	2015-02-06 01:13:31 -05:00
David A. Velasco	f728c502c5	Fixed some log levels	2015-02-05 16:34:15 +01:00
David A. Velasco	55c9c3a6c6	Updated services clean-up; Android 4.3 and 4.4 keep a huge number of threads in other case	2015-02-05 16:28:37 +01:00
masensio	3ff42b6220	Cancel the transfers of an account when the account is deleted: Cancel current upload	2015-02-05 09:40:09 +01:00
Jenkins for ownCloud	f8c91b0458	[tx-robot] updated from transifex	2015-02-05 01:13:34 -05:00
masensio	beb7d352f9	Cancel the transfers of an account when the account is deleted, part 1	2015-02-04 18:38:11 +01:00
Jenkins for ownCloud	8bc75d54b4	[tx-robot] updated from transifex	2015-02-04 01:14:14 -05:00
David A. Velasco	936d8466c6	Updated with fixes in Spanish translation	2015-02-03 14:01:59 +01:00
David A. Velasco	1726a9352a	Updated translations after new format string for subject in sharing e-mail	2015-02-03 13:37:22 +01:00
David A. Velasco	28e4b35595	Quotes updated in subject message for shared link, better format string	2015-02-03 13:17:14 +01:00
David A. Velasco	02372fde24	Enable session support for all authentication methods in the app	2015-02-03 13:04:19 +01:00
David A. Velasco	1ee808f3a2	Updated version number to 1.7.0	2015-02-03 12:52:17 +01:00
David A. Velasco	5116bd99e2	Merge branch 'master' into release-1.7.0	2015-02-03 12:46:23 +01:00
masensio	b64fd4cc5b	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-03 11:25:09 +01:00
David A. Velasco	5169261b66	Merge pull request #731 from owncloud/imageGrid ... Automatic grid more in folders with more than 50% of image files.	2015-02-03 11:04:32 +01:00
David A. Velasco	e4e50d44c4	Corrections from my own comments	2015-02-03 09:52:22 +01:00
masensio	aa7b7af721	Cancel transfers of an account when it detects that the account doesn't exist	2015-02-02 14:51:46 +01:00
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +01:00
masensio	ab8bf56a15	Detect if the account exists before the tranfer starts	2015-02-02 13:23:33 +01:00
David A. Velasco	7f23fa5a77	Merge pull request #844 from owncloud/delete_local_files ... Removal of media files is notified to MediaProvider directly - MediaScan API does not work properly in Android 4.x	2015-02-02 09:39:40 +01:00
masensio	c6124920d1	Changes from comments in PR 844	2015-02-02 09:34:43 +01:00
Jenkins for ownCloud	8bf624ff8f	[tx-robot] updated from transifex	2015-02-01 01:13:30 -05:00
Jenkins for ownCloud	2210ce961a	[tx-robot] updated from transifex	2015-01-31 01:13:34 -05:00
masensio	42b5a1e28f	Update some icons	2015-01-30 14:37:16 +01:00
masensio	0dfe4d27c7	Merge pull request #869 from owncloud/hotfix__fixed_start_of_SAML_dialog ... Hotfix - fixed start of SAML dialog	2015-01-30 13:17:06 +01:00
David A. Velasco	2f4e2808d2	Internal version bump	2015-01-30 11:49:31 +01:00
David A. Velasco	7ddb745bef	Clean-up excess of logs in SAML dialog	2015-01-30 11:34:44 +01:00
David A. Velasco	54dc3efc18	Load SAML log-in dialog from the original URL so that cookies returned with the redirection are not lost	2015-01-30 11:34:43 +01:00
masensio	700318fec0	Update some icons	2015-01-30 11:00:14 +01:00
Jenkins for ownCloud	9d491f71ed	[tx-robot] updated from transifex	2015-01-30 01:13:31 -05:00
masensio	4354329b46	Fix bug: When renaming a folder, in the photos apps both folder are shown	2015-01-29 11:22:47 +01:00
Jenkins for ownCloud	16b36d0418	[tx-robot] updated from transifex	2015-01-29 01:13:38 -05:00
masensio	d19128e770	Merge branch 'develop' into delete_local_files	2015-01-28 10:37:08 +01:00
David A. Velasco	bcef916292	Removed commented code	2015-01-28 09:40:59 +01:00
masensio	d3b0747dde	Merge pull request #866 from owncloud/download_folder ... Download a folder	2015-01-28 09:31:25 +01:00
masensio	0b8f3db914	Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon	2015-01-28 08:59:57 +01:00
Jenkins for ownCloud	da67575522	[tx-robot] updated from transifex	2015-01-28 01:13:45 -05:00
Carla Schroder	b7664364d7	Update version number	2015-01-27 16:35:45 -08:00
Daniel Molkentin	0bb94f3c29	user manual: Fix incorrect line wrapping in config file	2015-01-27 23:41:33 +01:00
Daniel Molkentin	67ea45aa9f	Add means to build user manual via make	2015-01-27 23:40:53 +01:00
Daniel Molkentin	a9d12f3b1c	manual: omit ocdoc/* during doc generation	2015-01-27 23:35:45 +01:00
Daniel Molkentin	931bc1e62c	manual: omit ocdoc/* during doc generation	2015-01-27 23:29:49 +01:00
Carla Schroder	7d1839ee96	add submodule to user manual	2015-01-27 12:11:26 -08:00