Commit graph

1450 commits

Author SHA1 Message Date
masensio
a60643a0d0 OC-2700: Modify the layout list_item to show the share icon 2014-01-23 18:33:38 +01:00
David A. Velasco
0e4c56f316 Fixed crash in first installation
Conflicts:
	src/com/owncloud/android/ui/activity/FileActivity.java
2014-01-23 17:48:00 +01:00
masensio
9243d216fc OC-2697: Save data from the Share API response in oc database 2014-01-23 17:24:06 +01:00
masensio
e2f7394557 OC-2586: Parse the xml Share response from the server 2014-01-23 12:03:36 +01:00
masensio
576de8a8bc OC-2586: Fix problem in mFileProjectionMap 2014-01-22 13:02:27 +01:00
masensio
0368e8fa54 OC-2489: Add GetRemoteSharedFilesOperation 2014-01-21 14:12:46 +01:00
masensio
c719e4a654 OC-2489: Add new check to isSharedSupported 2014-01-21 13:09:30 +01:00
masensio
e9e26a464e OC-2489:Add new check to isSharedSupported 2014-01-21 11:45:53 +01:00
masensio
747a39cf7d OC-2489: New ShareRemoteFile, to get data from the server. ShareType in library 2014-01-21 09:20:32 +01:00
masensio
0723ae4b09 OC-2584: Detect if the server supports the Share API. This Check is in OwnCloudServerCheckOperation 2014-01-20 14:27:09 +01:00
masensio
2da9af3871 Merge branch 'develop' into share_link_show_shared_files 2014-01-20 11:36:10 +01:00
masensio
8587f644e7 Create OCShare object 2014-01-20 11:32:40 +01:00
David A. Velasco
8cf7a1c3db Merge pull request #347 from owncloud/refactor_remote_saml_authentication
Refactored remote saml authentication
2014-01-20 00:10:54 -08:00
David A. Velasco
f601a31b50 Removed excess comma 2014-01-20 09:09:59 +01:00
Mr. Jenkins
69743392f1 [tx-robot] updated from transifex 2014-01-20 01:14:27 -05:00
Mr. Jenkins
6483c8b913 [tx-robot] updated from transifex 2014-01-19 01:14:31 -05:00
Mr. Jenkins
61f53ad160 [tx-robot] updated from transifex 2014-01-18 01:14:30 -05:00
masensio
1d70ae81ea OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user 2014-01-17 15:12:12 +01:00
masensio
ae61e2d7d4 OC-2587:Add new string to setup.xml: share_api_link 2014-01-17 14:35:00 +01:00
masensio
b79383d131 OC-2633: Fixes for comments in code. PR #347 2014-01-17 14:25:38 +01:00
masensio
5581bd9c11 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-17 14:20:14 +01:00
masensio
10dac35232 OC-2633: Fixes for comments in code. PR #347 2014-01-17 14:20:00 +01:00
masensio
99817da42b OC-2305: Create OCShares table on Database 2014-01-17 12:38:41 +01:00
Mr. Jenkins
2f5806da44 [tx-robot] updated from transifex 2014-01-17 01:14:30 -05:00
masensio
e6bf6968fa Merge branch 'develop' into share_link_show_shared_files 2014-01-16 18:46:07 +01:00
David A. Velasco
95afa6c8bf Merge pull request #330 from LukeOwncloud/update_jackrabbit
Update jackrabbit library, with dependencies now in separate files.
2014-01-16 08:55:28 -08:00
masensio
7aeda0b4dc OC-2582: Add methods isFileShareByLink and getFilePublicLink to FileDataStorageManager 2014-01-16 16:55:10 +01:00
masensio
b038cac0cd OC-2581: Add to filelist: shared_by_link(boolean) and public_link(string) 2014-01-16 12:55:21 +01:00
masensio
e65985bd33 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-15 11:00:37 +01:00
masensio
ea18765828 OC-2465: review code 2014-01-15 10:52:06 +01:00
Mr. Jenkins
ce5b3e3118 [tx-robot] updated from transifex 2014-01-15 01:56:46 -05:00
masensio
d3e0c5c6ce OC-2465: Delete a log line in SsoWebViewClient 2014-01-14 11:37:10 +01:00
masensio
b5ca58b712 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-14 11:12:31 +01:00
masensio
8f0128cbab OC-2541: Adapt the code the new saml implementation. Get the username from OCS-API 2014-01-14 11:06:03 +01:00
Mr. Jenkins
bd5f59d376 [tx-robot] updated from transifex 2014-01-14 01:54:26 -05:00
masensio
ddce8f769a OC-2541: Add GetUserNameRemoteOperation to get userName from API (JSON). 2014-01-13 11:43:49 +01:00
Mr. Jenkins
09eb142860 [tx-robot] updated from transifex 2014-01-11 01:14:30 -05:00
masensio
fe6ab707e4 OC-2465: Move getUserNameForSamlSso to AccountUtils in oc_framework 2014-01-09 11:07:54 +01:00
masensio
f4dc4e45f8 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-09 10:04:04 +01:00
masensio
c535af9942 OC-2465: Move SsoWebViewClient to oc_framework 2014-01-09 10:01:54 +01:00
Mr. Jenkins
03fb21540a [tx-robot] updated from transifex 2014-01-09 01:14:27 -05:00
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