David A. Velasco
|
3a02de8c90
|
Adapted ownCloud app to changes in ownCloud library interface
|
2014-01-29 17:36:44 +01:00 |
|
David A. Velasco
|
5db7b8e6f6
|
Report an error to the user in log in view when the access to the user name in the server fails
|
2014-01-29 12:51:48 +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
|
6361dd0a26
|
OC-2746: Changes from comments in PR#1 in android-library repo
|
2014-01-29 10:18:35 +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
|
36d4f3d465
|
OC-2746: Changes from comments in PR#361
|
2014-01-28 13:39:49 +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 |
|
David A. Velasco
|
d3ad9a4482
|
Fixed bug preventing that right modification time is saved in downloads
|
2014-01-24 14:22:05 +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 |
|
David A. Velasco
|
195256194e
|
Fixed crash in synchronization of kept-in-sync files triggered by browsing
|
2014-01-23 12:37:01 +01:00 |
|
masensio
|
e2f7394557
|
OC-2586: Parse the xml Share response from the server
|
2014-01-23 12:03:36 +01:00 |
|
David A. Velasco
|
1a3f202ac8
|
Fixed wrong index to substring
|
2014-01-22 18:39:34 +01:00 |
|
David A. Velasco
|
85809fc2d2
|
Fixed file name shown in the upload and download notifications (not full path)
|
2014-01-22 18:36:52 +01:00 |
|
masensio
|
576de8a8bc
|
OC-2586: Fix problem in mFileProjectionMap
|
2014-01-22 13:02:27 +01:00 |
|
masensio
|
0368e8fa54
|
OC-2489: Add GetRemoteSharedFilesOperation
|
2014-01-21 14:12:46 +01:00 |
|
masensio
|
747a39cf7d
|
OC-2489: New ShareRemoteFile, to get data from the server. ShareType in library
|
2014-01-21 09:20:32 +01:00 |
|
masensio
|
0723ae4b09
|
OC-2584: Detect if the server supports the Share API. This Check is in OwnCloudServerCheckOperation
|
2014-01-20 14:27:09 +01:00 |
|
David A. Velasco
|
1e68dccd8b
|
Library updated with final names (project and packages)
|
2014-01-20 11:59:41 +01:00 |
|
masensio
|
2da9af3871
|
Merge branch 'develop' into share_link_show_shared_files
|
2014-01-20 11:36:10 +01:00 |
|
masensio
|
8587f644e7
|
Create OCShare object
|
2014-01-20 11:32:40 +01:00 |
|
David A. Velasco
|
3f4e615d5e
|
Merge branch 'develop' into oc_framework_cleanup_and_documentation
|
2014-01-20 09:24:44 +01:00 |
|
masensio
|
1d70ae81ea
|
OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user
|
2014-01-17 15:12:12 +01:00 |
|
masensio
|
10dac35232
|
OC-2633: Fixes for comments in code. PR #347
|
2014-01-17 14:20:00 +01:00 |
|
masensio
|
99817da42b
|
OC-2305: Create OCShares table on Database
|
2014-01-17 12:38:41 +01:00 |
|
masensio
|
7aeda0b4dc
|
OC-2582: Add methods isFileShareByLink and getFilePublicLink to FileDataStorageManager
|
2014-01-16 16:55:10 +01:00 |
|
masensio
|
b038cac0cd
|
OC-2581: Add to filelist: shared_by_link(boolean) and public_link(string)
|
2014-01-16 12:55:21 +01:00 |
|
David A. Velasco
|
af6815a14b
|
Fixed DownloadRemoteOperation to use real total transfer size and to simplify constructor
|
2014-01-15 11:48:10 +01:00 |
|
masensio
|
ea18765828
|
OC-2465: review code
|
2014-01-15 10:52:06 +01:00 |
|
David A. Velasco
|
690c1bf128
|
Removed unused methoed OnDatatransferProgressListener#onTransferProgress(long)
|
2014-01-15 10:41:37 +01:00 |
|
masensio
|
8f0128cbab
|
OC-2541: Adapt the code the new saml implementation. Get the username from OCS-API
|
2014-01-14 11:06:03 +01:00 |
|
masensio
|
fe6ab707e4
|
OC-2465: Move getUserNameForSamlSso to AccountUtils in oc_framework
|
2014-01-09 11:07:54 +01:00 |
|
masensio
|
f4dc4e45f8
|
Merge branch 'develop' into refactor_remote_saml_authentication
|
2014-01-09 10:04:04 +01:00 |
|
masensio
|
c535af9942
|
OC-2465: Move SsoWebViewClient to oc_framework
|
2014-01-09 10:01:54 +01:00 |
|
David A. Velasco
|
56fa4445e8
|
Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
Fixed pincode request in instant uploads
|
2014-01-08 09:12:06 -08:00 |
|
David A. Velasco
|
70e6c2136a
|
Replaced last call to PropFindMethod in app with ReadRemoteFileOperation
|
2014-01-08 17:58:04 +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
|
5dc172cd6c
|
OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it
|
2014-01-07 13:10:53 +01:00 |
|
masensio
|
44e3288168
|
Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
src/com/owncloud/android/utils/FileStorageUtils.java
|
2014-01-07 10:16:39 +01:00 |
|
masensio
|
842c08954b
|
Clean some import warnings
|
2013-12-19 09:30:27 +01:00 |
|
masensio
|
685c26589b
|
Changes from comments in PR #337
|
2013-12-19 09:24:28 +01:00 |
|
masensio
|
71430eb7b1
|
Merge branch 'develop' into refactor_remote_operation_to_download_file
Conflicts:
oc_framework-test-project/AndroidManifest.xml
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
|
2013-12-18 10:04:42 +01:00 |
|
masensio
|
64ddaf8d9a
|
OC-2333: Complete Unit Tests
|
2013-12-18 09:02:56 +01:00 |
|
masensio
|
772721ab9a
|
OC-2397: Fix bug: file doesn't refresh wwhen you select to refresh after change it
|
2013-12-16 15:09:27 +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
|
07b82ef42f
|
Merge branch 'develop' into refactor_remote_operation_to_read_file
|
2013-12-16 10:52:48 +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
|
415c3867c4
|
Fixed propagation of download progress to download notifications
|
2013-12-13 12:34:43 +01:00 |
|
David A. Velasco
|
f33e416bf3
|
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
|
2013-12-12 17:25:54 +01:00 |
|
David A. Velasco
|
7392b6e62e
|
Added seasonal icon for winter holidays
|
2013-12-12 17:25:53 +01:00 |
|
masensio
|
dc1ea137a2
|
OC-2332: Isolate code to the upload a file to remove local dependences
|
2013-12-12 14:44:33 +01:00 |
|
masensio
|
d38a69abc1
|
OC-2332: rewrite getAvailableRemotePath from UpdateFileOperation, using ExistenceCeheckRemoteOperation instead of WebClient#existsFile
|
2013-12-12 12:37:36 +01:00 |
|
masensio
|
2246c27a8b
|
OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class
|
2013-12-12 10:48:06 +01:00 |
|
David A. Velasco
|
e6bc38eaac
|
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
|
2013-12-11 18:48:56 +01:00 |
|
masensio
|
6846e76912
|
OC-2327: Isolate the code for Download a file
|
2013-12-10 13:43:44 +01:00 |
|
David A. Velasco
|
dae42a11b4
|
Added seasonal icon for winter holidays
|
2013-12-10 13:41:47 +01:00 |
|
masensio
|
c344de7b81
|
Remove fillOcFile from SyncronizeFolderOperation
|
2013-12-04 10:29:10 +01:00 |
|
masensio
|
39c2fffbfe
|
Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
|
2013-12-02 12:40:29 +01:00 |
|
masensio
|
26f68e0eac
|
OC-2280: Isolate the code for ReadFile (PROPFIND 0) to remove local dependences
|
2013-11-29 14:16:21 +01:00 |
|
David A. Velasco
|
f0dd05ddc4
|
Merge getFile and getData methods of RemoteOperationResult in a single one
|
2013-11-29 10:30:53 +01:00 |
|
masensio
|
9a8b89bea1
|
OC-2256: Adapt Unit Test to the new result
|
2013-11-28 13:33:05 +01:00 |
|
masensio
|
007ca522ec
|
OC-2256: New RemoteFile class
|
2013-11-28 13:03:33 +01:00 |
|
masensio
|
5aaa4e10e8
|
Merge branch 'develop' into refactor_remote_operation_to_read_folder
Conflicts:
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
|
2013-11-27 14:50:16 +01:00 |
|
David A. Velasco
|
e1e2f547c5
|
Refactored local deletion to unify through FileDataStorageManager
|
2013-11-27 09:44:54 +01:00 |
|
David A. Velasco
|
35602ae668
|
Removed unneeded comments
|
2013-11-27 09:21:20 +01:00 |
|
masensio
|
526a42a11b
|
OC-2202: Change old Read method by new ReadRemoteFileOperation
|
2013-11-25 14:50:16 +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
|
9809c0d3db
|
OC-2164: Isolate code from RemoveFileOperation. Include new RemoveRemoteFileOperation in library
|
2013-11-22 13:30:09 +01:00 |
|
David A. Velasco
|
04327e1f16
|
Small tweaks in rename operation
|
2013-11-19 12:11:07 +01:00 |
|
masensio
|
0b95d61cec
|
OC-2115: Validate Path in RenameRemoteFileOperation
|
2013-11-19 09:07:11 +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
|
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 |
|
masensio
|
4a4d78821a
|
OC-2107: Change validation name method: ValidateName and ValidatePath
|
2013-11-18 13:41:47 +01:00 |
|
masensio
|
f780062616
|
FIX OC-2101: App crash when renaming a folder while the server is down or without internet connection
|
2013-11-18 12:07:54 +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 |
|
David A. Velasco
|
bd90abedfb
|
Improved reaction when events about kept-in-sync files are received
|
2013-11-14 17:24:54 +01:00 |
|
masensio
|
f299079851
|
Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder
Conflicts:
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
|
2013-11-14 17:23:25 +01:00 |
|
masensio
|
15442976fe
|
Fix, creation of subdirectories
|
2013-11-14 17:18:33 +01:00 |
|
masensio
|
9b79ed71c3
|
OC-1990: Isolate code RenameRemoteFileOperation
|
2013-11-14 17:02:38 +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
|
44ffdc3fb1
|
Merge branch 'develop' into refactor_remote_operation_to_create_folder
|
2013-11-13 09:44:25 +01:00 |
|
David A. Velasco
|
da7ea9b8d9
|
Fixed initialization of database tracking pending instant uploads
|
2013-11-13 09:33:19 +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 |
|
masensio
|
112b44188e
|
OC-1865: Isolate code from CreateFolderOperation to remove dependencies on local storage
|
2013-11-06 17:55:11 +01:00 |
|
David A. Velasco
|
a0efedc99d
|
Merge branch 'develop' into setup_buttons
|
2013-11-06 11:43:22 +01:00 |
|
David A. Velasco
|
850a3dd09a
|
Let setting up the visibility of the link for new users in the login view
|
2013-11-06 11:30:15 +01:00 |
|
David A. Velasco
|
d252a09f53
|
Merge branch 'develop' into setup_buttons
|
2013-11-06 10:36:34 +01:00 |
|
masensio
|
67a7d8a303
|
OC-1866: new class com.owncloud.android.operations.remote.CreateRemoteFolderOperation
|
2013-11-05 14:52:49 +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 |
|
masensio
|
dd59f5871c
|
OC-1833: Add CustomButton class to can change the background of buttons
|
2013-10-28 12:58:56 +01:00 |
|
David A. Velasco
|
4160e7e256
|
Merge branch 'develop' into clean_up
|
2013-10-28 10:11:40 +01:00 |
|
masensio
|
6e21c84026
|
Customize buttons
|
2013-10-25 15:06:10 +02:00 |
|
masensio
|
3889bea7c9
|
Update Social Links
|
2013-10-25 11:09:21 +02:00 |
|
masensio
|
7656cff3bb
|
Update package name
|
2013-10-24 18:12:00 +02:00 |
|
David A. Velasco
|
e16f63591d
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-10-24 16:31:56 +02:00 |
|
David A. Velasco
|
b919ef8438
|
Reset in policy of synchronization for full account: etag is ignored to decide if sync children folders
|
2013-10-24 12:47:21 +02:00 |
|
David A. Velasco
|
7eb82162b1
|
A new patch for concurrency in SynchronizeFolderOperations
|
2013-10-24 09:39:11 +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
|
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
|
5d6ba2495a
|
Removed unused code for ownCloud extensions and strings related
|
2013-10-23 11:15:44 +02:00 |
|
David A. Velasco
|
84831fb1c8
|
Removed more code and string about unused location tracking
|
2013-10-23 11:09:59 +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 |
|
David A. Velasco
|
9d490aaab2
|
Grant consistency of size of folders with every update operation
|
2013-10-22 12:48:58 +02: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
|
5b6475cc84
|
Keep saved the calculated size of child-folders when a folders is refreshed
|
2013-10-21 12:14:44 +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 |
|
David A. Velasco
|
e3be4babaf
|
Disable eTag as a criteria for synchronization of file contents
|
2013-10-18 13:16:26 +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 |
|
David A. Velasco
|
7c9d9e7b3a
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-10-18 12:28:09 +02:00 |
|
masensio
|
ea7f8fe491
|
Merge branch 'setup_colors' into setup_app_name
|
2013-10-18 12:24:29 +02:00 |
|
masensio
|
194a7360f8
|
Merge branch 'develop' into release-1.4.6
|
2013-10-18 10:33:26 +02:00 |
|
David A. Velasco
|
db026d8a91
|
Added depth parameters to ervery PROPFIND method
|
2013-10-18 10:22:16 +02:00 |
|
David A. Velasco
|
8bd6f85e22
|
Fixed update of size in folders when browsing down and up through new folders in servers
|
2013-10-18 10:08:24 +02:00 |
|
masensio
|
6d17810140
|
Update serialVersionUIDs and version name/number
|
2013-10-18 09:01:17 +02:00 |
|
masensio
|
7488345470
|
OC-1663: Replace references to app_name in code
|
2013-10-17 16:54:43 +02:00 |
|
masensio
|
db1ea01561
|
Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection
Fix fails in uploads after fall and rise of network connection
|
2013-10-16 05:26:02 -07: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 |
|
David A. Velasco
|
47b7a164de
|
Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into
|
2013-10-14 14:55:50 +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 |
|