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 |
|
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 |
|
jabarros
|
496c96223a
|
Fixed bug related with refreshing when moving files
|
2014-09-24 12:22:06 +02: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 |
|
jabarros
|
96ba3bcdfc
|
Fixed bug. Change way of decoding pictures from decodeFile to decodeStream and add FlushedInputStream class
|
2014-09-22 14:36:54 +02:00 |
|