jabarros
bd6f9b384b
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
...
Update reference to library after upgrading TLS support
2014-11-17 15:26:08 +01:00
David A. Velasco
4d04e70d12
Update reference to library after upgrading TLS support
2014-11-17 15:18:38 +01:00
jabarros
6224f73544
Fix crash in Android Lollipop when cliking on refresh the whole account
2014-11-17 14:07:48 +01:00
Luke Owncloud
4817e43c13
small changes for building on Linux
...
Conflicts:
SETUP.md
setup_env.sh
2014-11-17 13:52:56 +01:00
jabarros
05cb87c172
Update library reference
2014-11-17 13:51:04 +01:00
jabarros
a7c4814e28
Merge branch 'develop' into nea_upload_files
2014-11-17 13:49:17 +01:00
Jorge Antonio Diaz-Benito Soriano
9bfacf23cb
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
2014-11-17 13:36:26 +01:00
jabarros
297cb6b5c3
Refactoring to avoid maintenance after CR
2014-11-17 11:32:46 +01:00
Jenkins for ownCloud
3f5b3f0d1d
[tx-robot] updated from transifex
2014-11-17 01:13:35 -05:00
Jenkins for ownCloud
1dbd577166
[tx-robot] updated from transifex
2014-11-15 01:13:35 -05:00
Oliver Gasser
e398ad0c63
Convert IDN from ASCII to Unicode in Upload Dialog
...
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708 .
2014-11-14 00:55:53 +01:00
David A. Velasco
1b36e1ca08
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
...
Relative time stamps in the list of files.
2014-11-13 12:21:49 +01:00
tobiasKaminsky
7874dc4a9d
- reference bug 716
2014-11-13 10:10:57 +01:00
Jenkins for ownCloud
02a11c3b91
[tx-robot] updated from transifex
2014-11-13 01:13:37 -05:00
jabarros
5d784d98b4
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
2014-11-12 16:07:37 +01:00
tobiasKaminsky
6e34ccb817
fix Problem with < Android 3.0
2014-11-12 14:51:56 +01:00
jabarros
e4d6f267f7
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
2014-11-12 12:46:33 +01:00
David A. Velasco
17afcb0251
Merge pull request #683 from tobiasKaminsky/videoFullsize
...
Bugfix: video is now playing in fullscreen
2014-11-12 09:29:28 +01:00
tobiasKaminsky
79cb6106fd
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4
< 60 seconds -> "seconds ago"
2014-11-12 08:56:53 +01:00
jabarros
3cae3d3eb8
Modify kitkat document provider implementation in order to cover all 'content://' cases
2014-11-12 08:46:29 +01:00
Jenkins for ownCloud
1efefbd22c
[tx-robot] updated from transifex
2014-11-12 01:13:41 -05:00
Magnus Sjoqvist
437d3315e0
merge
2014-11-11 12:49:22 +01:00
jabarros
903b66595f
Add workaround for Drive app in which a creation of a temporal copy is needed
2014-11-11 12:27:57 +01:00
Sam
c2ee5dbff9
This commit targets https://github.com/owncloud/android/issues/596
...
1. allows multiselect during upload for select applications
2. Added an api check, multiselect is only supported on api level 18+
2014-11-11 09:55:25 +01:00
Jenkins for ownCloud
3c19c59d9e
[tx-robot] updated from transifex
2014-11-11 01:13:34 -05:00
tobiasKaminsky
4560776ecc
- use match_parent instead
2014-11-10 20:14:45 +01:00
Jenkins for ownCloud
54b814a604
[tx-robot] updated from transifex
2014-11-10 01:13:34 -05:00
Jenkins for ownCloud
ae67bbb648
[tx-robot] updated from transifex
2014-11-09 01:13:35 -05:00
tobiasKaminsky
39f7ee996a
fix scenario 1
2014-11-08 08:45:09 +01:00
Jenkins for ownCloud
2f058ad70e
[tx-robot] updated from transifex
2014-11-08 01:13:37 -05:00
jabarros
da7e13ed5c
Include impelementation of Storage Access Framework when device is KITKAT or over
2014-11-07 14:57:47 +01:00
Pro9
0ba228c064
Added an api check, since multiselect only works on api level 18+
2014-11-07 09:25:31 +01:00
Jenkins for ownCloud
4ab6d85c47
[tx-robot] updated from transifex
2014-11-07 01:13:38 -05:00
tobiasKaminsky
65c78a44c8
- imageview gets updated when thumbnail generation is finished
2014-11-06 08:36:15 +01:00
tobiasKaminsky
ccc8d7d7ae
- bugfix
2014-11-06 08:21:43 +01:00
tobiasKaminsky
045720d876
- initial image grid
2014-11-06 08:17:35 +01:00
Jenkins for ownCloud
5b37b99af3
[tx-robot] updated from transifex
2014-11-06 01:13:41 -05:00
tobiasKaminsky
f331120a14
Merge remote-tracking branch 'upstream/develop' into imageGrid
...
Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
2014-11-05 22:07:11 +01:00
tobiasKaminsky
c105861d0f
Merge remote-tracking branch 'upstream/develop' into rotateImage
...
Conflicts:
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
2014-11-05 21:45:08 +01:00
Sam
e96a16b09b
allows multiselect during upload for select applications
2014-11-05 14:51:59 +01:00
David A. Velasco
80cfc55fda
Merge pull request #706 from owncloud/christmas_app
...
Winter holidays fix
2014-11-05 09:09:48 +01:00
jabarros
eb77fe1da1
Merge pull request #700 from owncloud/remember_last_share_location_fixed
...
Remember last share location
2014-11-05 08:36:16 +01:00
Jenkins for ownCloud
02b8ac0d91
[tx-robot] updated from transifex
2014-11-05 01:13:37 -05:00
jabarros
2790c2379d
Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another
2014-11-04 11:15:59 +01:00
David A. Velasco
183cd732d0
Merge pull request #687 from owncloud/thumbnails_from_server
...
Get remote thumbnails from server (OC8)
2014-11-03 13:38:58 +01:00
jabarros
7283f54158
Fixed. App crashes when selecting an account where you have not accessed yet
2014-11-03 13:00:13 +01:00
David A. Velasco
58040881bd
Some clean-up in ThumbnailsCacheManager
2014-11-03 11:30:44 +01:00
David A. Velasco
a09a837585
Adjust the thumbnails size to the size used on screen
2014-11-03 11:27:51 +01:00
jabarros
e53c6001dd
Merge branch 'develop' into christmas_app
2014-11-03 10:41:49 +01:00
