2563 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jabarros	2fad1e1a99	Merge branch 'develop' into sorting_files_2 ... Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java	2014-10-23 10:18:20 +02:00
Jenkins for ownCloud	832a98f47c	[tx-robot] updated from transifex	2014-10-23 01:13:40 -04:00
Jenkins for ownCloud	2e6410e771	[tx-robot] updated from transifex	2014-10-22 01:14:52 -04: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
jabarros	3a8ff76d0a	Merge branch 'master' into develop ... Conflicts: owncloud-android-library	2014-10-20 14:54:46 +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
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
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
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
Jenkins for ownCloud	d645343671	[tx-robot] updated from transifex	2014-10-11 01:13:34 -04: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
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