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 |
|
Jenkins for ownCloud
|
f206eaaeb4
|
[tx-robot] updated from transifex
|
2015-10-10 01:13:37 -04: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 |
|
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 |
|
Jenkins for ownCloud
|
435d4969fe
|
[tx-robot] updated from transifex
|
2015-10-06 01:13:31 -04:00 |
|
Andy Scherzinger
|
8f0ea82efd
|
Fix for #1182 on Android 5
|
2015-10-05 18:44:50 +02:00 |
|
Jenkins for ownCloud
|
eddd3aa450
|
[tx-robot] updated from transifex
|
2015-10-04 01:13:38 -04:00 |
|
Jenkins for ownCloud
|
f056247e75
|
[tx-robot] updated from transifex
|
2015-10-03 01:13:37 -04:00 |
|
masensio
|
8f67624a4f
|
Fix: Long press menu shows two extra options: old cancel download and old cancel upload
|
2015-10-01 10:37:37 +02:00 |
|
masensio
|
9494620cc4
|
Merge branch 'master' into sync_full_folder
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
|
2015-09-30 12:24:01 +02:00 |
|
masensio
|
8090269d55
|
Merge branch 'master' of github.com:owncloud/android
Conflicts:
CHANGELOG.md
|
2015-09-30 10:49:47 +02:00 |
|
Jenkins for ownCloud
|
b6c5188fd0
|
[tx-robot] updated from transifex
|
2015-09-29 01:13:58 -04:00 |
|
masensio
|
4316d7082f
|
Remove strings for values-en_DE
|
2015-09-28 13:57:22 +02:00 |
|
masensio
|
ee9aa68d23
|
Merge branch 'release-1.8'
|
2015-09-28 12:33:47 +02:00 |
|
Jenkins for ownCloud
|
9a3872d003
|
[tx-robot] updated from transifex
|
2015-09-28 02:33:53 -04:00 |
|
David A. Velasco
|
056b7c964d
|
Updated error message for failed folder synchronization ('download' not anymore)
|
2015-09-25 15:13:59 +02:00 |
|
David A. Velasco
|
e6c1454458
|
Persist conflicts in local database and show with an icon in the list of files
|
2015-09-25 15:13:46 +02:00 |
|
David A. Velasco
|
9b5506f81e
|
Join cancelation of downloads and uploads in 'cancel sync', both for files and folders
|
2015-09-25 15:13:41 +02:00 |
|
David A. Velasco
|
e885c78dc7
|
Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside
|
2015-09-25 15:13:38 +02:00 |
|
David A. Velasco
|
ac685690a2
|
Extend SyncFolderOperation to check local changes of all files and trigger uploads
|
2015-09-25 15:13:35 +02:00 |
|
David A. Velasco
|
a38461aaa5
|
Same style for log-in buttons in potrait and landscape
|
2015-09-25 13:54:53 +02:00 |
|
David A. Velasco
|
c44ed4980c
|
Fixed lost background color for icon in login view
|
2015-09-25 11:11:46 +02:00 |
|
Jenkins for ownCloud
|
92c39be013
|
[tx-robot] updated from transifex
|
2015-09-22 01:13:44 -04:00 |
|
Jenkins for ownCloud
|
664450a6bf
|
[tx-robot] updated from transifex
|
2015-09-21 01:13:34 -04:00 |
|
Andy Scherzinger
|
f6b2b856cb
|
Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192
|
2015-09-17 11:46:37 +02:00 |
|
Jenkins for ownCloud
|
0cb5cee031
|
[tx-robot] updated from transifex
|
2015-09-17 01:13:47 -04:00 |
|
masensio
|
459bd1e9d0
|
Merge pull request #1157 from owncloud/fix_file_list_icon_alignment
center aligned the folder icon with the drawer icon
|
2015-09-16 12:34:30 +02:00 |
|
Andy Scherzinger
|
4c0371f82b
|
center aligned the folder icon with the drawer icon
|
2015-09-16 11:41:37 +02:00 |
|