Commit graph

5661 commits

Author SHA1 Message Date
David A. Velasco
56fa4445e8 Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
Fixed pincode request in instant uploads
2014-01-08 09:12:06 -08:00
David A. Velasco
70e239fb41 Merge pull request #326 from owncloud/refactor_remote_operation_to_read_file
Refactored remote operation to read properties of a file into oc_framework
2014-01-08 09:01:37 -08:00
David A. Velasco
70e6c2136a Replaced last call to PropFindMethod in app with ReadRemoteFileOperation 2014-01-08 17:58:04 +01:00
masensio
5bab662e90 OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again 2014-01-08 13:02:16 +01:00
masensio
bcc972d63d OC-2459: Ask for pincode, when click on an instant upload notification 2014-01-08 11:11:19 +01:00
Mr. Jenkins
0e83e57373 [tx-robot] updated from transifex 2014-01-08 01:14:28 -05:00
masensio
5dc172cd6c OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it 2014-01-07 13:10:53 +01:00
masensio
e6e86b60c5 Merge remote-tracking branch 'origin/refactor_remote_operation_to_read_file' into refactor_remote_operation_to_read_file 2014-01-07 10:18:02 +01:00
masensio
44e3288168 Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
	src/com/owncloud/android/utils/FileStorageUtils.java
2014-01-07 10:16:39 +01:00
Mr. Jenkins
72f6313df8 [tx-robot] updated from transifex 2014-01-07 01:14:46 -05:00
Mr. Jenkins
d9979bc30e [tx-robot] updated from transifex 2014-01-06 01:14:49 -05:00
Mr. Jenkins
18637068f3 [tx-robot] updated from transifex 2014-01-05 01:14:45 -05:00
Mr. Jenkins
ff56f513e2 [tx-robot] updated from transifex 2014-01-02 01:15:03 -05:00
Mr. Jenkins
45593a5cfb [tx-robot] updated from transifex 2013-12-30 01:14:29 -05:00
Mr. Jenkins
39dfccd2d4 [tx-robot] updated from transifex 2013-12-29 01:14:28 -05:00
Mr. Jenkins
d11e4898af [tx-robot] updated from transifex 2013-12-27 01:14:29 -05:00
Mr. Jenkins
8185eb1189 [tx-robot] updated from transifex 2013-12-26 01:14:28 -05:00
Mr. Jenkins
0d7fa8b9d6 [tx-robot] updated from transifex 2013-12-24 01:14:28 -05:00
Mr. Jenkins
e25658837a [tx-robot] updated from transifex 2013-12-22 01:15:05 -05:00
Mr. Jenkins
6effcdc5c3 [tx-robot] updated from transifex 2013-12-21 01:14:58 -05:00
masensio
842c08954b Clean some import warnings 2013-12-19 09:30:27 +01:00
masensio
685c26589b Changes from comments in PR #337 2013-12-19 09:24:28 +01:00
Mr. Jenkins
429837e24b [tx-robot] updated from transifex 2013-12-19 01:14:58 -05:00
masensio
db8a7b427a Merge pull request #325 from owncloud/refactor_remote_operation_to_download_file
Refactor remote operation to download file
2013-12-18 01:05:37 -08:00
masensio
71430eb7b1 Merge branch 'develop' into refactor_remote_operation_to_download_file
Conflicts:
	oc_framework-test-project/AndroidManifest.xml
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
2013-12-18 10:04:42 +01:00
masensio
1638de66f7 Merge pull request #337 from owncloud/refactor_remote_operation_to_upload_file
Refactor remote operation to upload file
2013-12-18 00:58:57 -08:00
masensio
023f0edb40 OC-2328: Add unit test: download a not existing file 2013-12-18 09:39:32 +01:00
masensio
64ddaf8d9a OC-2333: Complete Unit Tests 2013-12-18 09:02:56 +01:00
Mr. Jenkins
21b2d159ca [tx-robot] updated from transifex 2013-12-17 16:41:14 -05:00
masensio
7d43add76c OC-2333: Unit test for UploadFile 2013-12-17 15:16:15 +01:00
Mr. Jenkins
c2bee9a6f3 [tx-robot] updated from transifex 2013-12-17 05:37:37 -05:00
masensio
51e201509d Merge branch 'develop' into refactor_remote_operation_to_download_file 2013-12-17 08:30:09 +01:00
masensio
772721ab9a OC-2397: Fix bug: file doesn't refresh wwhen you select to refresh after change it 2013-12-16 15:09:27 +01:00
masensio
8215c5cc96 Merge branch 'develop' into refactor_remote_operation_to_upload_file
Conflicts:
	src/com/owncloud/android/files/services/FileUploader.java
2013-12-16 13:26:45 +01:00
masensio
07b82ef42f Merge branch 'develop' into refactor_remote_operation_to_read_file 2013-12-16 10:52:48 +01:00
masensio
e76d4b00ef OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks 2013-12-16 10:46:29 +01:00
Mr. Jenkins
45c612fdc9 [tx-robot] updated from transifex 2013-12-13 13:39:24 -05:00
David A. Velasco
43cc429f08 Merge branch 'develop' into refactor_remote_operation_to_download_file 2013-12-13 13:25:12 +01:00
David A. Velasco
415c3867c4 Fixed propagation of download progress to download notifications 2013-12-13 12:34:43 +01:00
David A. Velasco
35c5a260e2 Merge branch 'develop' into refactor_remote_operation_to_read_file 2013-12-13 09:45:40 +01:00
David A. Velasco
f639fed5ab Fixed version code in JB workaround app 2013-12-12 17:25:54 +01:00
David A. Velasco
a5da3182ac Removed legacy icons in JB workaround app 2013-12-12 17:25:54 +01:00
David A. Velasco
f33e416bf3 File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0 2013-12-12 17:25:54 +01:00
Mr. Jenkins
ba31a1a561 [tx-robot] updated from transifex 2013-12-12 17:25:53 +01:00
Luke Owncloud
dba07da921 made oc_framework a mvn project
updated compile instructions for mvn

oc_framework is a standalone mvn project which must be installed.
if anyone knows how to make oc_framework a submodule without changing the directory structure ... please do it!
2013-12-12 17:25:53 +01:00
Luke Owncloud
17edcec867 updated SETUP.md for Eclipse compile 2013-12-12 17:25:53 +01:00
David A. Velasco
9520c99887 Dumb update of Jelly Bean workaround app (just version up) 2013-12-12 17:25:53 +01:00
David A. Velasco
1f550cff98 Updated hint in URL input field 2013-12-12 17:25:53 +01:00
David A. Velasco
7392b6e62e Added seasonal icon for winter holidays 2013-12-12 17:25:53 +01:00
David A. Velasco
2648d497aa Version up to 1.5.2 2013-12-12 17:25:53 +01:00