Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
masensio
99d7e18916
Merge pull request #839 from fluffy88/develop
...
Trigger media scan after file upload
2015-10-01 18:45:01 +02: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
08d02058c8
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
2015-09-30 17:59:12 +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
masensio
5a8f605ed9
Merge branch 'stable'
2015-09-30 10:45:20 +02:00
masensio
df1f824e13
Update Changelog for 1.8 version
2015-09-30 10:43:56 +02:00
Raquel Pérez Bartolomé
6a9f1ad08c
Update CHANGELOG.md
...
Updated 1.8.0 changelog
2015-09-29 15:53:57 +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
David A. Velasco
001801a39b
Upload operations end in conflict if overriding a version different than the last known
2015-09-28 11:21:33 +02:00
Jenkins for ownCloud
9a3872d003
[tx-robot] updated from transifex
2015-09-28 02:33:53 -04:00
Andy Scherzinger
796b1bd297
Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background
2015-09-27 21:40:52 +02:00
Andy Scherzinger
917039411c
added a divider to the bottom part
2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00
16dp right and left for checkpoxed
2015-09-27 20:32:44 +02:00
Andy Scherzinger
35a68aa337
custom list preference implementation for visual material consistency on pre-lollipop
2015-09-27 20:21:09 +02:00
tobiasKaminsky
57862ef52c
added 16dp padding
2015-09-25 17:30:30 +02:00
tobiasKaminsky
ff5202a5f6
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
2015-09-25 17:23:31 +02:00
tobiasKaminsky
126d251375
fixed bug: behaviour is now obeyed for files that are uploaded after connection switch (no wlan to wlan)
2015-09-25 17:22:40 +02:00
tobiasKaminsky
19bc90bf56
default value: do nothing
...
show summary for behaviour
2015-09-25 17:21:58 +02:00
Andy Scherzinger
5417b2a4e5
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-25 16:09:01 +02:00
David A. Velasco
fb482fa33a
Updated reference to library after rebase
2015-09-25 15:15:33 +02: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
7d7767aa11
Removed some logs
2015-09-25 15:13:57 +02:00
David A. Velasco
44023a6059
Clean-up: removed unused imports and methods, and commented code
2015-09-25 15:13:56 +02:00
David A. Velasco
499d628aa1
Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class
2015-09-25 15:13:54 +02:00
David A. Velasco
1e59a632bc
Fixed permanent 'uploading' icon on files that are automatically renamed during the upload
2015-09-25 15:13:53 +02:00
David A. Velasco
b8a3dc71e4
Safe blanket to clean DB if wrong conflicts keep stored
2015-09-25 15:13:51 +02:00
David A. Velasco
95bebe9382
Remove conflict badge from ancestors when conflict is solved there are no more conflicts below
2015-09-25 15:13:50 +02:00
David A. Velasco
7399508e05
Removed conflict badge when conflict is solved
2015-09-25 15:13:49 +02:00
David A. Velasco
a2aa0479fc
Added conflict icon to folders containing files with conflicts
2015-09-25 15:13:47 +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
5f41bb14d3
ETag used to detect changes in remote files (not only in folders)
2015-09-25 15:13:44 +02:00
David A. Velasco
c0c52fa16a
Fixed NullPointerExceptionS in upload cancelations
2015-09-25 15:13:43 +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
68b52ddc5f
Rewritten queue of FileUploader based on IndexedForest
2015-09-25 15:13:40 +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
0162d2f9c9
Keep the old operation to sync folder as DownloadFolderOperation to allow its use while the new SyncFolderOperation gets stable
2015-09-25 15:13:37 +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
masensio
9948180550
Merge pull request #1174 from owncloud/release_bug_fixes
...
Fixed a couple of tiny bugs
2015-09-24 17:33:22 +02:00
David A. Velasco
0c8dfb6e8d
Close dangling Cursors in FileContentProvider
2015-09-24 17:06:54 +02:00
David A. Velasco
c7a29bc07b
Set default static values to prevent weird crash
2015-09-24 17:06:39 +02:00
David A. Velasco
c8c3e84268
Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view
2015-09-24 16:13:58 +02:00
Andy Scherzinger
de13ecc4e3
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-24 09:46:58 +02:00
tobiasKaminsky
5034e42928
extracted hard-coded string to string resource
2015-09-23 19:49:01 +02:00
masensio
a81934a6cc
Merge pull request #1171 from owncloud/fix_lock_of_upload_til_generation_of_thumbnails_finishes
...
Grant that cancellations of tasks generating thumbnails really works …
2015-09-22 12:57:50 +02:00
