David A. Velasco [Wed, 23 Oct 2013 11:17:07 +0000 (13:17 +0200)]
Updated translations without unused string resources
David A. Velasco [Wed, 23 Oct 2013 10:48:55 +0000 (12:48 +0200)]
Replace 'ownCloud' with reference to app_name
David A. Velasco [Wed, 23 Oct 2013 10:18:50 +0000 (12:18 +0200)]
Improved messages
David A. Velasco [Wed, 23 Oct 2013 09:15:44 +0000 (11:15 +0200)]
Removed unused code for ownCloud extensions and strings related
David A. Velasco [Wed, 23 Oct 2013 09:09:59 +0000 (11:09 +0200)]
Removed more code and string about unused location tracking
David A. Velasco [Wed, 23 Oct 2013 08:56:24 +0000 (10:56 +0200)]
Removed unused code for tracking and related strings
David A. Velasco [Wed, 23 Oct 2013 08:46:29 +0000 (10:46 +0200)]
Removed unused landing page and strings related
David A. Velasco [Wed, 23 Oct 2013 08:31:17 +0000 (10:31 +0200)]
Removed unreferenced string resources
David A. Velasco [Tue, 22 Oct 2013 12:15:21 +0000 (05:15 -0700)]
Merge pull request #284 from owncloud/setup_app_name
Setup app name, optional settings, and availability of multiple accounts.
masensio [Tue, 22 Oct 2013 11:24:08 +0000 (13:24 +0200)]
Update data_folder value
masensio [Tue, 22 Oct 2013 11:02:41 +0000 (13:02 +0200)]
Merge branch 'contact_settings' into setup_app_name
masensio [Tue, 22 Oct 2013 11:02:14 +0000 (13:02 +0200)]
OC-1797: Imprint is not shown --> FIXED
masensio [Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Tue, 22 Oct 2013 10:42:19 +0000 (12:42 +0200)]
OC-1795: Background connect button --> btn_default
masensio [Tue, 22 Oct 2013 09:47:15 +0000 (11:47 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Tue, 22 Oct 2013 09:41:36 +0000 (11:41 +0200)]
OC-1794: Having the device in landscape mode the color is not completely changed --> FIXED
masensio [Tue, 22 Oct 2013 08:27:28 +0000 (10:27 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
masensio [Tue, 22 Oct 2013 08:24:02 +0000 (10:24 +0200)]
Delete Override onContentChanged method in AccountSelectActivity
masensio [Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
masensio [Tue, 22 Oct 2013 08:17:09 +0000 (10:17 +0200)]
OC-1770: When deleting the account, log in screen is not shown
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
Luke Owncloud [Mon, 21 Oct 2013 09:40:20 +0000 (11:40 +0200)]
fix git update instructions
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 .
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
masensio [Fri, 18 Oct 2013 13:00:16 +0000 (15:00 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Fri, 18 Oct 2013 12:59:42 +0000 (14:59 +0200)]
OC-1769: Modify background_color and login_background_color works fine
masensio [Fri, 18 Oct 2013 10:42:00 +0000 (12:42 +0200)]
Merge branch 'contact_settings' into setup_app_name
Conflicts:
res/values/setup.xml
masensio [Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
masensio [Fri, 18 Oct 2013 10:24:29 +0000 (12:24 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Fri, 18 Oct 2013 10:17:37 +0000 (12:17 +0200)]
update strings to transifex
masensio [Fri, 18 Oct 2013 08:33:26 +0000 (10:33 +0200)]
Merge branch 'develop' into release-1.4.6
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
David A. Velasco [Fri, 18 Oct 2013 08:22:16 +0000 (10:22 +0200)]
Added depth parameters to ervery PROPFIND method
masensio [Fri, 18 Oct 2013 08:15:55 +0000 (10:15 +0200)]
Delete maxSdkVersion=17 for workaround
masensio [Fri, 18 Oct 2013 07:01:17 +0000 (09:01 +0200)]
Update serialVersionUIDs and version name/number
masensio [Thu, 17 Oct 2013 16:20:38 +0000 (18:20 +0200)]
Merge branch 'transifex' into setup_app_name
Conflicts:
res/values-ko/strings.xml
res/values-lt-rLT/strings.xml
res/values-tr/strings.xml
masensio [Thu, 17 Oct 2013 16:07:13 +0000 (18:07 +0200)]
Update transifex strings
masensio [Thu, 17 Oct 2013 14:54:43 +0000 (16:54 +0200)]
OC-1663: Replace references to app_name in code
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
masensio [Wed, 16 Oct 2013 07:37:28 +0000 (09:37 +0200)]
OC-1662: app_name to setup.xml
masensio [Wed, 16 Oct 2013 06:56:41 +0000 (08:56 +0200)]
OC-1656: Disable/enable help-imprint-feedback options
masensio [Tue, 15 Oct 2013 12:07:59 +0000 (14:07 +0200)]
Merge branch 'develop' into contact_settings
Conflicts:
res/values/strings.xml
masensio [Tue, 15 Oct 2013 11:26:20 +0000 (13:26 +0200)]
OC-1730: Update Images
masensio [Tue, 15 Oct 2013 09:32:46 +0000 (11:32 +0200)]
OC-1668: Block creation of account from device settings
masensio [Mon, 14 Oct 2013 11:39:22 +0000 (13:39 +0200)]
0C-1647: Enable/Disable Create Account option
masensio [Mon, 14 Oct 2013 10:55:21 +0000 (12:55 +0200)]
OC-1646: Adding multiaccount_support property
masensio [Fri, 11 Oct 2013 13:14:41 +0000 (15:14 +0200)]
OC-1671: ActionBar Color
masensio [Fri, 11 Oct 2013 13:08:32 +0000 (15:08 +0200)]
OC-1670: owncloud_white --> background_color
masensio [Fri, 11 Oct 2013 12:54:40 +0000 (14:54 +0200)]
OC-1580: Cancel upload
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
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
David A. Velasco [Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)]
Merge 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
masensio [Mon, 7 Oct 2013 12:03:41 +0000 (05:03 -0700)]
Merge pull request #267 from owncloud/fixed_permanent_redirections
Fixed permanent redirections
David A. Velasco [Mon, 7 Oct 2013 12:00:02 +0000 (14:00 +0200)]
Removed useless log
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
David A. Velasco [Thu, 3 Oct 2013 10:39:54 +0000 (12:39 +0200)]
Merge branch 'develop' into fixed_permanent_redirections
David A. Velasco [Wed, 2 Oct 2013 16:19:20 +0000 (18:19 +0200)]
Fixed units in media control view
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
masensio [Tue, 1 Oct 2013 12:33:40 +0000 (14:33 +0200)]
Changes from comments of PR #270
David A. Velasco [Tue, 1 Oct 2013 10:59:57 +0000 (12:59 +0200)]
Merge branch 'develop' into fixed_permanent_redirections
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
David A. Velasco [Tue, 1 Oct 2013 07:02:07 +0000 (09:02 +0200)]
Fixed URL encoding in check of existence
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)
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
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
David A. Velasco [Mon, 30 Sep 2013 11:29:18 +0000 (13:29 +0200)]
Recover name of instant_uploads table
David A. Velasco [Fri, 27 Sep 2013 12:34:43 +0000 (14:34 +0200)]
Check and creation for InstantUploads folder fixed and rewritten
masensio [Fri, 27 Sep 2013 10:42:34 +0000 (12:42 +0200)]
Add a log and a comment
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
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
masensio [Tue, 24 Sep 2013 12:54:46 +0000 (14:54 +0200)]
Changes from comments of PR
masensio [Tue, 24 Sep 2013 12:22:07 +0000 (14:22 +0200)]
Merge branch 'develop' into fix_loading_dialog_crash
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
masensio [Mon, 23 Sep 2013 07:06:37 +0000 (09:06 +0200)]
Merge branch 'develop' into fix_loading_dialog_crash
masensio [Thu, 19 Sep 2013 11:29:25 +0000 (13:29 +0200)]
OC-1130: Change the old dialog by the new dialog.
masensio [Wed, 18 Sep 2013 16:13:24 +0000 (18:13 +0200)]
OC-1129: Add LoadingDialog.java
masensio [Mon, 16 Sep 2013 08:54:20 +0000 (10:54 +0200)]
OC-1321: fix renaming problem: parent and children
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)
masensio [Tue, 10 Sep 2013 08:45:00 +0000 (10:45 +0200)]
OC-1128: Create new layout for loading dialog
masensio [Thu, 29 Aug 2013 11:02:16 +0000 (13:02 +0200)]
OC-265:Fix Situation when renaming a folder does not work correctly
masensio [Tue, 27 Aug 2013 12:58:56 +0000 (14:58 +0200)]
Set SSO flag to OFF
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
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
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
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
masensio [Tue, 27 Aug 2013 10:32:52 +0000 (12:32 +0200)]
OC-1079: Use isIdPRedirection
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
masensio [Tue, 27 Aug 2013 10:10:47 +0000 (12:10 +0200)]
OC-1078: Use isIdPRedirection
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
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.
masensio [Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)]
Merge branch 'master' into saml_based_federated_single_sign_on_expired
masensio [Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)]
Merge branch 'master' into saml_based_federated_single_sign_on
masensio [Mon, 26 Aug 2013 08:19:02 +0000 (10:19 +0200)]
Merge branch 'master' into develop
Jenkins for ownCloud [Fri, 23 Aug 2013 23:12:48 +0000 (19:12 -0400)]
[tx-robot] updated from transifex
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
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
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
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
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
projects / pub / Android / ownCloud.git / log