masensio [Thu, 16 Jan 2014 17:46:07 +0000 (18:46 +0100)]
Merge branch 'develop' into share_link_show_shared_files
David A. Velasco [Thu, 16 Jan 2014 16:55:28 +0000 (08:55 -0800)]
Merge pull request #330 from LukeOwncloud/update_jackrabbit
Update jackrabbit library, with dependencies now in separate files.
masensio [Thu, 16 Jan 2014 15:55:10 +0000 (16:55 +0100)]
OC-2582: Add methods isFileShareByLink and getFilePublicLink to FileDataStorageManager
masensio [Thu, 16 Jan 2014 11:55:21 +0000 (12:55 +0100)]
OC-2581: Add to filelist: shared_by_link(boolean) and public_link(string)
Mr. Jenkins [Wed, 15 Jan 2014 06:56:46 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Tue, 14 Jan 2014 06:54:26 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 11 Jan 2014 06:14:30 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Thu, 9 Jan 2014 06:14:27 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 8 Jan 2014 17:12:06 +0000 (09:12 -0800)]
Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
Fixed pincode request in instant uploads
David A. Velasco [Wed, 8 Jan 2014 17:01:37 +0000 (09:01 -0800)]
Merge pull request #326 from owncloud/refactor_remote_operation_to_read_file
Refactored remote operation to read properties of a file into oc_framework
David A. Velasco [Wed, 8 Jan 2014 16:58:04 +0000 (17:58 +0100)]
Replaced last call to PropFindMethod in app with ReadRemoteFileOperation
masensio [Wed, 8 Jan 2014 12:02:16 +0000 (13:02 +0100)]
OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again
masensio [Wed, 8 Jan 2014 10:11:19 +0000 (11:11 +0100)]
OC-2459: Ask for pincode, when click on an instant upload notification
Mr. Jenkins [Wed, 8 Jan 2014 06:14:28 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 7 Jan 2014 12:10:53 +0000 (13:10 +0100)]
OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it
masensio [Tue, 7 Jan 2014 09:18:02 +0000 (10:18 +0100)]
Merge remote-tracking branch 'origin/refactor_remote_operation_to_read_file' into refactor_remote_operation_to_read_file
masensio [Tue, 7 Jan 2014 09:16:39 +0000 (10:16 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
src/com/owncloud/android/utils/FileStorageUtils.java
Mr. Jenkins [Tue, 7 Jan 2014 06:14:46 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Mon, 6 Jan 2014 06:14:49 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sun, 5 Jan 2014 06:14:45 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Thu, 2 Jan 2014 06:15:03 +0000 (01:15 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Mon, 30 Dec 2013 06:14:29 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sun, 29 Dec 2013 06:14:28 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Fri, 27 Dec 2013 06:14:29 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Thu, 26 Dec 2013 06:14:28 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Tue, 24 Dec 2013 06:14:28 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sun, 22 Dec 2013 06:15:05 +0000 (01:15 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 21 Dec 2013 06:14:58 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Thu, 19 Dec 2013 08:30:27 +0000 (09:30 +0100)]
Clean some import warnings
masensio [Thu, 19 Dec 2013 08:24:28 +0000 (09:24 +0100)]
Changes from comments in PR #337
Mr. Jenkins [Thu, 19 Dec 2013 06:14:58 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Wed, 18 Dec 2013 09:05:37 +0000 (01:05 -0800)]
Merge pull request #325 from owncloud/refactor_remote_operation_to_download_file
Refactor remote operation to download file
masensio [Wed, 18 Dec 2013 09:04:42 +0000 (10:04 +0100)]
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
masensio [Wed, 18 Dec 2013 08:58:57 +0000 (00:58 -0800)]
Merge pull request #337 from owncloud/refactor_remote_operation_to_upload_file
Refactor remote operation to upload file
masensio [Wed, 18 Dec 2013 08:39:32 +0000 (09:39 +0100)]
OC-2328: Add unit test: download a not existing file
masensio [Wed, 18 Dec 2013 08:02:56 +0000 (09:02 +0100)]
OC-2333: Complete Unit Tests
Mr. Jenkins [Tue, 17 Dec 2013 21:41:14 +0000 (16:41 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 17 Dec 2013 14:16:15 +0000 (15:16 +0100)]
OC-2333: Unit test for UploadFile
Mr. Jenkins [Tue, 17 Dec 2013 10:37:37 +0000 (05:37 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 17 Dec 2013 07:30:09 +0000 (08:30 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_download_file
masensio [Mon, 16 Dec 2013 14:09:27 +0000 (15:09 +0100)]
OC-2397: Fix bug: file doesn't refresh wwhen you select to refresh after change it
masensio [Mon, 16 Dec 2013 12:26:45 +0000 (13:26 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_upload_file
Conflicts:
src/com/owncloud/android/files/services/FileUploader.java
masensio [Mon, 16 Dec 2013 09:52:48 +0000 (10:52 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_read_file
masensio [Mon, 16 Dec 2013 09:46:29 +0000 (10:46 +0100)]
OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks
Mr. Jenkins [Fri, 13 Dec 2013 18:39:24 +0000 (13:39 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 13 Dec 2013 12:25:12 +0000 (13:25 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_download_file
David A. Velasco [Fri, 13 Dec 2013 11:34:43 +0000 (12:34 +0100)]
Fixed propagation of download progress to download notifications
David A. Velasco [Fri, 13 Dec 2013 08:45:40 +0000 (09:45 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_read_file
David A. Velasco [Thu, 12 Dec 2013 13:32:16 +0000 (14:32 +0100)]
Fixed version code in JB workaround app
David A. Velasco [Thu, 12 Dec 2013 11:24:04 +0000 (12:24 +0100)]
Removed legacy icons in JB workaround app
David A. Velasco [Wed, 11 Dec 2013 17:48:56 +0000 (18:48 +0100)]
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
Mr. Jenkins [Wed, 11 Dec 2013 16:38:03 +0000 (11:38 -0500)]
[tx-robot] updated from transifex
Luke Owncloud [Wed, 11 Dec 2013 12:55:34 +0000 (13:55 +0100)]
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!
Luke Owncloud [Wed, 11 Dec 2013 10:50:18 +0000 (11:50 +0100)]
updated SETUP.md for Eclipse compile
David A. Velasco [Tue, 10 Dec 2013 13:02:08 +0000 (14:02 +0100)]
Dumb update of Jelly Bean workaround app (just version up)
David A. Velasco [Tue, 10 Dec 2013 12:53:21 +0000 (13:53 +0100)]
Updated hint in URL input field
David A. Velasco [Tue, 10 Dec 2013 12:41:47 +0000 (13:41 +0100)]
Added seasonal icon for winter holidays
David A. Velasco [Thu, 5 Dec 2013 17:06:02 +0000 (18:06 +0100)]
Version up to 1.5.2
masensio [Thu, 12 Dec 2013 13:44:33 +0000 (14:44 +0100)]
OC-2332: Isolate code to the upload a file to remove local dependences
David A. Velasco [Thu, 12 Dec 2013 13:36:33 +0000 (14:36 +0100)]
Merge branch 'master' into develop
David A. Velasco [Thu, 12 Dec 2013 13:32:16 +0000 (14:32 +0100)]
Fixed version code in JB workaround app
David A. Velasco [Thu, 12 Dec 2013 13:22:13 +0000 (14:22 +0100)]
Fixes in coments
David A. Velasco [Thu, 12 Dec 2013 11:56:36 +0000 (12:56 +0100)]
Merge branch 'master' into develop
masensio [Thu, 12 Dec 2013 11:37:36 +0000 (12:37 +0100)]
OC-2332: rewrite getAvailableRemotePath from UpdateFileOperation, using ExistenceCeheckRemoteOperation instead of WebClient#existsFile
David A. Velasco [Thu, 12 Dec 2013 11:24:04 +0000 (12:24 +0100)]
Removed legacy icons in JB workaround app
masensio [Thu, 12 Dec 2013 09:48:06 +0000 (10:48 +0100)]
OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class
David A. Velasco [Wed, 11 Dec 2013 17:48:56 +0000 (18:48 +0100)]
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
masensio [Wed, 11 Dec 2013 17:20:42 +0000 (09:20 -0800)]
Merge pull request #327 from LukeOwncloud/develop
fix/update mvn compile
Mr. Jenkins [Wed, 11 Dec 2013 16:38:03 +0000 (11:38 -0500)]
[tx-robot] updated from transifex
Luke Owncloud [Wed, 11 Dec 2013 13:44:40 +0000 (14:44 +0100)]
updated jackrabbit to version 2.7.2 (eclipse)
removed jackrabbit dependency from android project (only required for oc_framework)
Luke Owncloud [Wed, 11 Dec 2013 13:34:44 +0000 (14:34 +0100)]
mvn update
updated jackrabbit to 2.7.2
removed dependency to httpcommon, jackrabbit include implicit dependency
Luke Owncloud [Wed, 11 Dec 2013 12:55:34 +0000 (13:55 +0100)]
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!
Luke Owncloud [Wed, 11 Dec 2013 10:50:18 +0000 (11:50 +0100)]
updated SETUP.md for Eclipse compile
masensio [Wed, 11 Dec 2013 08:38:13 +0000 (09:38 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_download_file
masensio [Wed, 11 Dec 2013 08:36:21 +0000 (09:36 +0100)]
Add comment license in some classes
masensio [Wed, 11 Dec 2013 08:35:57 +0000 (09:35 +0100)]
OC-2328: Unit Tests for Download a file: New DownloadFileTest
masensio [Wed, 11 Dec 2013 08:31:42 +0000 (09:31 +0100)]
OC-2328: Unit Tests for Download a file
David A. Velasco [Wed, 11 Dec 2013 07:52:25 +0000 (08:52 +0100)]
Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2
David A. Velasco [Wed, 11 Dec 2013 07:52:00 +0000 (08:52 +0100)]
Merge remote-tracking branch 'origin/develop' into develop
David A. Velasco [Wed, 11 Dec 2013 07:51:34 +0000 (08:51 +0100)]
Removed unneeded Transifex client
masensio [Tue, 10 Dec 2013 13:50:01 +0000 (05:50 -0800)]
Merge pull request #324 from owncloud/last_minute_release-1.5.2
Last minute additions for release 1.5.2
David A. Velasco [Tue, 10 Dec 2013 13:02:08 +0000 (14:02 +0100)]
Dumb update of Jelly Bean workaround app (just version up)
David A. Velasco [Tue, 10 Dec 2013 12:53:21 +0000 (13:53 +0100)]
Updated hint in URL input field
masensio [Tue, 10 Dec 2013 12:43:44 +0000 (13:43 +0100)]
OC-2327: Isolate the code for Download a file
David A. Velasco [Tue, 10 Dec 2013 12:41:47 +0000 (13:41 +0100)]
Added seasonal icon for winter holidays
Mr. Jenkins [Sun, 8 Dec 2013 02:22:34 +0000 (21:22 -0500)]
[tx-robot] updated from transifex
Mr. Jenkins [Fri, 6 Dec 2013 02:19:05 +0000 (21:19 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 5 Dec 2013 17:06:02 +0000 (18:06 +0100)]
Version up to 1.5.2
masensio [Thu, 5 Dec 2013 16:37:40 +0000 (17:37 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_download_file
masensio [Thu, 5 Dec 2013 16:33:52 +0000 (17:33 +0100)]
OC-2327. New class DownloadRemoteFileOperation
Mr. Jenkins [Wed, 4 Dec 2013 23:12:58 +0000 (18:12 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 4 Dec 2013 11:09:22 +0000 (12:09 +0100)]
Merge branch 'master' into develop
masensio [Wed, 4 Dec 2013 11:02:10 +0000 (03:02 -0800)]
Merge pull request #321 from owncloud/sni_support_based_on_network_implementation_built_in
Sni support based on network implementation built in
masensio [Wed, 4 Dec 2013 10:35:10 +0000 (02:35 -0800)]
Merge pull request #320 from owncloud/hotfix_layout_problem_in_login_while_landscape
Hotfixed layout problem in login while landscape
masensio [Wed, 4 Dec 2013 09:29:10 +0000 (10:29 +0100)]
Remove fillOcFile from SyncronizeFolderOperation
David A. Velasco [Wed, 4 Dec 2013 09:21:17 +0000 (10:21 +0100)]
Version up: 1.5.1
David A. Velasco [Wed, 4 Dec 2013 08:23:06 +0000 (09:23 +0100)]
Fixed layout of login view in landscape to allow change the visibility of welcome link
Mr. Jenkins [Mon, 2 Dec 2013 21:23:01 +0000 (16:23 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 2 Dec 2013 12:44:08 +0000 (13:44 +0100)]
Merge branch 'develop' into sni_support_based_on_network_implementation_built_in
masensio [Mon, 2 Dec 2013 11:40:29 +0000 (12:40 +0100)]
Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
projects / pub / Android / ownCloud.git / log