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 |
|
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
|
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 |
|
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 |
|
Andy Scherzinger
|
ae6194ffee
|
fix for #1192
|
2015-10-15 14:04:56 +02: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 |
|
Jenkins for ownCloud
|
f206eaaeb4
|
[tx-robot] updated from transifex
|
2015-10-10 01:13:37 -04:00 |
|
Andy Scherzinger
|
4b4c323810
|
actual lib reference
|
2015-10-09 15:46:35 +02:00 |
|
Andy Scherzinger
|
a61f862677
|
directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.
|
2015-10-09 15:04:39 +02:00 |
|
Andy Scherzinger
|
5db8c47b8a
|
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
|
2015-10-09 14:45:32 +02:00 |
|
Jenkins for ownCloud
|
f9b7cbd2d5
|
[tx-robot] updated from transifex
|
2015-10-09 01:13:37 -04:00 |
|
Maria Asensio
|
567355eed0
|
Merge pull request #1190 from owncloud/1182_Open_With_Fix
Fix for #1182 on Android 5
|
2015-10-07 11:19:16 +02:00 |
|
Jenkins for ownCloud
|
8ba051f851
|
[tx-robot] updated from transifex
|
2015-10-07 01:13:37 -04:00 |
|
Maria Asensio
|
72e588b6b7
|
Merge pull request #1117 from owncloud/sortAccents
Sort accents
|
2015-10-06 14:51:14 +02:00 |
|
Andy Scherzinger
|
75e2349e5b
|
Code review
|
2015-10-06 09:58:16 +02:00 |
|
Jenkins for ownCloud
|
435d4969fe
|
[tx-robot] updated from transifex
|
2015-10-06 01:13:31 -04:00 |
|