Commit graph

2651 commits

Author SHA1 Message Date
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
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
Jenkins for ownCloud
ea04e197c7 [tx-robot] updated from transifex 2014-10-14 01:13:35 -04:00
Luke Owncloud
84c8c96916 small changes for building on Linux 2014-10-12 20:36:34 +02:00
Jenkins for ownCloud
a2d4800df5 [tx-robot] updated from transifex 2014-10-12 01:13:37 -04:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size
calculation
2014-10-11 09:14:14 +02:00
Jenkins for ownCloud
d645343671 [tx-robot] updated from transifex 2014-10-11 01:13:34 -04:00
tobiasKaminsky
b452c1711f - removed german translation 2014-10-10 17:13:08 +02:00
jabarros
8f1045de2b Fixed. When removing a file inside a folder and then upload another, thumbnails are not shown correctly 2014-10-10 15:10:39 +02:00
grecep
df4f60dda4 select all / deselect all file in upload menu 2014-10-10 14:05:49 +02:00
David A. Velasco
ca3e73065d Merge branch 'develop' into instant_upload_path_chooseable 2014-10-10 11:04:37 +02:00
jabarros
0599dc1c6d Merge pull request #651 from owncloud/load_proxy_settings_from_system
Update reference to ownCloud Android library to use proxy settings from device
2014-10-10 10:36:43 +02:00
Jenkins for ownCloud
1a52095f01 [tx-robot] updated from transifex 2014-10-10 04:18:14 -04:00
David A. Velasco
4715402d6b Update reference to ownCloud Android library 2014-10-10 09:27:49 +02:00
Jenkins for ownCloud
73959beb7a [tx-robot] updated from transifex 2014-10-10 01:13:33 -04:00
jabarros
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-09 17:26:02 +02:00
jabarros
95639df3ae Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation 2014-10-09 17:07:50 +02:00
jabarros
cbea96e563 Fixed bug. Thmumbnail is not correct when uploading a file in another folder 2014-10-09 13:21:50 +02:00
jabarros
3b79715686 Fixed bug. When previewing a big image, sometimes it is not possible load it because there is an out of memory error 2014-10-08 13:50:19 +02:00
Jenkins for ownCloud
3068752b02 [tx-robot] updated from transifex 2014-10-08 01:13:40 -04:00
David A. Velasco
1a98e798a0 Some indentation updates 2014-10-07 15:04:16 +02:00
David A. Velasco
a2a34ebf09 Consider possible trailing / in input URL in login view 2014-10-07 15:03:54 +02:00
David A. Velasco
fe176bed6e Some indentation updates 2014-10-07 13:11:23 +02:00
David A. Velasco
363cad2add On refersh of a folder, remove from the local file system the child folders that were deleted in the server 2014-10-07 12:54:31 +02:00
Jenkins for ownCloud
a63e9b16f4 [tx-robot] updated from transifex 2014-10-07 01:13:42 -04:00
jabarros
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
Jenkins for ownCloud
ad518e318c [tx-robot] updated from transifex 2014-10-06 01:13:33 -04:00
Jenkins for ownCloud
45031a321f [tx-robot] updated from transifex 2014-10-05 01:13:36 -04:00
tobiasKaminsky
be7eb6e932 - sort dialog shows the right selected item 2014-10-04 12:40:35 +02:00
tobiasKaminsky
703187ea09 - persist settings for sort order 2014-10-04 12:23:16 +02:00
Jenkins for ownCloud
0c7438de16 [tx-robot] updated from transifex 2014-10-04 01:13:31 -04:00
Jenkins for ownCloud
54dc2756b8 [tx-robot] updated from transifex 2014-10-03 01:13:33 -04:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
jabarros
b5ae527bff Update Log_OC import reference 2014-10-02 09:00:21 +02:00
jabarros
ba798ccda2 Update owncloud library reference 2014-10-02 08:53:14 +02:00
Jenkins for ownCloud
d81c19c963 [tx-robot] updated from transifex 2014-10-01 19:22:04 -04:00
Jenkins for ownCloud
b7674b49e9 [tx-robot] updated from transifex 2014-10-01 06:54:48 -04:00
jabarros
b35f0f0af2 Merge pull request #632 from wakeup/patch-1
fix owncloud capitalization
2014-10-01 11:40:16 +02:00
Javier Gonzalez
d456e2fb6c Merge pull request #641 from owncloud/thumbnails_for_downloaded_images
Thumbnails for downloaded images
2014-10-01 11:35:50 +02:00
jabarros
b9b0a753e0 Changes after CR 2014-10-01 09:03:15 +02:00
jabarros
2e0376e67d Fixed bug. Video files not previewed on accounts whose id has an space 2014-10-01 08:34:14 +02:00
Javier Gonzalez
ab61008c9d Merge pull request #642 from owncloud/remove_values_fil_folder
Fix. Remove 'values-fil' folder for allowing the project compilation
2014-09-30 14:15:31 +02:00
jabarros
52ddd7ebdd Fix. Remove 'values-fil' for allow the project compilation 2014-09-30 14:04:52 +02:00