David A. Velasco
|
5665d9c306
|
Merge tag 'oc-android-1-3-22' into oauth_login
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
|
2013-03-18 14:28:49 +01:00 |
|
David A. Velasco
|
2623e9c195
|
Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished
|
2013-02-08 09:22:46 +01:00 |
|
David A. Velasco
|
bb257ec729
|
Updated copyright in source files
|
2013-02-07 18:45:10 +01:00 |
|
David A. Velasco
|
63106c9238
|
Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth
|
2013-01-25 15:11:10 +01:00 |
|
David A. Velasco
|
088b1e83a4
|
Cleaning-up AuthenticatorActivty code
|
2013-01-24 10:29:11 +01:00 |
|
David A. Velasco
|
c38a3b2ef1
|
Merge master into oauth_login
|
2012-12-18 11:20:03 +01:00 |
|
David A. Velasco
|
236895e7f8
|
Refactored app name in strings.xml
|
2012-11-29 12:26:55 +01:00 |
|
David A. Velasco
|
757f9027f5
|
Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup
|
2012-11-29 11:28:34 +01:00 |
|
David A. Velasco
|
cab55a8edd
|
Login page updated to get OAuth2 access token
|
2012-10-31 18:59:43 +01:00 |
|
Bartek Przybylski
|
c72f89c4ba
|
add no suggestion in horizontal mode in account setup activity
|
2012-10-08 18:31:02 +02:00 |
|
Bartek Przybylski
|
826c7405f6
|
dont suggest username in account setup screen
|
2012-10-07 21:43:40 +02:00 |
|
David A. Velasco
|
3e6a936bd4
|
Added link to register new user in landscape view
|
2012-08-21 13:25:40 +02:00 |
|
Bartek Przybylski
|
a4ba6170ea
|
moving from eu.alefzero.eu to com.owncloud.android
|
2012-07-31 17:43:37 +02:00 |
|
David A. Velasco
|
9ae0e1746a
|
Fixed cancel button in landscape account activity
|
2012-07-30 13:14:28 +02:00 |
|
David A. Velasco
|
49c1f9e318
|
Better file opening; new ownCloud logo in account settings page
|
2012-06-27 18:32:20 +02:00 |
|
Bartek Przybylski
|
0aeb425885
|
adjusting design to holo, stability for account setup
|
2012-05-13 16:13:13 +02:00 |
|