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
|
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 |
|
David A. Velasco
|
316a0a12ad
|
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
|
2013-08-22 17:50:11 +02:00 |
|
David A. Velasco
|
d7c6472bd3
|
Added check to avoid the creation of the same account (same oc_username in the same server) more than once
|
2013-08-22 17:38:26 +02:00 |
|
masensio
|
dea37f653c
|
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
|
2013-08-22 12:59:56 +02:00 |
|
David A. Velasco
|
37297fb7a9
|
Fixed orientation changes in SSO dialog with WebView
|
2013-08-21 18:51:13 +02:00 |
|
masensio
|
2d36f5a564
|
message 'Session expires' in TextView instead of Toast
|
2013-08-17 18:39:05 +02:00 |
|
David A. Velasco
|
d2ee9062fa
|
Configured embedded WebView to allow the single-sign-on process is completed and to catch the cookie setting the authorized session
|
2013-07-30 13:02:13 +02:00 |
|
David A. Velasco
|
0713ba613d
|
Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration
|
2013-07-25 17:29:52 +02:00 |
|
David A. Velasco
|
86a97a605a
|
Fixed alignment of embedded refresh button and url input field in landscape too
|
2013-07-09 10:19:08 +02:00 |
|
David A. Velasco
|
912d867f27
|
Fixed alignment of embedded refresh button and url input field
|
2013-07-09 09:50:55 +02:00 |
|
David A. Velasco
|
233533faa3
|
Merge branch 'develop' into branding_configurable_URL_input_field
|
2013-07-05 11:52:24 +02:00 |
|
David A. Velasco
|
dcbc08cae7
|
Merge branch 'develop' into check_account_existance_in_gallery
|
2013-07-03 10:06:37 +02:00 |
|
masensio
|
b52f0484b4
|
OC-461: Add check server button. OC-394
|
2013-06-26 18:50:08 +02:00 |
|
David A. Velasco
|
d51372fb92
|
Make the 'refresh' button enabled when visible, although the URL-input field is disabled, when the password is being updated
|
2013-06-24 10:39:52 +02:00 |
|
David A. Velasco
|
3ecabe3ea7
|
PreviewVideoActivity protected against access to non-exiting account
|
2013-06-14 16:59:38 +02:00 |
|
David A. Velasco
|
02d08d0f81
|
Merge branch 'develop' into direct_download_with_click_at_list
|
2013-06-12 11:47:18 +02:00 |
|
David A. Velasco
|
93f79c7099
|
Cancel button for downloads in progress replaceed with 'x' icon
|
2013-06-05 11:08:33 +02:00 |
|
David A. Velasco
|
c70f333358
|
REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity
|
2013-06-04 14:30:29 +02:00 |
|
masensio
|
9dc5a62e44
|
OC-247: Resize active area for the eye icon
|
2013-06-04 10:45:24 +02:00 |
|
David A. Velasco
|
fd39628997
|
REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes
|
2013-05-30 17:53:21 +02:00 |
|
David A. Velasco
|
7160a49e20
|
Merge branch 'develop' into login_toggle_password_icon
|
2013-05-24 10:36:21 +02:00 |
|
David A. Velasco
|
5a488a8ada
|
Fixed look of disabled connect button in portrait, no more drawn as enabled
|
2013-05-21 13:49:42 +02:00 |
|
David A. Velasco
|
ac32e8411a
|
Fixed alignment of login fields in Androd 3.x devices
|
2013-05-20 13:22:17 +02:00 |
|
David A. Velasco
|
69b527c39d
|
Visibility icon in password field is toggled according to the visibility state; better touch detection of visibility and refresh buttons
|
2013-05-17 14:33:31 +02:00 |
|
David A. Velasco
|
4f524a2043
|
Grant that 'refresh' button embedded in the URL input field does not hide the text in the field
|
2013-05-14 15:19:43 +02:00 |
|
David A. Velasco
|
3eb602f81a
|
Fixed unlinked refresh button for the server connection check
|
2013-05-14 13:39:09 +02:00 |
|
David A. Velasco
|
d7c7ccd99b
|
Added scroll to login view in landscape
|
2013-05-14 11:20:48 +02:00 |
|
David A. Velasco
|
00166fe5a8
|
Better position for scroll bar in portrait login view
|
2013-05-14 11:06:18 +02:00 |
|
David A. Velasco
|
50d77e8dc8
|
Review of login view layout optimizing the adaption to different screen sizes
|
2013-05-10 16:35:01 +02:00 |
|
David A. Velasco
|
b36914df88
|
Merge branch 'develop' into file_browsing_refactoring
Conflicts:
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
|
2013-05-06 10:48:43 +02:00 |
|
David A. Velasco
|
a95456884c
|
Fixed bugs after merge
|
2013-05-03 10:34:25 +02:00 |
|
David A. Velasco
|
9b4da8439a
|
Merge branch 'develop' into oauth_login
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
|
2013-05-03 10:24:20 +02:00 |
|
zerginator
|
2acbe9455d
|
Issue #56 + Issue #14 + Issue #143
|
2013-05-01 21:34:13 +02:00 |
|
David A. Velasco
|
2946d8dd69
|
Merge branch 'develop' into oauth_login
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authentication/AccountAuthenticator.java
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/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/eu/alefzero/webdav/WebdavClient.java
|
2013-04-25 19:39:22 +02:00 |
|
David A. Velasco
|
803568ab27
|
Moved buttons in details view to options/action menu
|
2013-04-22 14:34:42 +02:00 |
|
David A. Velasco
|
bdc0332c23
|
Copyright note fixes
|
2013-04-17 12:26:13 +02:00 |
|
David A. Velasco
|
c3ca5b5a4f
|
Merge branch 'develop' into loggingtool
Conflicts:
AndroidManifest.xml
res/menu/main_menu.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDetailActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
src/eu/alefzero/webdav/FileRequestEntity.java
src/eu/alefzero/webdav/WebdavClient.java
|
2013-04-15 13:12:04 +02:00 |
|
David A. Velasco
|
053aad5ae1
|
Merge branch 'bug_hunting' into feature_previews
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2013-04-04 16:49:04 +02:00 |
|
David A. Velasco
|
77ddd1ccb6
|
Merge branch 'develop' into feature_previews
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2013-04-04 16:44:30 +02:00 |
|
zerginator
|
5a22c7e79f
|
Cleaned stuff , add a history delete button and renamed
Log2EmailActivity in LogHistoryActivity
|
2013-04-01 10:26:40 +02:00 |
|
David A. Velasco
|
97ae9007e4
|
Fixed hardcoded string in UploaderActivity layout; and German translations
|
2013-03-27 17:19:19 +01:00 |
|
David A. Velasco
|
980b31de2e
|
Allow edition of OAuth endpoints for testing; better configuration values
|
2013-03-22 14:50:30 +01:00 |
|
David A. Velasco
|
69d6d821ec
|
OAuth clean-up and refactoring
|
2013-03-21 12:21:48 +01:00 |
|
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 |
|
Matthias Baumann
|
6c5f561342
|
- exclude none InstantUpload from InstantUploadActivity
- add simple Activity for none InstantUloads to show the whole
error-message
|
2013-03-17 10:38:42 +01:00 |
|
David A. Velasco
|
99a35347a7
|
Fixed horizontal layout - media controller totally visible
|
2013-03-13 10:59:55 +01:00 |
|
David A. Velasco
|
ca8a19850b
|
Improving our own media control: removed 'next' and 'previous' buttons, removed undesired 'show' and 'hide' behaviour, fixed update of progress bar, recovered BACK button
|
2013-03-11 10:20:04 +01:00 |
|
David A. Velasco
|
d68b324653
|
Create our own media control - basic operation
|
2013-03-08 13:32:10 +01:00 |
|
David A. Velasco
|
db7eea712d
|
Improved message for failed downloads in gallery
|
2013-03-01 14:20:25 +01:00 |
|