David A. Velasco
|
4db5295f56
|
Merge branch 'share_link__new_share' into setup_additions
|
2014-02-06 13:58:41 +01:00 |
|
David A. Velasco
|
fc09783c1d
|
Added HookActivity for integration of external SDKs
|
2014-02-06 12:18:03 +01:00 |
|
David A. Velasco
|
f0477ef854
|
Updated code to compose recommendation text for friends so that it allows the inclusion of the username
|
2014-02-06 09:30:36 +01:00 |
|
David A. Velasco
|
08cec8f7a2
|
Allow setup of display name in the action bar for root folder
|
2014-02-05 19:10:08 +01:00 |
|
masensio
|
de29fd38ce
|
OC-2833: Access to unshare link from PreviewImageFragment
|
2014-02-05 17:32:29 +01:00 |
|
masensio
|
3f701c5bb8
|
OC-2834: Access to unshare link from PreviewMediaFragment
|
2014-02-05 12:52:55 +01:00 |
|
masensio
|
ffdd188f06
|
OC-2834: Access to unshare link from FileDetailFragment
|
2014-02-05 11:39:18 +01:00 |
|
masensio
|
e437d8320d
|
Merge branch 'share_link__new_share' into share_link__unshare_file
|
2014-02-05 11:25:39 +01:00 |
|
David A. Velasco
|
44c730167c
|
Enabled action to share file with link in preview of images
|
2014-02-05 10:53:47 +01:00 |
|
masensio
|
c1af013596
|
OC-2832: Accesss to share link from PreviewMediaFragment
|
2014-02-05 10:42:00 +01:00 |
|
masensio
|
046a566ed4
|
OC-2822: Loading progress dialog while share link is being created. Fix a problem when the app for sharing is not selected
|
2014-02-05 10:18:46 +01:00 |
|
masensio
|
44aeecb27f
|
OC-2822: Add 'loading' progress dialog while the share link is being created
|
2014-02-05 09:13:31 +01:00 |
|
masensio
|
e2af381b88
|
OC-2823: Show toast message when CreateShareOperation failes
|
2014-02-05 09:01:46 +01:00 |
|
David A. Velasco
|
3eb043caf0
|
Merge branch 'develop' into share_link__new_share
|
2014-02-04 14:43:36 +01:00 |
|
David A. Velasco
|
e2a4ad78de
|
Connected selection of app to send share link with creation of share resource, and link send to chosen app
|
2014-02-04 14:19:23 +01:00 |
|
masensio
|
09bb7bce23
|
Merge branch 'share_link_show_shared_files' into share_link__unshare_file
|
2014-02-04 13:31:30 +01:00 |
|
masensio
|
7966a9d62e
|
Changes from comments in PR #385
|
2014-02-04 12:49:15 +01:00 |
|
masensio
|
dcc540358d
|
Changes from comments in PR #385
|
2014-02-04 12:31:46 +01:00 |
|
David A. Velasco
|
7f3be4620e
|
Extra check on progress of refresh to decide visibility of progress circle
|
2014-02-03 15:19:50 +01:00 |
|
masensio
|
a8b46b7d95
|
OC-2735: Refresh unshare files in list
|
2014-02-03 15:14:42 +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
|
5b5a9782c9
|
OC-2804: Fix bug: All files are marked as shared in uploads list
|
2014-02-03 13:13:01 +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
|
a9981ac0b4
|
Improved semantics of broadcast messages from FileSyncAdapter ; passed through LocalBroadcastManager now
|
2014-01-31 15:00:27 +01:00 |
|
masensio
|
d88dc52660
|
OC-2678: Save the new Share resource in the Shares database
|
2014-01-31 14:33:54 +01:00 |
|
David A. Velasco
|
717ef76969
|
Fixed visibility of progress circle for refresh
|
2014-01-31 12:22:49 +01:00 |
|
David A. Velasco
|
b447bf973f
|
Added standard menu to select app used to send the link to share a file
|
2014-01-31 10:43:25 +01:00 |
|
masensio
|
c550c8701b
|
Merge branch 'share_link_show_shared_files' into share_link__new_share
|
2014-01-30 18:54:54 +01:00 |
|
David A. Velasco
|
d8eb34aa49
|
Merge branch 'share_link_show_shared_files' into bug_in_refresh_of_shared_state_when_device_is_rotated
|
2014-01-30 18:33:45 +01:00 |
|
David A. Velasco
|
871d5ea05d
|
Moved execution of GetSharesOperation to OperationsService
|
2014-01-30 17:58:35 +01:00 |
|
masensio
|
426d7a3f88
|
OC-2675: CreateShareRemoteOperation in Library
|
2014-01-30 17:45:00 +01:00 |
|
David A. Velasco
|
72d9d63acb
|
Added service to run operations and created SyncOperations as common class for operations that work both both with remote and local storage
|
2014-01-30 15:02:50 +01:00 |
|
masensio
|
a6589abc54
|
OC-2755: Refresh account shows empty icon sometimes
|
2014-01-29 18:38:55 +01:00 |
|
masensio
|
7c0accf714
|
Merge branch 'share_link_show_shared_files' into share_link__code_improvements
|
2014-01-29 11:14:19 +01:00 |
|
masensio
|
5562c96268
|
OC-2750: Fix Bug. Loading shouldn't disappear until the shared files are shown
|
2014-01-29 10:31:41 +01:00 |
|
masensio
|
7310bbc781
|
OC-2746: New methods in FileStorageManager for saving shares
|
2014-01-29 09:04:33 +01:00 |
|
masensio
|
d963d702fb
|
OC-2746: Changes from comments: new method to construct base url server
|
2014-01-28 14:41:38 +01:00 |
|
masensio
|
8c6e069293
|
OC-2746: Changes from improvements in library
|
2014-01-28 13:13:26 +01:00 |
|
masensio
|
388fdd2265
|
Merge branch 'develop' into share_link_show_shared_files
|
2014-01-27 14:00:07 +01:00 |
|
masensio
|
81b3597853
|
OC-2585: Refreshthe share items.
|
2014-01-27 09:40:07 +01:00 |
|
masensio
|
9d65b66999
|
OC-2585: Refresh the share items
|
2014-01-24 15:04:32 +01:00 |
|
masensio
|
b73b968f60
|
OC-2490: Show image for shared file in the filelist
|
2014-01-24 12:22:11 +01:00 |
|
David A. Velasco
|
0e4c56f316
|
Fixed crash in first installation
Conflicts:
src/com/owncloud/android/ui/activity/FileActivity.java
|
2014-01-23 17:48:00 +01:00 |
|
masensio
|
9243d216fc
|
OC-2697: Save data from the Share API response in oc database
|
2014-01-23 17:24:06 +01:00 |
|
masensio
|
e2f7394557
|
OC-2586: Parse the xml Share response from the server
|
2014-01-23 12:03:36 +01:00 |
|
masensio
|
0368e8fa54
|
OC-2489: Add GetRemoteSharedFilesOperation
|
2014-01-21 14:12:46 +01:00 |
|
David A. Velasco
|
1e68dccd8b
|
Library updated with final names (project and packages)
|
2014-01-20 11:59:41 +01:00 |
|
David A. Velasco
|
690c1bf128
|
Removed unused methoed OnDatatransferProgressListener#onTransferProgress(long)
|
2014-01-15 10:41:37 +01:00 |
|
masensio
|
5bab662e90
|
OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again
|
2014-01-08 13:02:16 +01:00 |
|
masensio
|
bcc972d63d
|
OC-2459: Ask for pincode, when click on an instant upload notification
|
2014-01-08 11:11:19 +01:00 |
|
masensio
|
8215c5cc96
|
Merge branch 'develop' into refactor_remote_operation_to_upload_file
Conflicts:
src/com/owncloud/android/files/services/FileUploader.java
|
2013-12-16 13:26:45 +01:00 |
|
masensio
|
e76d4b00ef
|
OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks
|
2013-12-16 10:46:29 +01:00 |
|
David A. Velasco
|
dae42a11b4
|
Added seasonal icon for winter holidays
|
2013-12-10 13:41:47 +01:00 |
|
David A. Velasco
|
e1e2f547c5
|
Refactored local deletion to unify through FileDataStorageManager
|
2013-11-27 09:44:54 +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 |
|
masensio
|
515ec5e8dd
|
t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder
Conflicts:
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
|
2013-11-18 14:42:07 +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 |
|
masensio
|
4a4d78821a
|
OC-2107: Change validation name method: ValidateName and ValidatePath
|
2013-11-18 13:41:47 +01:00 |
|
masensio
|
b9808f6938
|
OC-1990: Isolate code from RenameFileOperation to remove dependecies on local storage. Filter invalid characters in fileName
|
2013-11-14 17:44:23 +01:00 |
|
masensio
|
15442976fe
|
Fix, creation of subdirectories
|
2013-11-14 17:18:33 +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
|
79ebc75dfa
|
Moved some classes from root package to .utils
|
2013-11-13 11:17:30 +01:00 |
|
David A. Velasco
|
89b37b7508
|
Merge branch 'develop' into refactor_remote_operation_to_create_folder
|
2013-11-12 15:22:36 +01:00 |
|
David A. Velasco
|
6da5d3c212
|
Refactored to build ownCloud app with oc_framework as dependency
|
2013-11-12 14:50:44 +01:00 |
|
David A. Velasco
|
cc39a76a90
|
Reviewed integration with sychronization framework to fix problems in Android 4.4
|
2013-11-11 10:08:16 +01:00 |
|
David A. Velasco
|
f51b688ff4
|
Removed requests for synchronization of account when account is changed or created
|
2013-11-08 14:01:34 +01:00 |
|
masensio
|
2be23eaec5
|
OC-1867: Remove package eu.alefzero.webdav
|
2013-11-06 18:01:31 +01:00 |
|
David A. Velasco
|
d252a09f53
|
Merge branch 'develop' into setup_buttons
|
2013-11-06 10:36:34 +01:00 |
|
masensio
|
4849affc6f
|
Update image buttons and remove CustomButton class
|
2013-10-30 17:29:22 +01:00 |
|
masensio
|
920b6f4ecc
|
Update preferences and style
|
2013-10-30 10:30:48 +01:00 |
|
masensio
|
c2abbaaedb
|
Merge branch 'develop' into setup_buttons
|
2013-10-29 14:13:24 +01:00 |
|
masensio
|
6ace8ab1c1
|
Update packageName
|
2013-10-29 14:10:42 +01:00 |
|
David A. Velasco
|
4160e7e256
|
Merge branch 'develop' into clean_up
|
2013-10-28 10:11:40 +01:00 |
|
masensio
|
7656cff3bb
|
Update package name
|
2013-10-24 18:12:00 +02:00 |
|
David A. Velasco
|
d0c9ad1091
|
Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects
|
2013-10-23 18:50:30 +02:00 |
|
David A. Velasco
|
69945d50fb
|
Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects
|
2013-10-23 18:44:20 +02: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
|
528db9b192
|
Removed unused menu a preference resources, and related code
|
2013-10-23 16:42:48 +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
|
f79e2c0430
|
Merge pull request #284 from owncloud/setup_app_name
Setup app name, optional settings, and availability of multiple accounts.
|
2013-10-22 05:15:21 -07:00 |
|
masensio
|
017f9429c8
|
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
|
2013-10-22 10:22:18 +02:00 |
|
masensio
|
673c884752
|
OC-1770: When deleting the account, log in screen is not shown
|
2013-10-22 10:17:09 +02:00 |
|
David A. Velasco
|
9060663f66
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-10-22 08:26:40 +02:00 |
|
David A. Velasco
|
bb45503376
|
Trigger synchronization of current folder when the app is started or the current account changed
|
2013-10-21 13:27:33 +02:00 |
|
David A. Velasco
|
e0dc1134f8
|
Check changes in eTag of folders BEFORE requesting their list of contents
|
2013-10-21 10:51:58 +02:00 |
|
David A. Velasco
|
966daf3b9e
|
Enforced check of local modification date when synchronizing file contents to avoid problems with apps triggering a wrong FileObserver#CLOSE_WRITE event
|
2013-10-18 13:24:56 +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
|
ea7f8fe491
|
Merge branch 'setup_colors' into setup_app_name
|
2013-10-18 12:24:29 +02:00 |
|
masensio
|
7488345470
|
OC-1663: Replace references to app_name in code
|
2013-10-17 16:54:43 +02:00 |
|
David A. Velasco
|
af62f9857d
|
Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection
|
2013-10-16 13:04:49 +02:00 |
|
masensio
|
9681b8687e
|
OC-1656: Disable/enable help-imprint-feedback options
|
2013-10-16 08:56:41 +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 |
|
masensio
|
9fcc118b8a
|
0C-1647: Enable/Disable Create Account option
|
2013-10-14 13:39:22 +02:00 |
|
David A. Velasco
|
d8de614d78
|
Some cleanup and methods renamed in FileDataStorageManager
|
2013-10-14 13:00:49 +02:00 |
|
David A. Velasco
|
5b8731873e
|
Removed interface DataStorageManager
|
2013-10-14 12:33:19 +02:00 |
|
masensio
|
b78eb416a4
|
OC-1670: owncloud_white --> background_color
|
2013-10-11 15:08:32 +02:00 |
|
masensio
|
10d1efa18d
|
OC-1580: Cancel upload
|
2013-10-11 14:54:40 +02:00 |
|
David A. Velasco
|
552a34689c
|
Avoid occasional crash in app updates due to 'lost' events from previous synchronizations
|
2013-10-11 10:50:11 +02:00 |
|
David A. Velasco
|
31ccf4e966
|
Improved navitagation through navigation list, reducing the number of requests to the server to refresh the target folder
|
2013-10-09 10:17:21 +02:00 |
|
David A. Velasco
|
ec85b4225e
|
The app goes directly to root folder when the current folder does not exist anymore after refreshing with server
|
2013-10-08 15:06:20 +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 |
|
David A. Velasco
|
fc2baec2f6
|
Fixed search of an existing current folder when the activity detects that the current folder does not exist any more
|
2013-10-08 11:17:20 +02:00 |
|
David A. Velasco
|
0aef684087
|
Fixed some crashes in refresh of current folder
|
2013-10-08 09:19:52 +02:00 |
|
David A. Velasco
|
23c9be24a2
|
Clean up of synchronization code
|
2013-10-04 15:07:05 +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
|
7c3fad35a3
|
Fixed behaviour when user enters in a folder deleted in the server before the app finishes to synchronize
|
2013-10-02 10:40:03 +02:00 |
|
masensio
|
df394c71be
|
OC-1507- Reopened. Browse up <
|
2013-10-01 13:43:52 +02:00 |
|
masensio
|
5ff0989eb4
|
Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into
|
2013-10-01 12:58:17 +02:00 |
|
masensio
|
a8fade7369
|
OC-1508: App crashes when changing the orientation
|
2013-10-01 12:56:28 +02:00 |
|
David A. Velasco
|
ea26ae4349
|
Check and creation for InstantUploads folder fixed and rewritten
|
2013-09-27 14:34:43 +02:00 |
|
masensio
|
9aa8babbe2
|
OC-1507: When you browse up, < is shown all the time in the top bar
|
2013-09-27 14:33:57 +02:00 |
|
masensio
|
aaf8043d0c
|
OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess
|
2013-09-25 18:38:17 +02:00 |
|
masensio
|
fdf2cae2ce
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-09-24 14:57:45 +02:00 |
|
masensio
|
e2e1e62e45
|
Changes from comments of PR
|
2013-09-24 14:54:46 +02:00 |
|
masensio
|
d6267698e8
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
Conflicts:
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
|
2013-09-20 10:19:44 +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
|
776c6f1ffd
|
OC-1230
|
2013-09-11 09:08:21 +02:00 |
|
masensio
|
e0b1e23e45
|
OC-1194: Adapt Sync Process using etag
|
2013-09-09 14:42:06 +02:00 |
|
masensio
|
50067ee42b
|
Fix bug: When you browses up, the folder and files dissapears
|
2013-09-04 10:25:27 +02:00 |
|
masensio
|
2948f1053e
|
OC-922: Synchronize folder, refresh folder size
|
2013-08-23 14:53:07 +02:00 |
|
masensio
|
472b360675
|
OC-922: Refresh of folder
|
2013-08-22 19:11:30 +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
|
b6213a0d5f
|
Fixed comments in PR#246
|
2013-08-22 11:48:57 +02:00 |
|
David A. Velasco
|
37297fb7a9
|
Fixed orientation changes in SSO dialog with WebView
|
2013-08-21 18:51:13 +02:00 |
|
masensio
|
55f2bd23e6
|
Move Shibboleth WebView to a big Dialog
|
2013-08-13 13:28:45 +02:00 |
|
masensio
|
9dacdbec0b
|
Move WebView to Dialog
|
2013-08-13 12:08:46 +02:00 |
|
David A. Velasco
|
5a65ff53c2
|
AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point
|
2013-07-26 13:05:01 +02:00 |
|
David A. Velasco
|
fffa77e211
|
Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay
|
2013-07-09 13:25:43 +02:00 |
|
masensio
|
a72d7bfe21
|
OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523
|
2013-07-09 13:20:52 +02:00 |
|
masensio
|
eee74aa5f2
|
OC-575: Update the size of a folder in DB during the sync. OC-523
|
2013-07-09 13:16:40 +02:00 |
|
masensio
|
50628c0c0b
|
OC-574: Show size in list from local database. OC-523
|
2013-07-09 13:04:40 +02:00 |
|
masensio
|
a52ff9359f
|
OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523
|
2013-07-05 14:54:02 +02:00 |
|
David A. Velasco
|
b708d46def
|
REALLY added imprint link in settings; imprint and help links protected for bad configuration of preferences.xml
|
2013-07-05 14:00:41 +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 |
|
masensio
|
994e81d7ce
|
OC-575: Update the size of a folder in DB during the sync. OC-523
|
2013-07-04 18:47:38 +02:00 |
|
masensio
|
0707f6cf71
|
OC-574: Show size in list from local database. OC-523
|
2013-07-04 10:34:57 +02:00 |
|
David A. Velasco
|
dcbc08cae7
|
Merge branch 'develop' into check_account_existance_in_gallery
|
2013-07-03 10:06:37 +02:00 |
|
David A. Velasco
|
e8239f434a
|
Merge branch 'develop' into modify_password
|
2013-07-02 13:08:27 +02:00 |
|
David A. Velasco
|
82375a917b
|
FIXED: right screen when the app is left in a video, the account is deleted, the orientation is changed, the app is opened and the account reloged-in
|
2013-07-02 12:41:10 +02:00 |
|
David A. Velasco
|
fb500a906c
|
Fixed lost of state of list of files in orientation changes
|
2013-06-28 13:35:03 +02:00 |
|