Mr. Jenkins
45c612fdc9
[tx-robot] updated from transifex
2013-12-13 13:39:24 -05: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
ba8ee979d0
Merge branch 'master' into develop
2013-12-12 12:56:36 +01:00
David A. Velasco
5162203874
Removed legacy icons in JB workaround app
2013-12-12 12:24:04 +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
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
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
David A. Velasco
81e906bc34
Updated hint in URL input field
2013-12-10 13:53:21 +01:00
David A. Velasco
dae42a11b4
Added seasonal icon for winter holidays
2013-12-10 13:41:47 +01:00
Mr. Jenkins
619701c996
[tx-robot] updated from transifex
2013-12-07 21:22:34 -05:00
Mr. Jenkins
1088bbca50
[tx-robot] updated from transifex
2013-12-05 21:19:05 -05:00
David A. Velasco
0a6c488139
Version up to 1.5.2
2013-12-05 18:06:02 +01:00
Mr. Jenkins
b2711d0763
[tx-robot] updated from transifex
2013-12-04 18:12:58 -05:00
David A. Velasco
34923cf74b
Merge branch 'master' into develop
2013-12-04 12:09:22 +01:00
masensio
a9da7583d6
Merge pull request #321 from owncloud/sni_support_based_on_network_implementation_built_in
...
Sni support based on network implementation built in
2013-12-04 03:02:10 -08:00
masensio
5962cdeee7
Merge pull request #320 from owncloud/hotfix_layout_problem_in_login_while_landscape
...
Hotfixed layout problem in login while landscape
2013-12-04 02:35:10 -08:00
David A. Velasco
6aac9ce9ea
Version up: 1.5.1
2013-12-04 10:21:17 +01:00
David A. Velasco
96f264f6e1
Fixed layout of login view in landscape to allow change the visibility of welcome link
2013-12-04 09:23:06 +01:00
Mr. Jenkins
34c85bfa8a
[tx-robot] updated from transifex
2013-12-02 16:23:01 -05:00
David A. Velasco
04e2434aff
Merge branch 'develop' into sni_support_based_on_network_implementation_built_in
2013-12-02 13:44:08 +01:00
Mr. Jenkins
9972d1ec7b
[tx-robot] updated from transifex
2013-11-29 12:18:59 -05:00
David A. Velasco
5c7b534cc5
Merge pull request #316 from owncloud/refactor_remote_operation_to_read_folder
...
Refactored remote operation to read folder into oc_framework
2013-11-29 06:01:44 -08:00
David A. Velasco
732cfcede8
Removed synchronization in independent process to avoid problem in reload of certificates due to separate contexts
2013-11-29 12:14:27 +01:00
David A. Velasco
eb02400aa5
Added license notice to new classes
2013-11-29 10:34:19 +01:00
David A. Velasco
f0dd05ddc4
Merge getFile and getData methods of RemoteOperationResult in a single one
2013-11-29 10:30:53 +01:00
masensio
d74d2c7800
Update classpath: remove jackrabbit library in .classpath of oc_framework
2013-11-28 14:26:51 +01:00
masensio
dc06df15c8
Merge branch 'develop' into refactor_remote_operation_to_read_folder
2013-11-28 14:17:06 +01:00
masensio
9a8b89bea1
OC-2256: Adapt Unit Test to the new result
2013-11-28 13:33:05 +01:00
masensio
007ca522ec
OC-2256: New RemoteFile class
2013-11-28 13:03:33 +01:00
Mr. Jenkins
d1bec28271
[tx-robot] updated from transifex
2013-11-27 10:17:13 -05:00
masensio
5aaa4e10e8
Merge branch 'develop' into refactor_remote_operation_to_read_folder
...
Conflicts:
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
2013-11-27 14:50:16 +01:00
David A. Velasco
910c8a7b36
Merge pull request #313 from owncloud/refactor_remote_operation_to_delete_file_and_folder
...
Refactored remote operation to delete file and folder into oc_framework
2013-11-27 03:49:42 -08:00
David A. Velasco
e1e2f547c5
Refactored local deletion to unify through FileDataStorageManager
2013-11-27 09:44:54 +01:00
David A. Velasco
35602ae668
Removed unneeded comments
2013-11-27 09:21:20 +01:00
David A. Velasco
3746ff540b
Removed absolute path in exported dependencies
2013-11-27 09:19:19 +01:00
masensio
40798f69ee
OC-2172: Unit Test for ReadRemoteFileOperation
2013-11-26 11:23:44 +01:00
masensio
8303c902d9
Merge remote-tracking branch 'origin/develop' into refactor_remote_operation_to_read_folder
2013-11-26 09:33:12 +01:00
Mr. Jenkins
fce3ae7791
[tx-robot] updated from transifex
2013-11-26 02:19:54 -05:00
masensio
526a42a11b
OC-2202: Change old Read method by new ReadRemoteFileOperation
2013-11-25 14:50:16 +01:00
David A. Velasco
7ed9f29973
Enable Server Name Indication in HTTPS connections if available in the network implementation under the API
2013-11-25 14:43:03 +01:00
masensio
f035451760
Merge branch 'develop' into refactor_remote_operation_to_read_folder
2013-11-25 13:03:57 +01:00
masensio
ce9084b6b3
OC-2171: Isolate code for ReadRemoteFileOperation - PROPFIND DEPTH 1
2013-11-25 13:03:39 +01:00
