masensio
3f701c5bb8
OC-2834: Access to unshare link from PreviewMediaFragment
2014-02-05 12:52:55 +01:00
masensio
e437d8320d
Merge branch 'share_link__new_share' into share_link__unshare_file
2014-02-05 11:25:39 +01:00
masensio
e2af381b88
OC-2823: Show toast message when CreateShareOperation failes
2014-02-05 09:01:46 +01:00
masensio
8d493de0ea
OC-2734: Update Database for UnshareLink operation
2014-02-03 14:24:36 +01:00
David A. Velasco
77d22d5a31
Added filtered chooser dialog for activities that can receive a link
2014-02-03 14:24:28 +01:00
masensio
2b8588ab0b
OC-2732: Create 'unshare' option menu for a shared file/folder
2014-02-03 11:22:39 +01:00
David A. Velasco
59513cd56d
Merge branch 'share_link__new_share' into share_link__new_share_menu
2014-02-03 09:46:26 +01:00
masensio
261d8a5167
OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server
2014-02-03 09:26:36 +01:00
masensio
0f7d8d8453
OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected
2014-02-01 19:38:36 +01:00
David A. Velasco
fbe5f83aee
Adding custom dialog to let the user choose what app should received a shared link [WIP]
2014-01-31 15:38:53 +01:00
David A. Velasco
ef0df64070
Added entry menu to share files, whereever actions on files can be triggered
2014-01-22 13:31:52 +01:00
David A. Velasco
81e906bc34
Updated hint in URL input field
2013-12-10 13:53:21 +01:00
tobiasKaminsky
0d01bf30c3
Added support for sharing files:
...
- Long press on file list
- Add option on ImageViewer
2013-11-24 10:00:04 +01:00
David A. Velasco
e1245bbda7
Merge branch 'develop' into refactor_remote_operation_to_create_folder
2013-11-18 14:10:16 +01:00
David A. Velasco
73849d822d
Add check of characters in file name before starting rename/createFolder operations
2013-11-18 14:10:11 +01:00
David A. Velasco
d7559f22a9
Removed obsolete quote
2013-11-18 08:54:29 +01:00
masensio
3ee1c51039
OC-2067: Adapt CreateRemoteFolderOperation, new class FileUtils.java. Try to create folder with invalid characters return an error message
2013-11-14 09:27:34 +01:00
David A. Velasco
4160e7e256
Merge branch 'develop' into clean_up
2013-10-28 10:11:40 +01:00
David A. Velasco
db87c22150
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
2013-10-23 17:35:07 +02:00
David A. Velasco
f88f81e906
Replace 'ownCloud' with reference to app_name
2013-10-23 12:54:49 +02:00
David A. Velasco
d2b61f546d
Replace 'ownCloud' with reference to app_name
2013-10-23 12:48:55 +02:00
David A. Velasco
39cc0adf8d
Improved messages
2013-10-23 12:18:50 +02:00
David A. Velasco
5d6ba2495a
Removed unused code for ownCloud extensions and strings related
2013-10-23 11:15:44 +02:00
David A. Velasco
79aeef21a6
Removed unused code for tracking and related strings
2013-10-23 10:56:24 +02:00
David A. Velasco
fbcd392251
Removed unused landing page and strings related
2013-10-23 10:46:29 +02:00
David A. Velasco
fed7ee2d1a
Removed unreferenced string resources
2013-10-23 10:31:17 +02:00
masensio
b66e309dfa
Merge branch 'contact_settings' into setup_app_name
...
Conflicts:
res/values/setup.xml
2013-10-18 12:42:00 +02:00
masensio
31f6e61f89
Merge branch 'setup_multiaccount' into setup_app_name
...
Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
2013-10-18 12:32:22 +02:00
masensio
5b8a5718cf
OC-1662: app_name to setup.xml
2013-10-16 09:37:28 +02:00
masensio
066cd5aab3
Merge branch 'develop' into contact_settings
...
Conflicts:
res/values/strings.xml
2013-10-15 14:07:59 +02:00
masensio
152ab88d90
OC-1668: Block creation of account from device settings
2013-10-15 11:32:46 +02:00
David A. Velasco
79493448d9
Included name of the 'lost' folder in the toast warning about current folder removed in the server
2013-10-08 11:24:15 +02:00
masensio
72e54bf983
OC-1591: Update Error Message
2013-10-07 10:51:52 +02:00
David A. Velasco
74370d5dee
Exit the current folder when not existing in the server any more (2)
2013-10-02 18:08:01 +02:00
David A. Velasco
ab3bcf6fe6
Exit the current folder when not existing in the server any more
2013-10-02 16:52:36 +02:00
David A. Velasco
b2f18e0f12
Avoid that a user can recover an expirated SAML session with a different userid than the used to create it
2013-08-22 19:03:21 +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
62e72ab303
Update string: auth_expired_saml_sso_token_toast
2013-08-18 17:32:32 +02:00
masensio
3f9774994c
update strings.xml
2013-08-17 19:02:43 +02:00
David A. Velasco
78bcf72188
Foreground operations on files (remove, rename, new folder) failed due to SAML SSO session expired redirect the app to the login view for a new authentication
2013-08-07 19:13:00 +02:00
David A. Velasco
5ede3e9909
Improved status messages for authentication through SAML-based federated SSO
2013-08-01 17:44:23 +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
233533faa3
Merge branch 'develop' into branding_configurable_URL_input_field
2013-07-05 11:52:24 +02:00
David A. Velasco
12bffce50c
Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings
2013-07-05 10:47:34 +02:00
David A. Velasco
e8239f434a
Merge branch 'develop' into modify_password
2013-07-02 13:08:27 +02:00
masensio
b52f0484b4
OC-461: Add check server button. OC-394
2013-06-26 18:50:08 +02:00
David A. Velasco
7c1be6db3e
Updated some messages in login activity
2013-06-24 10:59:11 +02:00
David A. Velasco
1019dfc34d
Added new contextual option in account list to allow the user modify the password
2013-06-21 13:10:13 +02:00
David A. Velasco
63a3522ab7
Merge branch 'develop'after SPRINT-002
...
Conflicts:
.classpath
2013-06-19 17:56:46 +02:00
David A. Velasco
d612f37de4
'Refresh' options in menus differentiated: 'refresh file' and 'refresh account'
2013-06-18 15:04:45 +02:00
David A. Velasco
5bd3fd6273
Fixed bad replace tokens and removed unnecessary quote
2013-06-12 09:36:38 +02:00
David A. Velasco
f767bf3f01
Non-previewable file is opened after successful donwload
2013-05-28 13:11:57 +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
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
zerginator
536cc166b6
Issue #136 [Feature] Instant upload of videos
2013-05-01 20:06: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
7052e3b5b8
About in settings, more i18n-friendly
2013-04-15 13:45:20 +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
cd45a90bac
Fixed typo
2013-03-21 14:00:46 +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
David A. Velasco
7d84fd0c9f
Refresh authorization token on failed synchronizations when notification error is clicked
2013-03-18 14:05:34 +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
Matthias Baumann
7392cfe5ab
- InstantUpload path const not longer at two places, only at
...
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially for QUOTA_EXCEEDED is it necessary to show that to
the user
2013-03-16 18:56:27 +01:00
David A. Velasco
dc08386401
Merge branch 'details' into feature_previews
2013-03-12 13:03:15 +01:00
David A. Velasco
1493579a2e
Changed 'See details' option menu for 'Details'
2013-03-12 13:02:51 +01:00
zerginator
8e36e7cc3e
This wraps the android.util.logging into Log_OC which , if its enabled
...
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)
https://github.com/owncloud/android/issues/97
2013-03-12 07:56:27 +01:00
David A. Velasco
7d67737a4f
Updating translation files...
2013-03-11 13:27:56 +01:00
zerginator
18a715072c
moved About App into preferences
...
https://github.com/owncloud/android/issues/57
2013-03-10 20:38:46 +01:00
David A. Velasco
d68b324653
Create our own media control - basic operation
2013-03-08 13:32:10 +01:00
David A. Velasco
6cfa24f55a
Improved error messages in gallery for images that can not be loaded
2013-03-01 09:54:49 +01:00
David A. Velasco
cb66b59918
Minimize new fragment to monitor the progress of file download
2013-02-25 15:19:18 +01:00
Matthias Baumann
f764980474
- extend existing FileUpload, so we can handel failed instand upload
...
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
-touch to the 'Faild Upload Notifivation'
-submenue underneath the upload menue
- merges from head
- add lazy loading for the images list with failed uploads
2013-02-25 08:21:33 +01:00
David A. Velasco
24dd513682
Added progress bar for file transfers in details view (untested)
2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d
Added basic menu options to the preview fragment: open, delete, see details
2013-02-18 11:23:18 +01:00
David A. Velasco
7101a04247
Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded
2013-02-14 19:21:09 +01:00
David A. Velasco
9420651936
Error messages for media playback improved
2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78
Fixed bad behaviours when an error occurrs during audio playback
2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c
Removed unused code in MediaService
2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8
Error messages for video playback reviewed
2013-02-11 11:33:50 +01:00
David A. Velasco
7018ae7e1f
Added music player service in background; 'open' button in details used to test (temporal)
2013-02-05 12:20:47 +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