Andy Scherzinger
30720e98a5
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-16 10:41:32 +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
e18773465d
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
2015-10-15 18:27:07 +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
Andy Scherzinger
2610eb6805
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-14 10:33:49 +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
Andy Scherzinger
e5a61893ec
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-11 12:30:05 +02: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
tobiasKaminsky
8b3ed70791
wip
2015-10-07 22:35:55 +02:00
tobiasKaminsky
25410ff36a
Merge branch 'master' of github.com:owncloud/android into cancelWlan
2015-10-07 22:31:37 +02:00
tobiasKaminsky
c0a3399573
on wifi change: cancel all pending uploads, check prior each upload
2015-10-07 21:34:39 +02:00
Andy Scherzinger
41a883549f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-07 19:03:23 +02: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
Andy Scherzinger
8f0ea82efd
Fix for #1182 on Android 5
2015-10-05 18:44:50 +02:00
tobiasKaminsky
4feda0a186
Merge branch 'master' of github.com:owncloud/android
2015-10-04 09:49:06 +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
tobiasKaminsky
7579d3daf7
Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
2015-10-02 16:04:18 +02:00
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
