3146 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	06d5cc9477	Add user agent in android project	2015-03-13 14:55:28 +01:00
Jenkins for ownCloud	67ecc0f262	[tx-robot] updated from transifex	2015-03-13 01:13:37 -04:00
Jenkins for ownCloud	311f0bd332	[tx-robot] updated from transifex	2015-03-12 01:13:34 -04:00
Jenkins for ownCloud	3826462073	[tx-robot] updated from transifex	2015-03-11 01:13:43 -04:00
David A. Velasco	d83491f62d	Merge pull request #918 from owncloud/share_password_support ... Fixed sharing when password in enforced in server side.	2015-03-10 14:51:58 +01:00
masensio	a421aaa7d5	Merge remote-tracking branch 'origin/share_password_support' into share_password_support	2015-03-10 14:28:36 +01:00
masensio	01483a38bf	Merge remote-tracking branch 'origin/develop' into share_password_support	2015-03-10 14:27:35 +01:00
masensio	88ff4ff910	Fix bug: Permission error is shown when it shouldn't	2015-03-10 14:27:22 +01:00
purigarcia	24d6782386	Merge branch 'develop' into share_password_support	2015-03-10 10:30:31 +01:00
Jenkins for ownCloud	5f3175229a	[tx-robot] updated from transifex	2015-03-10 01:13:47 -04:00
David A. Velasco	863017d291	Merge pull request #913 from owncloud/update_propfind_for_server_8.1 ... Update reference to library after adapting PROPFIND for next OC server 8.1	2015-03-09 17:48:01 +01:00
David A. Velasco	33f9f9a210	Merge branch 'develop' into update_propfind_for_server_8.1	2015-03-09 15:19:58 +01:00
David A. Velasco	c2cc34e4cf	Update library reference	2015-03-09 15:17:05 +01:00
masensio	40ca3d9b21	Fix bug: After trying to share a file without permission, it's not possible to share a file	2015-03-09 15:16:42 +01:00
masensio	4a47e96bc7	Fix bug: password is shown, when in fact we do not have permission to share	2015-03-09 13:47:52 +01:00
masensio	03b5cb9dd6	When no enter a password, message should be 'You must enter a password'	2015-03-09 11:38:36 +01:00
masensio	1a42f742c0	Changes from comments in PR#55	2015-03-09 11:34:44 +01:00
purigarcia	151c70c443	Merge branch 'develop' into share_password_support	2015-03-09 09:21:38 +01:00
Jenkins for ownCloud	eac3e1ddf1	[tx-robot] updated from transifex	2015-03-09 01:13:33 -04:00
Jenkins for ownCloud	c404060351	[tx-robot] updated from transifex	2015-03-08 01:13:33 -05:00
masensio	6f1fe5ad6d	Process share with password	2015-03-06 12:48:56 +01:00
masensio	82fa95fe43	Merge branch 'develop' into share_password_support	2015-03-06 10:19:06 +01:00
David A. Velasco	eafaf80dd4	Merge pull request #912 from owncloud/review_license ... Reviewed license text in source files.	2015-03-06 09:45:56 +01:00
masensio	9da433bb7b	Changes from comments in PR	2015-03-06 09:07:44 +01:00
masensio	9e55ef9585	Show password dialog	2015-03-05 18:02:40 +01:00
masensio	b08e9e35e6	Create password dialog: SharePasswordDialog.java	2015-03-05 17:54:03 +01:00
masensio	690341af68	Create layout for password	2015-03-05 17:02:40 +01:00
masensio	0bef9fdedb	Update year in license	2015-03-05 13:27:45 +01:00
masensio	3d3046dc26	Add author's line in license	2015-03-05 12:36:30 +01:00
masensio	3083dcc7d7	Update library reference	2015-03-05 10:56:02 +01:00
Jenkins for ownCloud	664ee08a3c	[tx-robot] updated from transifex	2015-03-05 01:13:45 -05:00
Jenkins for ownCloud	a349906e77	[tx-robot] updated from transifex	2015-03-04 01:13:41 -05:00
Jenkins for ownCloud	3cab8a4986	[tx-robot] updated from transifex	2015-03-03 01:13:33 -05:00
Jenkins for ownCloud	3d66b4ccc0	[tx-robot] updated from transifex	2015-03-01 01:13:35 -05:00
Jenkins for ownCloud	0f3af9c0ef	[tx-robot] updated from transifex	2015-02-28 01:13:44 -05:00
Jenkins for ownCloud	c1efe4304b	[tx-robot] updated from transifex	2015-02-27 01:13:37 -05:00
Jenkins for ownCloud	62bbe70290	[tx-robot] updated from transifex	2015-02-26 01:13:46 -05:00
David A. Velasco	b46ac9c649	Merge pull request #886 from owncloud/cancel_transfer_for_deleted_users ... Cancel pending or in-progress downloads and uploads when an account is deleted from the device.	2015-02-25 11:02:02 +01:00
masensio	01fc29c892	Bug fixed: Upload fails	2015-02-25 09:09:41 +01:00
masensio	2abceb0ed5	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-25 08:56:00 +01:00
Jenkins for ownCloud	72bd1c17a5	[tx-robot] updated from transifex	2015-02-25 01:13:42 -05:00
masensio	8d773ef002	Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users	2015-02-24 15:09:54 +01:00
David A. Velasco	4d2b382785	Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space	2015-02-24 15:02:26 +01:00
masensio	2d697473a1	Merge branch 'develop' into cancel_transfer_for_deleted_users	2015-02-24 14:19:41 +01:00
masensio	759b5e3e72	Merge pull request #888 from owncloud/enable_cookies ... Enable cookies	2015-02-24 14:05:54 +01:00
Jenkins for ownCloud	4c964b7dcb	[tx-robot] updated from transifex	2015-02-24 01:13:38 -05:00
David A. Velasco	2be8e301e5	Clean-up and minor refactoring	2015-02-23 13:22:44 +01:00
Jenkins for ownCloud	6a88d7a9f4	[tx-robot] updated from transifex	2015-02-22 01:13:32 -05:00
Jenkins for ownCloud	099b32fc42	[tx-robot] updated from transifex	2015-02-21 01:13:31 -05:00
masensio	83f990e49b	Merge branch 'master' into develop	2015-02-20 13:20:48 +01:00