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
masensio
dc1ea137a2
OC-2332: Isolate code to the upload a file to remove local dependences
2013-12-12 14:44:33 +01:00
David A. Velasco
269cba91ba
Merge branch 'master' into develop
2013-12-12 14:36:33 +01:00
David A. Velasco
4604f925e8
Fixed version code in JB workaround app
2013-12-12 14:32:16 +01:00
David A. Velasco
f36d87eca2
Fixes in coments
2013-12-12 14:22:13 +01:00
David A. Velasco
ba8ee979d0
Merge branch 'master' into develop
2013-12-12 12:56:36 +01:00
masensio
d38a69abc1
OC-2332: rewrite getAvailableRemotePath from UpdateFileOperation, using ExistenceCeheckRemoteOperation instead of WebClient#existsFile
2013-12-12 12:37:36 +01:00
David A. Velasco
5162203874
Removed legacy icons in JB workaround app
2013-12-12 12:24:04 +01:00
masensio
2246c27a8b
OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class
2013-12-12 10:48:06 +01:00
David A. Velasco
e6bc38eaac
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
2013-12-11 18:48:56 +01:00
masensio
edfbd585be
Merge pull request #327 from LukeOwncloud/develop
...
fix/update mvn compile
2013-12-11 09:20:42 -08:00
Mr. Jenkins
e250504597
[tx-robot] updated from transifex
2013-12-11 11:38:03 -05:00
Luke Owncloud
f050eda339
updated jackrabbit to version 2.7.2 (eclipse)
...
removed jackrabbit dependency from android project (only required for oc_framework)
2013-12-11 14:44:40 +01:00
Luke Owncloud
b2aa65812e
mvn update
...
updated jackrabbit to 2.7.2
removed dependency to httpcommon, jackrabbit include implicit dependency
2013-12-11 14:34:44 +01:00
Luke Owncloud
af77468dbc
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-11 13:55:34 +01:00
Luke Owncloud
adc9fd9bcc
updated SETUP.md for Eclipse compile
2013-12-11 11:50:18 +01:00
masensio
6daaf70be8
Merge branch 'develop' into refactor_remote_operation_to_download_file
2013-12-11 09:38:13 +01:00
masensio
c1a3cf3889
Add comment license in some classes
2013-12-11 09:36:21 +01:00
masensio
846d90d44d
OC-2328: Unit Tests for Download a file: New DownloadFileTest
2013-12-11 09:35:57 +01:00
masensio
3ca4607629
OC-2328: Unit Tests for Download a file
2013-12-11 09:31:42 +01:00
David A. Velasco
9fe8cadedd
Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2
2013-12-11 08:52:25 +01:00
David A. Velasco
61a12ae15f
Merge remote-tracking branch 'origin/develop' into develop
2013-12-11 08:52:00 +01:00
David A. Velasco
5274191c1e
Removed unneeded Transifex client
2013-12-11 08:51:34 +01:00
masensio
c3d88a0594
Merge pull request #324 from owncloud/last_minute_release-1.5.2
...
Last minute additions for release 1.5.2
2013-12-10 05:50:01 -08:00
David A. Velasco
dab156e287
Dumb update of Jelly Bean workaround app (just version up)
2013-12-10 14:02:08 +01:00
