mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
1042 commits 226 branches 1571 tags 618 MiB
Commit graph

1042 commits

This branch
This branch
All branches
Author SHA1 Message Date
masensio
bf21e3f026 update strings to transifex 2013-10-18 12:17:37 +02:00
masensio
91e50a97a5 Merge branch 'transifex' into setup_app_name 
Conflicts:
	res/values-ko/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-tr/strings.xml
 2013-10-17 18:20:38 +02:00
masensio
dc70f9e890 Update transifex strings 2013-10-17 18:07:13 +02:00
masensio
7488345470 OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
masensio
5b8a5718cf OC-1662: app_name to setup.xml 2013-10-16 09:37:28 +02:00
masensio
a67a6766a6 Merge pull request #267 from owncloud/fixed_permanent_redirections 
Fixed permanent redirections
 2013-10-07 05:03:41 -07:00
David A. Velasco
8abfe39821 Removed useless log 2013-10-07 14:00:02 +02:00
David A. Velasco
d9f42d500c Prevent double count of transfer progress when part of an upload is resend 2013-10-07 12:01:15 +02:00
David A. Velasco
3ffc515f42 Merge branch 'develop' into fixed_permanent_redirections 2013-10-03 12:39:54 +02:00
David A. Velasco
99fb630273 Merge pull request #270 from owncloud/fix_instant_uploads_in_Samsung_4.x_devices 
Fix instant uploads in samsung 4.x devices
 2013-10-01 05:39:27 -07:00
masensio
b6020228c8 Changes from comments of PR #270 2013-10-01 14:33:40 +02:00
David A. Velasco
dad2221916 Merge branch 'develop' into fixed_permanent_redirections 2013-10-01 12:59:57 +02:00
David A. Velasco
abd0dfd385 Fixed URL encoding in check of existence 2013-10-01 09:02:07 +02:00
David A. Velasco
aa23ece118 Custom automatic redirection implemented for methods with entity body (PROPFIND, PUT, MKCOL) 2013-09-30 15:12:53 +02:00
David A. Velasco
01a4676beb Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices 2013-09-30 13:49:50 +02:00
masensio
8b13784522 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
 2013-09-30 04:46:42 -07:00
David A. Velasco
dabd24c985 Recover name of instant_uploads table 2013-09-30 13:29:18 +02:00
David A. Velasco
ea26ae4349 Check and creation for InstantUploads folder fixed and rewritten 2013-09-27 14:34:43 +02:00
masensio
ef78e58fed Add a log and a comment 2013-09-27 12:42:34 +02:00
masensio
da6683e2be OC-1470: Remove condition to ignore android.hardware.action.NEW_PICTURE events in devices with version >= 4.0 2013-09-26 18:33:27 +02:00
David A. Velasco
292870c300 Merge pull request #263 from owncloud/fix_loading_dialog_crash 
Fix loading dialog crash
 2013-09-24 05:56:18 -07:00
masensio
e2e1e62e45 Changes from comments of PR 2013-09-24 14:54:46 +02:00
masensio
4811eb4f57 Merge branch 'develop' into fix_loading_dialog_crash 2013-09-24 14:22:07 +02:00
David A. Velasco
ab6b82750e Merge pull request #234 from LukeOwncloud/develop 
More detailed compile instructions
 2013-09-24 02:26:54 -07:00
masensio
0c4adf5134 Merge branch 'develop' into fix_loading_dialog_crash 2013-09-23 09:06:37 +02:00
masensio
b884276998 OC-1130: Change the old dialog by the new dialog. 2013-09-19 13:29:25 +02:00
masensio
b9c7b92940 OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
masensio
68d4c74fda OC-1321: fix renaming problem: parent and children 2013-09-16 10:54:20 +02:00
masensio
0b42b7b01f Update version number to 1.4.5 and 1.0.6(wa_jb) 2013-09-12 18:20:21 +02:00
masensio
63a2392cf0 OC-1128: Create new layout for loading dialog 2013-09-10 10:45:00 +02:00
masensio
fe9354ef5c OC-265:Fix Situation when renaming a folder does not work correctly 2013-08-29 13:02:16 +02:00
masensio
52500fac9a Set SSO flag to OFF 2013-08-27 14:58:56 +02:00
masensio
cfa974db49 Merge pull request #250 from owncloud/saml_based_federated_single_sign_on_expired 
Saml based federated single sign on expired
 2013-08-27 05:44:58 -07:00
masensio
a6a56bae2a Merge pull request #249 from owncloud/saml_based_federated_single_sign_on 
Saml based federated single sign on
 2013-08-27 05:44:12 -07:00
masensio
ce1e0c210a Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-27 13:49:31 +02:00
masensio
11389ddeb2 OC-1080: Message 'Server does not support this authentication method' should be there although orientation of the device is changed 2013-08-27 13:48:44 +02:00
masensio
4047c62527 OC-1079: Use isIdPRedirection 2013-08-27 12:32:52 +02:00
masensio
da77406209 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2013-08-27 12:15:06 +02:00
masensio
46674d32fe OC-1078: Use isIdPRedirection 2013-08-27 12:10:47 +02:00
masensio
eb437200aa Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-27 11:39:26 +02:00
masensio
e7d9114859 OC-1075: message 'This authenticated method is not supported', should be shown when need it. 2013-08-27 11:38:03 +02:00
masensio
5066193e58 Merge branch 'master' into saml_based_federated_single_sign_on_expired 2013-08-26 10:20:59 +02:00
masensio
0a7d508f92 Merge branch 'master' into saml_based_federated_single_sign_on 2013-08-26 10:19:37 +02:00
masensio
f8d6d882b0 Merge branch 'master' into develop 2013-08-26 10:19:02 +02:00
Jenkins for ownCloud
112cc0f80c [tx-robot] updated from transifex 2013-08-23 19:12:48 -04:00
David A. Velasco
dc02769e49 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-23 14:37:14 +02:00
David A. Velasco
43660cb8bd Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired 2013-08-23 14:33:23 +02:00
David A. Velasco
ea5cd96679 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-23 14:32:03 +02:00
David A. Velasco
2b1b98478b Added handler to trigger server check when the background is touched in login view for SSO login 2013-08-23 14:31:17 +02:00
masensio
71347b48a0 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
 2013-08-23 13:42:07 +02:00