mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-11 08:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
4284 commits 224 branches 1583 tags 621 MiB
Commit graph

4284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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