Commit graph

8008 commits

Author SHA1 Message Date
masensio
b2a1d9962f
Add share users to details view 2017-07-27 15:21:34 +02:00
masensio
e2cafad719
Remove old file_details_fragment.xml
# Conflicts:
#	res/layout/file_details_fragment.xml
2017-07-27 15:21:34 +02:00
masensio
4f904b34cd
Add share data to details view layout
# Conflicts:
#	owncloud-android-library
#	res/layout/file_details_fragment_new.xml
#	res/values/strings.xml
#	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2017-07-27 15:21:34 +02:00
Andy Scherzinger
edca6f9acc Merge pull request #1199 from nextcloud/userCA
Trust user added CAs on Android7+
2017-07-27 15:20:52 +02:00
AndyScherzinger
6a6e8cd816
remove unused styles 2017-07-27 15:16:33 +02:00
AndyScherzinger
f296628642
remove unused resources 2017-07-27 15:16:33 +02:00
AndyScherzinger
727375642d
allow used added CAs 2017-07-27 15:16:30 +02:00
Mario Đanić
a825555705 Merge pull request #1220 from jsrck/983_hide-folders
On device: show only folders containing downloaded files #983
2017-07-27 08:28:52 +02:00
Mario Đanić
18f9b77abb Merge pull request #1225 from nextcloud/logcat
Add logcat infos to readme
2017-07-27 08:27:03 +02:00
Mario Đanić
c68d14fdb5 Merge pull request #1230 from nextcloud/moveTest
move tests to /src/test
2017-07-27 08:26:27 +02:00
Nextcloud bot
20e78b4ba9
[tx-robot] updated from transifex 2017-07-26 00:27:43 +00:00
nextcloud-android-bot
442a3daaab Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-25 09:04:02 +00:00
Tobias Kaminsky
514bf02f9e Merge 9291a71750 into 14fc239dc5 2017-07-25 08:54:22 +00:00
tobiasKaminsky
9291a71750
move tests to /src/test 2017-07-25 10:53:26 +02:00
tobiasKaminsky
fafb835541
removed third option, replaced by apps 2017-07-25 08:27:05 +02:00
Nextcloud bot
14fc239dc5
[tx-robot] updated from transifex 2017-07-25 00:27:34 +00:00
nextcloud-android-bot
993230f0a7 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-24 15:46:16 +00:00
Tobias Kaminsky
d8fa317a9a Merge 617aeb7d19 into a3fc2aec19 2017-07-24 12:44:25 +00:00
tobiasKaminsky
617aeb7d19
add logcat infos 2017-07-24 14:43:07 +02:00
Tobias Kaminsky
a3fc2aec19 Merge pull request #1205 from vnidens/sharing_password_visibility
[Share] Enter password: toggle visibility of password #1171
2017-07-24 09:39:54 +02:00
Nextcloud bot
affe12961d
[tx-robot] updated from transifex 2017-07-24 00:27:30 +00:00
Jonas Sandrock
58c588e934 On device: show only folders containing downloaded files #983 2017-07-23 21:14:34 +02:00
Victor Nidens
947fad3299
Reverted edit password view visibility 2017-07-23 19:16:34 +02:00
Victor Nidens
1d0675138e
Indentation fixed 2017-07-23 19:16:34 +02:00
Victor Nidens
c9b185f843
Changed visibility icon tint to look good on colored background 2017-07-23 19:16:34 +02:00
Victor Nidens
fbfd8f22f7
Updated password visibility indicator according to Material guidelines 2017-07-23 19:16:33 +02:00
Victor Nidens
a8bc5c3c79
[Share] Enter password: toggle visibility of password #1171 2017-07-23 19:16:30 +02:00
Andy Scherzinger
8072e4cdd2 Merge pull request #1196 from jsrck/master
Feature request: Select all (particularly in search) #637
2017-07-23 16:27:26 +02:00
Jonas Sandrock
f5dcce1b8c
added line break, pull request #1196 2017-07-23 16:15:26 +02:00
Jonas Sandrock
6d25c26a8a
Feature request: Select all (particularly in search) #637 2017-07-23 16:15:23 +02:00
Andy Scherzinger
f52e40aa4f Merge pull request #1216 from jsrck/315-recommend
Enhance recommend to a friend #315
2017-07-23 16:06:50 +02:00
AndyScherzinger
6c15eaa123
remove unused color definitions/layout to make lint happy again 2017-07-23 15:33:59 +02:00
Jonas Sandrock
614546a653
Enhance recommend to a friend #315 2017-07-23 14:56:39 +02:00
Nextcloud bot
eb6a3b1108
[tx-robot] updated from transifex 2017-07-23 00:26:19 +00:00
Nextcloud bot
df1647f140
[tx-robot] updated from transifex 2017-07-22 00:26:48 +00:00
Nextcloud bot
47983d774c
[tx-robot] updated from transifex 2017-07-21 00:26:44 +00:00
Andy Scherzinger
c83a4f6511 Merge pull request #1210 from nextcloud/comradekingu-patch-1
Spelling: Error, GitHub
2017-07-20 11:34:34 +02:00
Nextcloud bot
15cff7b33d
[tx-robot] updated from transifex 2017-07-20 00:27:40 +00:00
nextcloud-android-bot
d0aee2642a Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-19 17:16:03 +00:00
Allan Nordhøy
dca90e167e Merge fce5d90b95 into be778db165 2017-07-19 16:56:08 +00:00
Allan Nordhøy
fce5d90b95 Error, GitHub 2017-07-19 18:55:55 +02:00
Nextcloud bot
be778db165
[tx-robot] updated from transifex 2017-07-19 00:27:18 +00:00
Andy Scherzinger
58828bfa1e Merge pull request #1204 from nextcloud/removeKannada
Remove language kannada
2017-07-18 14:50:42 +02:00
nextcloud-android-bot
7bf472bf2a Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-18 11:06:19 +00:00
Tobias Kaminsky
68ab508c40 Merge f1c92c2e6d into aa4e184495 2017-07-18 09:47:10 +00:00
tobiasKaminsky
f1c92c2e6d
problem with BOM and not maintained, thus removing 2017-07-18 11:46:23 +02:00
Nextcloud bot
aa4e184495
[tx-robot] updated from transifex 2017-07-18 00:26:47 +00:00
Andy Scherzinger
75383fe0ad Merge pull request #1138 from nextcloud/autoUploadRotationBug
Auto upload rotation bug
2017-07-17 23:50:40 +02:00
nextcloud-android-bot
629b07bedb Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-17 21:43:26 +00:00
Tobias Kaminsky
3496aaf3da Merge e1d11aa860 into 94e1941bf1 2017-07-17 21:37:59 +00:00