Commit graph

1328 commits

Author SHA1 Message Date
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
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
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
Mr. Jenkins
82c1b927d5 [tx-robot] updated from transifex 2013-11-23 23:08:27 -05:00
masensio
afebd9625e OC-2168: Add new class REadRemoteFileOperation to library 2013-11-22 14:51:01 +01:00
masensio
dd4bcae0cf OC-2165: Create Unit Test for RemoveRemoteFileOperation 2013-11-22 14:07:59 +01:00
masensio
9809c0d3db OC-2164: Isolate code from RemoveFileOperation. Include new RemoveRemoteFileOperation in library 2013-11-22 13:30:09 +01:00
Mr. Jenkins
59f806f692 [tx-robot] updated from transifex 2013-11-21 19:14:11 -05:00
Mr. Jenkins
a78b7010c0 [tx-robot] updated from transifex 2013-11-21 07:47:41 -05:00
David A. Velasco
f3b45c8d20 Merge pull request #303 from owncloud/refactor_remote_operation_to_rename_folder
Refactored remote operation to rename folder into oc_framework
2013-11-19 23:45:58 -08:00
David A. Velasco
11c261c6cc Fixed test of oc_framework; more simple initialization 2013-11-19 14:53:11 +01:00
David A. Velasco
04327e1f16 Small tweaks in rename operation 2013-11-19 12:11:07 +01:00
David A. Velasco
f6ac875ce5 Merge branch 'develop' into refactor_remote_operation_to_rename_folder 2013-11-19 11:25:30 +01:00
David A. Velasco
d82d6a6d04 Fixed wrong separator path in project.properties 2013-11-19 11:02:05 +01:00
David A. Velasco
32c1217d5a Added empty resources file to avoid conspiracy of git and Android tools to break compilation 2013-11-19 09:39:08 +01:00
David A. Velasco
30d231b631 Merge pull request #304 from owncloud/refactor_remote_operation_to_create_folder
Created oc_framework; refactored remote operation to create folder into oc_framework
2013-11-19 00:26:22 -08:00
masensio
0b95d61cec OC-2115: Validate Path in RenameRemoteFileOperation 2013-11-19 09:07:11 +01:00
masensio
515ec5e8dd t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder
Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
	oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
2013-11-18 14:42:07 +01:00
David A. Velasco
3cd9b0dc1c Merge remote-tracking branch 'origin/refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_create_folder 2013-11-18 14:24:04 +01:00