4360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Maria Asensio	4a11470630	Merge pull request #1200 from owncloud/fix_1192_date_time ... fix for #1192	2015-10-30 10:38:14 +01:00
Jenkins for ownCloud	720c49136a	[tx-robot] updated from transifex	2015-10-30 01:13:47 -04:00
LukeOwncloud	9d4ce6becd	MC: Updated comment only ... Comment did not reflect last commit change.	2015-10-29 21:03:32 +01:00
David A. Velasco	2b6e05f3d2	Merge pull request #1105 from owncloud/fixLegacyTravis ... Switch from Travis legacy infrastructure to container-based	2015-10-29 19:03:41 +01:00
masensio	3444d61be8	Detect conflict when local and server version are changed	2015-10-29 17:13:24 +01:00
Andy Scherzinger	448124cc7e	return standard date string as fallback	2015-10-29 10:24:15 +01:00
Jenkins for ownCloud	00c6d8bffe	[tx-robot] updated from transifex	2015-10-29 01:13:42 -04:00
masensio	bcfa07f565	Fix Select Local Version or Keep Both behaviour when solving file coflict	2015-10-27 14:32:42 +01:00
masensio	b9ef747a0b	Merge branch 'master' into sync_full_folder ... Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java	2015-10-27 08:52:17 +01:00
Jenkins for ownCloud	3918ec18a8	[tx-robot] updated from transifex	2015-10-27 01:13:47 -04:00
Andy Scherzinger	2603a35105	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-26 13:57:04 +01:00
Jenkins for ownCloud	2702951056	[tx-robot] updated from transifex	2015-10-23 01:13:41 -04:00
Andy Scherzinger	5c1e6e59ba	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-22 13:05:06 +02:00
David A. Velasco	08443f90c5	Merge pull request #1177 from owncloud/notification_coloring ... Add ownCloud color to notifications for lollipop	2015-10-22 09:10:10 +02:00
Andy Scherzinger	dffd81e00c	removed primary color usage for textColor of the input fields on the loginscreen	2015-10-21 11:31:58 +02:00
Andy Scherzinger	e61641b39d	center align radio buttons	2015-10-21 11:05:11 +02:00
Jenkins for ownCloud	8269b6dee6	[tx-robot] updated from transifex	2015-10-21 01:13:40 -04:00
Jenkins for ownCloud	1db483d521	[tx-robot] updated from transifex	2015-10-20 01:13:41 -04:00
Andy Scherzinger	d64946f859	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-19 13:00:15 +02:00
Jenkins for ownCloud	d1dfc9958d	[tx-robot] updated from transifex	2015-10-19 01:13:44 -04:00
Jenkins for ownCloud	47e74b6271	[tx-robot] updated from transifex	2015-10-18 01:13:42 -04:00
Jenkins for ownCloud	185b670e5c	[tx-robot] updated from transifex	2015-10-17 01:13:48 -04:00
Andy Scherzinger	e8eda963ae	flipped the if/else for performance optimization	2015-10-16 11:41:26 +02:00
Andy Scherzinger	be83702fd7	Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time	2015-10-16 10:42:02 +02:00
Andy Scherzinger	30720e98a5	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-16 10:41:32 +02:00
Maria Asensio	be3b6a53b9	Merge pull request #1199 from owncloud/display_thumbnails_details_view_PR_1065 ... Display thumbnails details view pr 1065	2015-10-16 09:03:34 +02:00
tobiasKaminsky	960ea3ceac	fixed missing refresh of thumbnail after sync	2015-10-15 16:20:14 +02:00
masensio	8e87cc2bf4	Merge remote-tracking branch 'origin/develop'	2015-10-15 16:17:32 +02:00
masensio	fc40765890	Merge branch 'zmatsuo-detailThumbnail' into develop	2015-10-15 16:12:06 +02:00
masensio	1f964a79dd	Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail ... Conflicts: src/com/owncloud/android/ui/fragment/FileDetailFragment.java	2015-10-15 16:10:55 +02:00