tobiasKaminsky
c505977cb8
- update to obey non-image files
2014-10-22 09:07:08 +02:00
tobiasKaminsky
d7b32ecc17
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
...
Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
2014-10-22 08:09:47 +02:00
Jenkins for ownCloud
2e6410e771
[tx-robot] updated from transifex
2014-10-22 01:14:52 -04:00
Magnus Sjoqvist
52bf54a00d
Removes remember last share location setting
2014-10-21 17:27:47 +02:00
Magnus Sjoqvist
2b1865d1d0
Removes translations
2014-10-21 16:17:00 +02:00
David A. Velasco
25a36a4fe7
Merge pull request #653 from LukeOwncloud/develop
...
Small improvements in build instructions for Linux
2014-10-21 13:22:08 +02:00
Jenkins for ownCloud
7dc7e85df8
[tx-robot] updated from transifex
2014-10-21 01:15:22 -04:00
tobiasKaminsky
bc4a7bfe43
- added requested changes
2014-10-20 19:52:12 +02:00
jabarros
3a8ff76d0a
Merge branch 'master' into develop
...
Conflicts:
owncloud-android-library
2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
dedd5bb36b
Fixed log import
2014-10-20 14:48:06 +02:00
Magnus Sjoqvist
844790057b
Merge with develop
2014-10-20 14:38:13 +02:00
David A. Velasco
6ed394195d
Merge pull request #658 from owncloud/instant_upload_path_chooseable
...
Instant upload path chooseable
2014-10-20 13:56:18 +02:00
David A. Velasco
274edb45ed
Build with new Android support in Travis
2014-10-20 13:48:12 +02:00
jabarros
a2c91af7f5
Update library reference to 0.9.3 version
2014-10-20 13:32:01 +02:00
jabarros
8f9d00be1c
Update owncloud android library reference
2014-10-20 12:59:41 +02:00
Jenkins for ownCloud
8be4bb14a3
[tx-robot] updated from transifex
2014-10-20 01:14:34 -04:00
tobiasKaminsky
712a513532
- bugfix
2014-10-19 19:36:04 +02:00
tobiasKaminsky
697719ce0e
- fix bug
2014-10-19 19:33:31 +02:00
tobiasKaminsky
635394f2a2
- minor design changes
2014-10-19 08:56:57 +02:00
tobiasKaminsky
524a6e2bdd
- added lgpgl
2014-10-18 10:47:36 +02:00
tobiasKaminsky
4e960eafeb
added "x folders and y files" to end of list
2014-10-18 10:47:08 +02:00
tobiasKaminsky
effa6908b0
- Using Uri.encode...
...
- Thumbnail size is set to 32dp
2014-10-17 21:54:01 +02:00
tobiasKaminsky
bc3f8b3354
- requested changes by review by davivel
2014-10-17 21:28:48 +02:00
MMMarcy
e4058fa2c5
Readded git link that was erraneously removed by the rebase
2014-10-17 15:36:48 +02:00
MMMarcy
d8d75623e4
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
...
Conflicts:
owncloud-android-library
pom.xml
2014-10-17 14:58:27 +02:00
MMMarcy
0775b10a04
Commit for the PR
...
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
2014-10-17 14:42:11 +02:00
Magnus Sjoqvist
b6c7719415
Merge with develop
2014-10-17 11:06:30 +02:00
Magnus Sjoqvist
89627024b1
Added check for that the last upload folder still exists
2014-10-17 10:35:57 +02:00
tobiasKaminsky
e5515c1a2d
trigger Media Scan on:
...
- download
- delete local (on list and details)
- delete local & remote (on list and details)
2014-10-17 09:35:25 +02:00
Jenkins for ownCloud
95a02855ee
[tx-robot] updated from transifex
2014-10-17 01:13:52 -04:00
David A. Velasco
e3e5c205b6
Fix thumbnail generation after successful upload
2014-10-16 16:14:03 +02:00
David A. Velasco
d7de54a6a5
Fix glitch in reuse of thumbnails after crossed rename of files in the server side
2014-10-16 16:13:17 +02:00
jabarros
8859ba3971
Fixed. File is not downloaded in the end, when adding a slash at the end of the path
2014-10-16 14:13:09 +02:00
David A. Velasco
fe2f7ce8a6
Fix lost update of remoteId when file is sync'ed after being replaced in server by other one
2014-10-16 13:11:32 +02:00
jabarros
ad291624a3
Fixed. App crashes when changing the path and not going to the file list. Rename some methods.
2014-10-16 09:49:00 +02:00
Jenkins for ownCloud
475dff85c6
[tx-robot] updated from transifex
2014-10-16 01:14:37 -04:00
jabarros
e4c77cabcb
Fixed. The thumbnail of the just uploaded image is refreshed when it is not necessary
2014-10-15 18:36:39 +02:00
David A. Velasco
5fd7b7e29f
Build with new Android support in Travis
2014-10-15 16:40:44 +02:00
David A. Velasco
299ad36bb8
Thumbnails cache initialized in MainApp context to grant it is done even if the app wasn't opened, for the case of background synchronizations
2014-10-15 12:29:41 +02:00
jabarros
2910b00673
Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
...
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java
2014-10-15 12:20:49 +02:00
David A. Velasco
395ad3248e
Creation of ThumbnailsCacheManager class, grouping all the methods needed to access the thumbnails cache
2014-10-15 11:25:29 +02:00
jabarros
f68139619b
Fixed. When define as instant upload path a path that does not exist, a crash is gotten
2014-10-15 11:21:37 +02:00
jabarros
d5625e6ccc
Fixed. App crash when setting a path without slash
2014-10-15 08:21:24 +02:00
jabarros
016bdfac1f
Fixed. Upload path is not place correctly in setting view
2014-10-15 08:21:23 +02:00
Jenkins for ownCloud
1ffa6e969a
[tx-robot] updated from transifex
2014-10-15 01:13:34 -04:00
David A. Velasco
778ed30b58
Removed unused import
2014-10-14 13:19:56 +02:00
David A. Velasco
a04e5382b5
Fixed indention, log and copyright issues in DiskLruImageCache
2014-10-14 13:18:30 +02:00
David A. Velasco
0675834231
Use hash ok keys as actual key in thumbnails cache instead of custom transformed key
2014-10-14 13:16:32 +02:00
Sam
4275f02cab
Fixed imports and added comments
2014-10-14 09:37:50 +02:00
Magnus Sjoqvist
dd80754057
Fixed merge
2014-10-14 09:37:27 +02:00
