Commit graph

1882 commits

Author SHA1 Message Date
masensio
b50072b019 Merge branch 'develop' into improve_action_bar_pr_392_with_develop 2014-04-02 10:45:52 +02:00
Mr. Jenkins
1037fd1b08 [tx-robot] updated from transifex 2014-04-02 01:15:13 -04:00
David A. Velasco
1f2b951824 Merge pull request #450 from owncloud/check_server_version
Updated checks of server version
2014-04-01 14:10:16 +02:00
David A. Velasco
73370f4365 Updated library reference 2014-04-01 14:09:23 +02:00
Mr. Jenkins
8a0f4fc032 [tx-robot] updated from transifex 2014-04-01 01:15:10 -04:00
masensio
53cd621931 Update Library Refrence: Update MINIMUM_VERSION_FOR_SHARING_API 2014-03-31 15:02:59 +02:00
masensio
f77298336f Update Library Reference. Grant comparison between versions of 4 parts and version of less than 4 parts will be right in any possible situation 2014-03-31 14:54:32 +02:00
masensio
f7bc72f21d Replace 'directory' by 'folder' in strings.xml 2014-03-31 10:36:56 +02:00
masensio
5f4b46015f Update string: 'New folder' instead of 'Create directory' 2014-03-31 10:32:49 +02:00
masensio
0b42d2e626 Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop 2014-03-31 09:46:05 +02:00
Mr. Jenkins
c2d4999fa7 [tx-robot] updated from transifex 2014-03-30 01:14:43 -04:00
Mr. Jenkins
b975a0b4f0 [tx-robot] updated from transifex 2014-03-29 01:14:45 -04:00
masensio
3a1258e471 Merge branch 'develop' into check_server_version 2014-03-28 10:39:08 +01:00
masensio
c436942cb1 Update library reference. Save version with two dots, for the comparison with MINIMUM_VERSION_FOR_SHARING_API 2014-03-28 09:38:47 +01:00
Mr. Jenkins
0f455203a6 [tx-robot] updated from transifex 2014-03-28 01:14:44 -04:00
masensio
53a2789326 Check the version number instead of the version string 2014-03-27 18:01:37 +01:00
masensio
66bca2934d Merge branch 'develop' into check_server_version 2014-03-27 10:05:59 +01:00
masensio
1195c6dba3 Check the version number taking into account the new format 2014-03-27 09:45:41 +01:00
Mr. Jenkins
ae16937a09 [tx-robot] updated from transifex 2014-03-27 01:14:47 -04:00
masensio
c9a68d67e9 Merge branch 'master' into develop 2014-03-26 12:44:55 +01:00
masensio
70677a46fd Merge pull request #448 from owncloud/fix_detection_of_authentication_method_in_server_with_permanent_redirection
Fixed detection of authentication method in server with permanent redire...
2014-03-26 08:43:50 +01:00
David A. Velasco
fb9f7797f4 Fixed detection of authentication method in server with permanent redirection 2014-03-26 08:34:39 +01:00
Mr. Jenkins
b232d15607 [tx-robot] updated from transifex 2014-03-26 01:14:43 -04:00
masensio
b6d9c267ea Merge pull request #447 from owncloud/fix_lost_name_in_failed_notification_due_to_changed_credentials
Fixed lost text in notifications for failed uploads
2014-03-25 08:53:50 +01:00
David A. Velasco
afaa4b2df3 Fixed lost text in notifications for failed uploads 2014-03-25 08:52:05 +01:00
David A. Velasco
571fdba15e Fixed crash after app updates due to changed serialization id in RemoteOperationResult 2014-03-24 13:18:23 +01:00
David A. Velasco
41f86353da Updated notification icon for Android 2.x 2014-03-24 13:17:46 +01:00
masensio
b63fb51226 Update notification icons 2014-03-24 10:46:48 +01:00
David A. Velasco
d2ff7d4755 Merge branch 'develop' into release-1.5.5 2014-03-24 10:23:05 +01:00
David A. Velasco
612ccbb7af Updated library reference 2014-03-24 10:18:11 +01:00
David A. Velasco
c224376ab7 Merge pull request #443 from owncloud/regular_authentication_in_saml_server
Prevent than app without SAML support simulates a fake authentication in a SAML server
2014-03-24 10:16:34 +01:00
David A. Velasco
7b84395fb4 Updated library reference 2014-03-24 10:13:04 +01:00
masensio
1bda7e1e87 Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-24 09:31:43 +01:00
Mr. Jenkins
8a1bcd8159 [tx-robot] updated from transifex 2014-03-24 01:14:32 -04:00
masensio
4191f66593 Merge pull request #445 from owncloud/remove_refresh_of_shares_in_full_sync
Removed refresh of shares in full synchronization
2014-03-21 14:56:46 +01:00
masensio
dca770be6a Modify AuthenticatorActivity#detectAuthorizationMethod so that it triggers a DetectAuthorizationOperation when called. Modifiy AuthenitcatorActivity#onRemoteOperationResult to process the response of DetectAuthorizationOperation 2014-03-21 14:51:56 +01:00
David A. Velasco
d20c1e4141 Implemented analysis in DetectAuthenticationMethodOperation to find out what authentication method requires the server side 2014-03-21 13:42:39 +01:00
David A. Velasco
bef5d5c5f8 Added skeleton of new operation to detect authentication method in the server side 2014-03-21 12:03:25 +01:00
David A. Velasco
a3bf6883fc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-21 11:02:36 +01:00
David A. Velasco
d18c52730e Updated library reference 2014-03-21 11:02:30 +01:00
masensio
ea3cf34349 Merge pull request #444 from owncloud/improve_notifications_pr_400_with_develop
Fix several problems about notifications in Android 2.x and 3.x after upgrade to newest Android notifications API
2014-03-21 10:37:50 +01:00
masensio
7ed3179100 Merge branch 'develop' into improve_notifications_pr_400_with_develop 2014-03-21 10:37:11 +01:00
masensio
2d6826fe8b Merge pull request #400 from tommyd3mdi/develop
Notification improvements
2014-03-21 10:32:49 +01:00
David A. Velasco
0336eced64 Fixed lost of 'shared' attribute during full synchronization process for already known shares 2014-03-21 09:05:19 +01:00
David A. Velasco
4f4c6843a7 Merge branch 'develop' into remove_refresh_of_shares_in_full_sync 2014-03-20 17:48:23 +01:00
David A. Velasco
4ab61cf5ec Update library reference 2014-03-20 17:48:17 +01:00
David A. Velasco
4d3661299b Merge pull request #442 from owncloud/share_link__reuse_link_shared_in_server
Reuse public link already existing in server when user tries to reshare a file.
2014-03-20 17:43:07 +01:00
David A. Velasco
ed9f1740be Update reference to owncloud-library 2014-03-20 17:40:23 +01:00
masensio
4ae57b5bea Changes from comments in PR#443 2014-03-20 16:51:00 +01:00
masensio
c6f0847866 Changes from comments in PR#443 2014-03-20 16:15:59 +01:00