Andy Scherzinger
|
6d670fb678
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
|
2015-09-07 11:16:29 +02:00 |
|
masensio
|
a0707428ff
|
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2015-09-02 13:23:42 +02:00 |
|
Andy Scherzinger
|
267179ef2e
|
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
|
2015-08-14 18:55:58 +02:00 |
|
Andy Scherzinger
|
71f68b4c8c
|
fix for progressbars on pre lollipop and post ics for seekbar thumbs
|
2015-08-14 18:55:31 +02:00 |
|
Andy Scherzinger
|
8a8eb435a3
|
set standard 16dp whitespaces via config values not hardcoded
|
2015-08-13 18:08:21 +02:00 |
|
masensio
|
b694fee63d
|
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2015-08-05 16:48:12 +02:00 |
|
masensio
|
0bef9fdedb
|
Update year in license
|
2015-03-05 13:27:45 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
7cc88a22d1
|
Added text file preview
|
2014-10-28 19:11:30 +01:00 |
|
masensio
|
b78eb416a4
|
OC-1670: owncloud_white --> background_color
|
2013-10-11 15:08:32 +02:00 |
|
David A. Velasco
|
50d77e8dc8
|
Review of login view layout optimizing the adaption to different screen sizes
|
2013-05-10 16:35:01 +02:00 |
|
David A. Velasco
|
bdc0332c23
|
Copyright note fixes
|
2013-04-17 12:26:13 +02:00 |
|
David A. Velasco
|
99a35347a7
|
Fixed horizontal layout - media controller totally visible
|
2013-03-13 10:59:55 +01:00 |
|
David A. Velasco
|
d68b324653
|
Create our own media control - basic operation
|
2013-03-08 13:32:10 +01:00 |
|
David A. Velasco
|
6cfa24f55a
|
Improved error messages in gallery for images that can not be loaded
|
2013-03-01 09:54:49 +01:00 |
|
David A. Velasco
|
7101a04247
|
Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded
|
2013-02-14 19:21:09 +01:00 |
|