pub/Android/ownCloud.git
11 years agoadded first line of PR https://github.com/owncloud/android/pull/219
Luke Owncloud [Tue, 22 Oct 2013 09:13:55 +0000 (11:13 +0200)]
added first line of PR https://github.com/owncloud/android/pull/219

fixing issue pointed out by dper:
https://github.com/owncloud/android/pull/219#issuecomment-26715595

11 years agoMerge pull request #282 from LukeOwncloud/develop
David A. Velasco [Mon, 21 Oct 2013 09:56:16 +0000 (02:56 -0700)]
Merge pull request #282 from LukeOwncloud/develop

fix git update instructions

11 years agofix git update instructions
Luke Owncloud [Mon, 21 Oct 2013 09:40:20 +0000 (11:40 +0200)]
fix git update instructions

11 years agoMerge pull request #281 from LukeOwncloud/develop
David A. Velasco [Mon, 21 Oct 2013 08:33:29 +0000 (01:33 -0700)]
Merge pull request #281 from LukeOwncloud/develop

Enable building with Maven .

11 years agoenabled project for building with maven (eclipse building stays untouched)
Luke Owncloud [Mon, 21 Oct 2013 07:29:05 +0000 (09:29 +0200)]
enabled project for building with maven (eclipse building stays untouched)
added/updated compile instructions in setup.md
added some eclipse generated files to .gitignore

11 years agoMerge branch 'develop' into release-1.4.6 oc-android-1.4.6
masensio [Fri, 18 Oct 2013 08:33:26 +0000 (10:33 +0200)]
Merge branch 'develop' into release-1.4.6

11 years agoMerge pull request #278 from owncloud/fix_synchronization_after_addition_of_infinite_...
masensio [Fri, 18 Oct 2013 08:31:48 +0000 (01:31 -0700)]
Merge pull request #278 from owncloud/fix_synchronization_after_addition_of_infinite_propfind_in_server

Added depth parameters to ervery PROPFIND method

11 years agoAdded depth parameters to ervery PROPFIND method
David A. Velasco [Fri, 18 Oct 2013 08:22:16 +0000 (10:22 +0200)]
Added depth parameters to ervery PROPFIND method

11 years agoDelete maxSdkVersion=17 for workaround
masensio [Fri, 18 Oct 2013 08:15:55 +0000 (10:15 +0200)]
Delete maxSdkVersion=17 for workaround

11 years agoUpdate serialVersionUIDs and version name/number
masensio [Fri, 18 Oct 2013 07:01:17 +0000 (09:01 +0200)]
Update serialVersionUIDs and version name/number

11 years agoMerge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_net...
masensio [Wed, 16 Oct 2013 12:26:02 +0000 (05:26 -0700)]
Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection

Fix fails in uploads after fall and rise of network connection

11 years agoOC-1730: Update Images
masensio [Tue, 15 Oct 2013 11:26:20 +0000 (13:26 +0200)]
OC-1730: Update Images

11 years agoOC-1580: Cancel upload
masensio [Fri, 11 Oct 2013 12:54:40 +0000 (14:54 +0200)]
OC-1580: Cancel upload

11 years agoMerge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
masensio [Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)]
Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6

11 years agoAvoid occasional crash in app updates due to 'lost' events from previous synchronizations
David A. Velasco [Fri, 11 Oct 2013 08:50:11 +0000 (10:50 +0200)]
Avoid occasional crash in app updates due to 'lost' events from previous synchronizations

11 years agoMerge branch 'develop' into release-1.4.6
David A. Velasco [Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)]
Merge branch 'develop' into release-1.4.6

11 years agoMerge branch 'develop' into release-1.4.6
masensio [Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)]
Merge branch 'develop' into release-1.4.6

11 years agoMerge pull request #267 from owncloud/fixed_permanent_redirections
masensio [Mon, 7 Oct 2013 12:03:41 +0000 (05:03 -0700)]
Merge pull request #267 from owncloud/fixed_permanent_redirections

Fixed permanent redirections

11 years agoRemoved useless log
David A. Velasco [Mon, 7 Oct 2013 12:00:02 +0000 (14:00 +0200)]
Removed useless log

11 years agoPrevent double count of transfer progress when part of an upload is resend
David A. Velasco [Mon, 7 Oct 2013 10:01:15 +0000 (12:01 +0200)]
Prevent double count of transfer progress when part of an upload is resend

11 years agoMerge branch 'develop' into fixed_permanent_redirections
David A. Velasco [Thu, 3 Oct 2013 10:39:54 +0000 (12:39 +0200)]
Merge branch 'develop' into fixed_permanent_redirections

11 years agoFixed units in media control view
David A. Velasco [Wed, 2 Oct 2013 16:19:20 +0000 (18:19 +0200)]
Fixed units in media control view

11 years agoMerge pull request #270 from owncloud/fix_instant_uploads_in_Samsung_4.x_devices
David A. Velasco [Tue, 1 Oct 2013 12:39:27 +0000 (05:39 -0700)]
Merge pull request #270 from owncloud/fix_instant_uploads_in_Samsung_4.x_devices

Fix instant uploads in samsung 4.x devices

11 years agoChanges from comments of PR #270
masensio [Tue, 1 Oct 2013 12:33:40 +0000 (14:33 +0200)]
Changes from comments of PR #270

11 years agoMerge branch 'develop' into fixed_permanent_redirections
David A. Velasco [Tue, 1 Oct 2013 10:59:57 +0000 (12:59 +0200)]
Merge branch 'develop' into fixed_permanent_redirections

11 years agoGranted creation of a new client object (with a new socket) when the network connecti...
David A. Velasco [Tue, 1 Oct 2013 10:56:20 +0000 (12:56 +0200)]
Granted creation of a new client object (with a new socket) when the network connection is lost

11 years agoFixed URL encoding in check of existence
David A. Velasco [Tue, 1 Oct 2013 07:02:07 +0000 (09:02 +0200)]
Fixed URL encoding in check of existence

11 years agoCustom automatic redirection implemented for methods with entity body (PROPFIND,...
David A. Velasco [Mon, 30 Sep 2013 13:12:53 +0000 (15:12 +0200)]
Custom automatic redirection implemented for methods with entity body (PROPFIND, PUT, MKCOL)

11 years agoMerge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
David A. Velasco [Mon, 30 Sep 2013 11:49:50 +0000 (13:49 +0200)]
Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices

11 years agoMerge pull request #266 from owncloud/fix_fake_creation_of_InstantUploads_folder_when...
masensio [Mon, 30 Sep 2013 11:46:42 +0000 (04:46 -0700)]
Merge pull request #266 from owncloud/fix_fake_creation_of_InstantUploads_folder_when_app_is_offline

Fix fake creation of instant uploads folder when app is offline

11 years agoRecover name of instant_uploads table
David A. Velasco [Mon, 30 Sep 2013 11:29:18 +0000 (13:29 +0200)]
Recover name of instant_uploads table

11 years agoCheck and creation for InstantUploads folder fixed and rewritten
David A. Velasco [Fri, 27 Sep 2013 12:34:43 +0000 (14:34 +0200)]
Check and creation for InstantUploads folder fixed and rewritten

11 years agoAdd a log and a comment
masensio [Fri, 27 Sep 2013 10:42:34 +0000 (12:42 +0200)]
Add a log and a comment

11 years agoOC-1470: Remove condition to ignore android.hardware.action.NEW_PICTURE events in...
masensio [Thu, 26 Sep 2013 16:33:27 +0000 (18:33 +0200)]
OC-1470: Remove condition to ignore android.hardware.action.NEW_PICTURE events in devices with version >= 4.0

11 years agoMerge pull request #263 from owncloud/fix_loading_dialog_crash
David A. Velasco [Tue, 24 Sep 2013 12:56:18 +0000 (05:56 -0700)]
Merge pull request #263 from owncloud/fix_loading_dialog_crash

Fix loading dialog crash

11 years agoChanges from comments of PR
masensio [Tue, 24 Sep 2013 12:54:46 +0000 (14:54 +0200)]
Changes from comments of PR

11 years agoMerge branch 'develop' into fix_loading_dialog_crash
masensio [Tue, 24 Sep 2013 12:22:07 +0000 (14:22 +0200)]
Merge branch 'develop' into fix_loading_dialog_crash

11 years agoMerge pull request #234 from LukeOwncloud/develop
David A. Velasco [Tue, 24 Sep 2013 09:26:54 +0000 (02:26 -0700)]
Merge pull request #234 from LukeOwncloud/develop

More detailed compile instructions

11 years agoMerge branch 'develop' into fix_loading_dialog_crash
masensio [Mon, 23 Sep 2013 07:06:37 +0000 (09:06 +0200)]
Merge branch 'develop' into fix_loading_dialog_crash

11 years agoOC-1130: Change the old dialog by the new dialog.
masensio [Thu, 19 Sep 2013 11:29:25 +0000 (13:29 +0200)]
OC-1130: Change the old dialog by the new dialog.

11 years agoOC-1129: Add LoadingDialog.java
masensio [Wed, 18 Sep 2013 16:13:24 +0000 (18:13 +0200)]
OC-1129: Add LoadingDialog.java

11 years agoOC-1321: fix renaming problem: parent and children oc-android-1.4.5
masensio [Mon, 16 Sep 2013 08:54:20 +0000 (10:54 +0200)]
OC-1321: fix renaming problem: parent and children

11 years agoUpdate version number to 1.4.5 and 1.0.6(wa_jb)
masensio [Thu, 12 Sep 2013 16:20:21 +0000 (18:20 +0200)]
Update version number to 1.4.5 and 1.0.6(wa_jb)

11 years agoOC-1128: Create new layout for loading dialog
masensio [Tue, 10 Sep 2013 08:45:00 +0000 (10:45 +0200)]
OC-1128: Create new layout for loading dialog

11 years agoOC-265:Fix Situation when renaming a folder does not work correctly
masensio [Thu, 29 Aug 2013 11:02:16 +0000 (13:02 +0200)]
OC-265:Fix Situation when renaming a folder does not work correctly

11 years agoSet SSO flag to OFF
masensio [Tue, 27 Aug 2013 12:58:56 +0000 (14:58 +0200)]
Set SSO flag to OFF

11 years agoMerge pull request #250 from owncloud/saml_based_federated_single_sign_on_expired
masensio [Tue, 27 Aug 2013 12:44:58 +0000 (05:44 -0700)]
Merge pull request #250 from owncloud/saml_based_federated_single_sign_on_expired

Saml based federated single sign on expired

11 years agoMerge pull request #249 from owncloud/saml_based_federated_single_sign_on
masensio [Tue, 27 Aug 2013 12:44:12 +0000 (05:44 -0700)]
Merge pull request #249 from owncloud/saml_based_federated_single_sign_on

Saml based federated single sign on

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Tue, 27 Aug 2013 11:49:31 +0000 (13:49 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoOC-1080: Message 'Server does not support this authentication method' should be there...
masensio [Tue, 27 Aug 2013 11:48:44 +0000 (13:48 +0200)]
OC-1080: Message 'Server does not support this authentication method' should be there although orientation of the device is changed

11 years agoOC-1079: Use isIdPRedirection
masensio [Tue, 27 Aug 2013 10:32:52 +0000 (12:32 +0200)]
OC-1079: Use isIdPRedirection

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Tue, 27 Aug 2013 10:15:06 +0000 (12:15 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java

11 years agoOC-1078: Use isIdPRedirection
masensio [Tue, 27 Aug 2013 10:10:47 +0000 (12:10 +0200)]
OC-1078: Use isIdPRedirection

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Tue, 27 Aug 2013 09:39:26 +0000 (11:39 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoOC-1075: message 'This authenticated method is not supported', should be shown when...
masensio [Tue, 27 Aug 2013 09:38:03 +0000 (11:38 +0200)]
OC-1075: message 'This authenticated method is not supported', should be shown when need it.

11 years agoMerge branch 'master' into saml_based_federated_single_sign_on_expired
masensio [Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)]
Merge branch 'master' into saml_based_federated_single_sign_on_expired

11 years agoMerge branch 'master' into saml_based_federated_single_sign_on
masensio [Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)]
Merge branch 'master' into saml_based_federated_single_sign_on

11 years agoMerge branch 'master' into develop
masensio [Mon, 26 Aug 2013 08:19:02 +0000 (10:19 +0200)]
Merge branch 'master' into develop

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 23 Aug 2013 23:12:48 +0000 (19:12 -0400)]
[tx-robot] updated from transifex

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
David A. Velasco [Fri, 23 Aug 2013 12:37:14 +0000 (14:37 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoMerge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired...
David A. Velasco [Fri, 23 Aug 2013 12:33:23 +0000 (14:33 +0200)]
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired

11 years agoMerge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
David A. Velasco [Fri, 23 Aug 2013 12:32:03 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on

11 years agoAdded handler to trigger server check when the background is touched in login view...
David A. Velasco [Fri, 23 Aug 2013 12:31:17 +0000 (14:31 +0200)]
Added handler to trigger server check when the background is touched in login view for SSO login

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Fri, 23 Aug 2013 11:42:07 +0000 (13:42 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java

11 years agoOC-1055: Remove follow instruction.
masensio [Fri, 23 Aug 2013 11:28:02 +0000 (13:28 +0200)]
OC-1055: Remove follow instruction.

11 years agoMerge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
masensio [Fri, 23 Aug 2013 07:11:42 +0000 (09:11 +0200)]
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on

11 years agoMerge remote-tracking branch 'origin' into saml_based_federated_single_sign_on
masensio [Fri, 23 Aug 2013 07:09:40 +0000 (09:09 +0200)]
Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
David A. Velasco [Fri, 23 Aug 2013 07:08:51 +0000 (09:08 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoFixed cookie policy
David A. Velasco [Thu, 22 Aug 2013 17:30:01 +0000 (19:30 +0200)]
Fixed cookie policy

11 years agoFixed condition to determine expiration of SAML SSO
David A. Velasco [Thu, 22 Aug 2013 17:25:15 +0000 (19:25 +0200)]
Fixed condition to determine expiration of SAML SSO

11 years agoFixed cookie policy
David A. Velasco [Thu, 22 Aug 2013 17:24:51 +0000 (19:24 +0200)]
Fixed cookie policy

11 years agoAvoid that a user can recover an expirated SAML session with a different userid than...
David A. Velasco [Thu, 22 Aug 2013 17:03:21 +0000 (19:03 +0200)]
Avoid that a user can recover an expirated SAML session with a different userid than the used to create it

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
David A. Velasco [Thu, 22 Aug 2013 15:50:11 +0000 (17:50 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoAdded check to avoid the creation of the same account (same oc_username in the same...
David A. Velasco [Thu, 22 Aug 2013 15:38:26 +0000 (17:38 +0200)]
Added check to avoid the creation of the same account (same oc_username in the same server) more than once

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Thu, 22 Aug 2013 10:59:56 +0000 (12:59 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
res/values-es/strings.xml
src/com/owncloud/android/operations/SynchronizeFolderOperation.java

11 years agoMerge pull request #246 from owncloud/sso_bug_changing_orientation
masensio [Thu, 22 Aug 2013 10:25:36 +0000 (03:25 -0700)]
Merge pull request #246 from owncloud/sso_bug_changing_orientation

Fixed bugs when changing orientation in single-sign-on dialog.

11 years agoFixed comments in PR#246
David A. Velasco [Thu, 22 Aug 2013 09:48:57 +0000 (11:48 +0200)]
Fixed comments in PR#246

11 years agoMerge branch 'saml_based_federated_single_sign_on' into sso_bug_changing_orientation
David A. Velasco [Wed, 21 Aug 2013 16:56:19 +0000 (18:56 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into sso_bug_changing_orientation

11 years agoFixed orientation changes in SSO dialog with WebView
David A. Velasco [Wed, 21 Aug 2013 16:51:13 +0000 (18:51 +0200)]
Fixed orientation changes in SSO dialog with WebView

11 years agoOC-1029: add method isIdPRedirection
masensio [Wed, 21 Aug 2013 16:31:57 +0000 (18:31 +0200)]
OC-1029: add method isIdPRedirection

11 years agoMerge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
masensio [Wed, 21 Aug 2013 16:24:52 +0000 (18:24 +0200)]
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on

11 years agoOC-1028: add extra condition to check of redirection. New method isIdPRedirection...
masensio [Wed, 21 Aug 2013 16:12:28 +0000 (18:12 +0200)]
OC-1028: add extra condition to check of redirection. New method isIdPRedirection at RemoteOperationResult

11 years agoOC-1029: add an extra condition to check of redirection. Check if LocationUrl contain...
masensio [Wed, 21 Aug 2013 15:53:12 +0000 (17:53 +0200)]
OC-1029: add an extra condition to check of redirection. Check if LocationUrl contains SAML or wayf

11 years agoadded webSettings.setSaveFormData(false) on Saml Dialog
masensio [Wed, 21 Aug 2013 14:16:21 +0000 (16:16 +0200)]
added webSettings.setSaveFormData(false) on Saml Dialog

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 21 Aug 2013 11:08:27 +0000 (07:08 -0400)]
[tx-robot] updated from transifex

11 years agoOC-1024: Show update credentials for uploads, when session is expired
masensio [Wed, 21 Aug 2013 10:45:07 +0000 (12:45 +0200)]
OC-1024: Show update credentials for uploads, when session is expired

11 years agorefresh account when session expires
masensio [Tue, 20 Aug 2013 09:02:17 +0000 (11:02 +0200)]
refresh account when session expires

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 19 Aug 2013 18:03:43 +0000 (14:03 -0400)]
[tx-robot] updated from transifex

11 years agoUpdate string: auth_expired_saml_sso_token_toast
masensio [Sun, 18 Aug 2013 15:32:32 +0000 (17:32 +0200)]
Update string: auth_expired_saml_sso_token_toast

11 years agoupdate strings.xml
masensio [Sat, 17 Aug 2013 17:02:43 +0000 (19:02 +0200)]
update strings.xml

11 years agomessage 'Session expires' in TextView instead of Toast
masensio [Sat, 17 Aug 2013 16:39:05 +0000 (18:39 +0200)]
message 'Session expires' in TextView instead of Toast

11 years agoMerge pull request #241 from owncloud/sso_bug_changing_orientation
masensio [Sat, 17 Aug 2013 11:28:39 +0000 (04:28 -0700)]
Merge pull request #241 from owncloud/sso_bug_changing_orientation

Fixed bug when changing orientation in SSO dialog

11 years agoForms are resubmitted to grant correct recovery of SSO dialog when device orientation...
David A. Velasco [Sat, 17 Aug 2013 10:56:29 +0000 (12:56 +0200)]
Forms are resubmitted to grant correct recovery of SSO dialog when device orientation is changed after a bad login

11 years agoMerge branch 'develop' into sso_bug_changing_orientation
David A. Velasco [Sat, 17 Aug 2013 08:52:03 +0000 (10:52 +0200)]
Merge branch 'develop' into sso_bug_changing_orientation

11 years agoMerge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired...
masensio [Sat, 17 Aug 2013 08:33:00 +0000 (10:33 +0200)]
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired

11 years agoMerge branch 'master' into develop
David A. Velasco [Sat, 17 Aug 2013 08:24:42 +0000 (10:24 +0200)]
Merge branch 'master' into develop

11 years agoMerge remote-tracking branch 'origin/develop' into develop
David A. Velasco [Sat, 17 Aug 2013 08:24:29 +0000 (10:24 +0200)]
Merge remote-tracking branch 'origin/develop' into develop

11 years agoMerge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
masensio [Fri, 16 Aug 2013 16:37:17 +0000 (18:37 +0200)]
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

11 years agoMerge pull request #235 from owncloud/fixed_instant_uploads_for_greater_4.0
David A. Velasco [Fri, 16 Aug 2013 15:59:04 +0000 (08:59 -0700)]
Merge pull request #235 from owncloud/fixed_instant_uploads_for_greater_4.0

Fixed instant upload of new pictures for Android 4.0 and greater.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 15 Aug 2013 20:57:14 +0000 (16:57 -0400)]
[tx-robot] updated from transifex