Commit graph

2500 commits

Author SHA1 Message Date
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
95639df3ae Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation 2014-10-09 17:07:50 +02:00
Jenkins for ownCloud
3068752b02 [tx-robot] updated from transifex 2014-10-08 01:13:40 -04: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
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
b5ae527bff Update Log_OC import reference 2014-10-02 09:00:21 +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
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
Jenkins for ownCloud
40ed6e4195 [tx-robot] updated from transifex 2014-09-30 01:13:36 -04:00
jabarros
97d611aec3 Add column 'update_thumbnail' to the local files db for controlling the update of the thumbnails when images are updated on the server 2014-09-29 13:55:28 +02:00
Jenkins for ownCloud
99ca27e87e [tx-robot] updated from transifex 2014-09-29 01:13:33 -04:00
Jenkins for ownCloud
ea87065c8d [tx-robot] updated from transifex 2014-09-28 01:13:32 -04:00
Jenkins for ownCloud
8cdd84f204 [tx-robot] updated from transifex 2014-09-27 01:13:32 -04:00
Jenkins for ownCloud
1d2cc1bdc7 [tx-robot] updated from transifex 2014-09-25 01:13:37 -04:00
Jenkins for ownCloud
622b27bc71 [tx-robot] updated from transifex 2014-09-24 01:13:39 -04:00
David A. Velasco
e72555f2bd Protect the app against crashes when opening the thumbnails cache 2014-09-23 14:28:23 +02:00
David A. Velasco
53740c0a8c Protect the app against crashes due to fails in creation of thumbnails 2014-09-23 13:43:30 +02:00
David A. Velasco
63de8e9229 Minimized memory use in load of bitmaps for thumbnails generated from local files 2014-09-23 13:34:25 +02:00
loripino21
30726d2cfa Update preferences.xml 2014-09-23 10:09:02 +02:00
loripino21
47d1a5e3e4 Update strings.xml 2014-09-23 10:08:40 +02:00
loripino21
63187c7555 Update preferences.xml 2014-09-23 10:04:54 +02:00
loripino21
72c6e981c5 Update strings.xml 2014-09-23 10:03:56 +02:00
Jenkins for ownCloud
b38599d1e5 [tx-robot] updated from transifex 2014-09-23 01:48:41 -04:00
Jenkins for ownCloud
4d2ab04d69 [tx-robot] updated from transifex 2014-09-21 01:13:31 -04:00
Jenkins for ownCloud
4b354fa02b [tx-robot] updated from transifex 2014-09-20 01:13:34 -04:00
Volkan Gezer
863c0145be fix owncloud capitalization 2014-09-19 18:10:20 +02:00
David A. Velasco
7a345cf83b Work around constaint in valid key for DiskLruCache (capital letters are not allowed) 2014-09-19 14:14:30 +02:00
Jenkins for ownCloud
278b356f56 [tx-robot] updated from transifex 2014-09-19 01:13:43 -04:00
David A. Velasco
02d085ed0e Hotfix for setups without new mail_logger string 2014-09-18 13:23:50 +02:00
jabarros
6c55a20389 Fixed bug. When there is a downloaded file which is not support as tiff, app crashes 2014-09-18 12:44:42 +02:00
David A. Velasco
60d26d53f6 Merge pull request #627 from owncloud/better_loggin_system
Improved logging system
2014-09-18 09:38:27 +02:00
David A. Velasco
ea5c4760c2 Fixed conflict - Merge branch 'develop' into better_loggin_system 2014-09-18 09:31:24 +02:00
Jenkins for ownCloud
9224d35adc [tx-robot] updated from transifex 2014-09-18 01:13:34 -04:00
David A. Velasco
71e64fdd45 Merge pull request #628 from owncloud/enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh
Enforce refresh even though ETag didn't changed when user pulls down the list of files (security blanket)
2014-09-17 17:18:09 +02:00
jabarros
6da86f04f6 Update with changes after CR 2014-09-17 17:10:20 +02:00
jabarros
74c29e1ce1 Changes after CR 2014-09-17 16:46:11 +02:00
jabarros
9127ca6906 Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh 2014-09-17 12:37:19 +02:00