David A. Velasco
|
4160e7e256
|
Merge branch 'develop' into clean_up
|
2013-10-28 10:11:40 +01: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 |
|
masensio
|
98d95b576e
|
OC-1701: Conflict detected in keep-in-sync
|
2013-10-14 12:48:26 +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 |
|