Commit graph

1579 commits

Author SHA1 Message Date
Jenkins for ownCloud
bf53dfb3af [tx-robot] updated from transifex 2015-11-06 01:14:02 -05:00
Maria Asensio
7e96305668 Merge pull request #1252 from owncloud/share_with_users
Share with users & groups
2015-11-05 13:19:24 +01:00
David A. Velasco
b985935f22 Removed spurious file 2015-11-05 10:24:38 +01:00
Jenkins for ownCloud
94b21ef5d9 [tx-robot] updated from transifex 2015-11-05 01:13:44 -05:00
Jenkins for ownCloud
62287458b8 [tx-robot] updated from transifex 2015-11-04 01:13:47 -05:00
Jenkins for ownCloud
653a812684 [tx-robot] updated from transifex 2015-11-03 01:13:49 -05:00
Jenkins for ownCloud
2f237fb0cc [tx-robot] updated from transifex 2015-11-02 01:13:44 -05:00
Jenkins for ownCloud
f817e49515 [tx-robot] updated from transifex 2015-11-01 01:13:47 -04:00
Jenkins for ownCloud
bba2964726 [tx-robot] updated from transifex 2015-10-31 01:13:54 -04:00
masensio
f1bd33ce00 Fix: Having the device in landscape current shared users are not shown. Redimension 'Share with' dialog 2015-10-30 16:53:06 +01:00
masensio
d1294ca584 Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group 2015-10-30 16:50:49 +01:00
masensio
f8548b49f1 Delete search_user_item.xml 2015-10-30 16:48:33 +01:00
masensio
671fef617b Show users/groups in Search Fragment list 2015-10-30 16:48:31 +01:00
masensio
b3dc5f477c Show 'Add Users or Groups' button properly 2015-10-30 16:47:31 +01:00
David A. Velasco
33a9d1f447 Get rid of dependency on Context in CreateShareOperation 2015-10-30 16:41:59 +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
305536f8c2 Users and groups retrieved from server to fill search suggestions 2015-10-30 16:31:08 +01:00
masensio
1fbc44b574 Add new string for share_groups_indicator 2015-10-30 16:28:41 +01:00
masensio
fff362d103 Add unshare with user option to share with view 2015-10-30 16:28:37 +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
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
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
8e3d7bdc8f Create the layout to share with a user 2015-10-30 15:10:42 +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
Jenkins for ownCloud
720c49136a [tx-robot] updated from transifex 2015-10-30 01:13:47 -04:00
Jenkins for ownCloud
00c6d8bffe [tx-robot] updated from transifex 2015-10-29 01:13:42 -04: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
Jenkins for ownCloud
2702951056 [tx-robot] updated from transifex 2015-10-23 01:13:41 -04: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
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
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
c56b3568c5 Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-14 10:34:48 +02:00
Jenkins for ownCloud
c47b0ab77a [tx-robot] updated from transifex 2015-10-14 01:13:38 -04:00
Jenkins for ownCloud
28198ee983 [tx-robot] updated from transifex 2015-10-13 01:13:37 -04:00
Jenkins for ownCloud
a317483f44 [tx-robot] updated from transifex 2015-10-12 01:13:37 -04:00
Jenkins for ownCloud
42f38fe876 [tx-robot] updated from transifex 2015-10-11 01:13:36 -04:00