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
|
7d84fd0c9f
|
Refresh authorization token on failed synchronizations when notification error is clicked
|
2013-03-18 14:05:34 +01:00 |
|
David A. Velasco
|
7d67737a4f
|
Updating translation files...
|
2013-03-11 13:27:56 +01:00 |
|
David A. Velasco
|
5da9c095a4
|
Added dialog in the main app to advise users about the workaround app
|
2013-01-30 13:46:15 +01:00 |
|
David A. Velasco
|
fb8a8a2166
|
Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials
|
2013-01-28 13:15:28 +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
|
2b5785556e
|
Merge branch 'master' into oauth_login
Conflicts:
AndroidManifest.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.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
|
2013-01-17 14:25:49 +01:00 |
|
David A. Velasco
|
7239b9eb9d
|
Translations update
|
2013-01-10 18:38:41 +01:00 |
|
David A. Velasco
|
c38a3b2ef1
|
Merge master into oauth_login
|
2012-12-18 11:20:03 +01:00 |
|
David A. Velasco
|
279670c303
|
Merge remote-tracking branch 'origin/sync_review_2'
|
2012-12-05 23:23:10 +01:00 |
|
David A. Velasco
|
4558866223
|
Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder
|
2012-12-04 14:20:02 +01:00 |
|
David A. Velasco
|
f68d10abc7
|
Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed
|
2012-12-04 12:49:18 +01:00 |
|
David A. Velasco
|
a7535406d4
|
Customized error message for uploads when the local file cannot by copied to the ownCloud local directory
|
2012-11-30 14:39:31 +01:00 |
|
David A. Velasco
|
3ef64834e9
|
Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization.
|
2012-11-30 11:58:46 +01:00 |
|
David A. Velasco
|
2a913bfbeb
|
Files uploaded in the past are copied to the local ownCloud directory during account synchronization
|
2012-11-30 11:29:18 +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
|
4c50eb4d2d
|
Merge of master after sync_review was merged into it
|
2012-11-23 10:25:06 +01:00 |
|
David A. Velasco
|
d49bfd0c77
|
Added title to rename dialog; and some cleaning
|
2012-11-22 10:24:26 +01:00 |
|
David A. Velasco
|
38a80be828
|
Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used
|
2012-11-20 14:41:04 +01:00 |
|
David A. Velasco
|
c301865c35
|
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
|
2012-11-16 16:23:45 +01:00 |
|
David A. Velasco
|
a7ee15e023
|
Renaming confussing token
|
2012-11-16 09:42:51 +01:00 |
|
David A. Velasco
|
ff2271a8c5
|
Download button in file details view upgraded to sync file content in both directions
|
2012-11-15 17:18:04 +01:00 |
|
David A. Velasco
|
500cbf9cea
|
New items in the context menu for files (not folders), depending upon its state
|
2012-11-06 15:13:27 +01:00 |
|
David A. Velasco
|
b27ebf0310
|
Removal of folders completed
|
2012-11-05 15:44:09 +01:00 |
|
David A. Velasco
|
cab55a8edd
|
Login page updated to get OAuth2 access token
|
2012-10-31 18:59:43 +01:00 |
|
David A. Velasco
|
3d72058691
|
Quick fix to avoid two lines in button
|
2012-10-30 11:24:30 +01:00 |
|
David A. Velasco
|
cc1eb7a352
|
SSL warning with more information about certificate, accessible through a new 'Details' button
|
2012-10-29 15:03:34 +01:00 |
|
Bartek Przybylski
|
6c32365704
|
Solving modified date and length conflicts
|
2012-10-27 12:20:52 +02:00 |
|
David A. Velasco
|
8f2314d80e
|
Improved explanation in PIN code view
|
2012-10-19 09:24:34 +02:00 |
|
David A. Velasco
|
97f21ee7be
|
About message moved to strings.xml
|
2012-10-17 19:34:31 +02:00 |
|
David A. Velasco
|
d0f7de3ce0
|
Added help text in background of empty files list
|
2012-10-17 19:22:40 +02:00 |
|
David A. Velasco
|
d193e0031b
|
Added explanation in the view for PIN Code creation
|
2012-10-17 11:04:27 +02:00 |
|
David A. Velasco
|
6eff1c94be
|
Updated text in 'Remote and local' option offered when removing a downloaded file to fit the button size' (just some languages)
|
2012-10-17 10:14:14 +02:00 |
|
Bartek Przybylski
|
671cb91cef
|
add upload via wifi only option
|
2012-10-08 21:26:18 +02:00 |
|
David A. Velasco
|
76ba00b2b2
|
Cancellation of current download in details view - UI changes
|
2012-10-08 09:03:12 +02:00 |
|
David A. Velasco
|
0c3aaf3c5a
|
Fixed typo in link to owncloud.com
|
2012-10-03 11:52:54 +02:00 |
|
David A. Velasco
|
131d97d74d
|
A new string
|
2012-09-13 17:08:00 +02:00 |
|
David A. Velasco
|
261aaf5001
|
Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog
|
2012-09-07 14:11:08 +02:00 |
|
David A. Velasco
|
48f13c8adc
|
SSL connections update: notice about untrusted certificates and allow the user save them as reliable
|
2012-09-05 13:46:30 +02:00 |
|
David A. Velasco
|
91bc3fdb1e
|
Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO)
|
2012-08-23 17:09:05 +02:00 |
|
David A. Velasco
|
4e57c008b7
|
Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI
|
2012-08-22 13:53:03 +02:00 |
|
David A. Velasco
|
081b333eb1
|
Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3
|
2012-08-20 14:36:46 +02:00 |
|
David A. Velasco
|
1ecd2b61c5
|
Multiple upload available from the app
|
2012-08-14 12:37:08 +02:00 |
|
David A. Velasco
|
58ebd9d7e1
|
FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted
|
2012-08-08 12:30:11 +02:00 |
|
David A. Velasco
|
532492bf9b
|
Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact.
|
2012-08-03 11:39:08 +02:00 |
|
David A. Velasco
|
38ece35da5
|
Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking
|
2012-08-02 13:28:33 +02:00 |
|
David A. Velasco
|
6a9eaaf9aa
|
Better failure handling in files renaming and removal
|
2012-07-30 15:11:59 +02:00 |
|
David A. Velasco
|
76a123fc35
|
Added failure handling to directory creation
|
2012-07-30 14:06:53 +02:00 |
|