4086 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	f8548b49f1	Delete search_user_item.xml	2015-10-30 16:48:33 +01:00
masensio	f65152c5fb	Refactor saveSharesInFolder in FileDataStorageManager. Set the Content Values using prepareInsertShares method	2015-10-30 16:48:32 +01:00
masensio	671fef617b	Show users/groups in Search Fragment list	2015-10-30 16:48:31 +01:00
masensio	fdcf0ebbc8	Fix saveSharesDB, duplicated rows	2015-10-30 16:47:33 +01:00
masensio	b3dc5f477c	Show 'Add Users or Groups' button properly	2015-10-30 16:47:31 +01:00
David A. Velasco	b811eefe95	Fixed build after rebasing	2015-10-30 16:47:30 +01:00
David A. Velasco	4d13b49631	Fixes from CR	2015-10-30 16:47:28 +01:00
David A. Velasco	9df957d548	Share the file with a user or group when selected on the list of suggestions	2015-10-30 16:47:27 +01:00
David A. Velasco	5e0f46cc2e	Added operation to create shares with a sharee, separated from operation to create shares via link	2015-10-30 16:46:54 +01:00
David A. Velasco	33a9d1f447	Get rid of dependency on Context in CreateShareOperation	2015-10-30 16:41:59 +01:00
masensio	e81bff7679	Extra commit to complement: Fill in Users/Groups List of a 'share with' from server data	2015-10-30 16:41:58 +01:00
masensio	c49cc06d3d	Get users/group from Server, to fill in 'Share with' list	2015-10-30 16:41:57 +01:00
masensio	fcdef568ea	Remove share_group_indicator string	2015-10-30 16:39:23 +01:00
masensio	ceffbc4aa8	Remove unshare with users/groups option from the menu	2015-10-30 16:39:21 +01:00
David A. Velasco	2d854bc5a9	Prevent that arbitrary text is queried instead of selecting a user / group of the suggestions list	2015-10-30 16:39:20 +01:00
masensio	9cdaddefa3	Use UnshareOperation instead an AsyncTask, for unshare with	2015-10-30 16:39:19 +01:00
masensio	a00b272903	Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOperation --> UnshareOperation	2015-10-30 16:37:36 +01:00
David A. Velasco	043d2128ad	Removed option to refine suggestions in edit field	2015-10-30 16:37:35 +01:00
David A. Velasco	dea69d5fd7	Grant that any suggestion may be selected without software keyboard overlapping	2015-10-30 16:37:34 +01:00
masensio	de93a66763	Change ShareActivity type, now it is a FileActivity	2015-10-30 16:37:33 +01:00
David A. Velasco	1fae1f1b7f	Removed redundant ArrayList creation	2015-10-30 16:34:48 +01:00
tobiasKaminsky	fc0dfecf1a	fixed travis bug	2015-10-30 16:32:57 +01:00
masensio	1bdd672295	Add unshare with users/groups, from Share wiht view	2015-10-30 16:31:10 +01:00
David A. Velasco	305536f8c2	Users and groups retrieved from server to fill search suggestions	2015-10-30 16:31:08 +01:00
masensio	e0813be81e	Clean code in ShareFileFragment	2015-10-30 16:28:42 +01:00
masensio	1fbc44b574	Add new string for share_groups_indicator	2015-10-30 16:28:41 +01:00
masensio	3de67c45e4	Animate unshare button	2015-10-30 16:28:39 +01:00
masensio	fff362d103	Add unshare with user option to share with view	2015-10-30 16:28:37 +01:00
masensio	55dc0da79a	Get shares from Database, fix in insert shares in DB	2015-10-30 16:28:36 +01:00
David A. Velasco	e3d509a451	Complete search widget to send search requests to parent activity	2015-10-30 16:28:35 +01:00
masensio	72987c296f	Get shares from Database (WIP)	2015-10-30 16:26:28 +01:00
masensio	20b0ec8977	Show users/groups in share with view, getting the data from the server	2015-10-30 16:26:26 +01:00
masensio	88eca70dbf	fix Travis	2015-10-30 16:25:55 +01:00
masensio	00a221ea8f	Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project	2015-10-30 16:25:54 +01:00
David A. Velasco	0db4fc9b17	Sync user and group shares into database	2015-10-30 16:25:52 +01:00
masensio	905b68b4ec	Show the 'search' layout in phone and tablet	2015-10-30 15:23:03 +01:00
David A. Velasco	bc5687b74a	Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)	2015-10-30 15:23:00 +01:00
masensio	2855a81cf0	Create the layout for searching users/groups	2015-10-30 15:22:58 +01:00
masensio	263152a067	Add Get Groups operation	2015-10-30 15:22:57 +01:00
masensio	5a14928e1e	Add Get Users from Server Operation	2015-10-30 15:22:36 +01:00
masensio	c6c5b732c7	Add get list of users in the library	2015-10-30 15:22:12 +01:00
masensio	f28faf0c26	Show the layout to hsare with user in phone and tablet	2015-10-30 15:21:48 +01:00
masensio	c288f91d87	Add new attribute to OCFile to know if this file is shared with users/groups	2015-10-30 15:21:45 +01:00
masensio	8e3d7bdc8f	Create the layout to share with a user	2015-10-30 15:10:42 +01:00
masensio	e50bc09321	Add new attribute to OCFile to know if this file is shared with users/groups	2015-10-30 15:10:41 +01:00
masensio	a94c176c75	Show share with users option if the server supports search users function	2015-10-30 15:08:14 +01:00
masensio	3a527a8fe4	Add 'Share with users/groups' to long press menu	2015-10-30 15:04:34 +01:00
Maria Asensio	eaa0612bfa	Merge pull request #1109 from owncloud/sync_full_folder ... Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder	2015-10-30 14:14:52 +01:00
masensio	9b95d53887	Update library reference, sync_full_folder	2015-10-30 14:11:01 +01:00
David A. Velasco	09a349346c	Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version ... Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog	2015-10-30 13:59:02 +01:00