David A. Velasco [Tue, 29 Oct 2013 10:12:57 +0000 (11:12 +0100)]
Included in setup.xml the background color for logo in login view
David A. Velasco [Mon, 28 Oct 2013 13:31:05 +0000 (14:31 +0100)]
Merge branch 'develop' into review_build_process
David A. Velasco [Mon, 28 Oct 2013 13:24:18 +0000 (14:24 +0100)]
Revert "update jackrabbit webdav lib to version 2.6.3"
This reverts commit
44acb753ef34fa40f31d74818341955f2816ec15.
David A. Velasco [Mon, 28 Oct 2013 13:24:14 +0000 (14:24 +0100)]
Revert "update to 2.6.4 (latest stable version)"
This reverts commit
cfd78d4ed9b2810de02eb9c84aab274f2a33cba5.
David A. Velasco [Mon, 28 Oct 2013 13:24:04 +0000 (14:24 +0100)]
Revert "bump to 2.6.4 for maven"
This reverts commit
5d236e31b175790204856afffb7b23ad1a19a078.
David A. Velasco [Mon, 28 Oct 2013 12:22:06 +0000 (13:22 +0100)]
Merge branch 'develop' into review_build_process
David A. Velasco [Mon, 28 Oct 2013 12:20:58 +0000 (13:20 +0100)]
Fixed replacement markers in Portuguese from Brazil
David A. Velasco [Mon, 28 Oct 2013 12:20:24 +0000 (13:20 +0100)]
Fixed references to old string, now removed
David A. Velasco [Mon, 28 Oct 2013 11:52:20 +0000 (12:52 +0100)]
Merge branch 'develop' into review_build_process
David A. Velasco [Mon, 28 Oct 2013 11:49:28 +0000 (12:49 +0100)]
Added name to build.xml for ActionBarSherlock and fixed calls to git in Windows
Mr. Jenkins [Mon, 28 Oct 2013 11:11:55 +0000 (07:11 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Mon, 28 Oct 2013 10:26:38 +0000 (06:26 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 28 Oct 2013 08:04:09 +0000 (01:04 -0700)]
Merge pull request #289 from LukeOwncloud/jackrabbit
update jackrabbit webdav lib to version 2.6.4
David A. Velasco [Fri, 25 Oct 2013 12:50:28 +0000 (14:50 +0200)]
Removed problematic target assignation in setup_env.bat, and improved setup of test project to avoid change of folders
Luke Owncloud [Fri, 25 Oct 2013 11:17:52 +0000 (13:17 +0200)]
bump to 2.6.4 for maven
Luke Owncloud [Fri, 25 Oct 2013 10:36:44 +0000 (12:36 +0200)]
update to 2.6.4 (latest stable version)
Luke Owncloud [Fri, 25 Oct 2013 10:26:20 +0000 (12:26 +0200)]
update jackrabbit webdav lib to version 2.6.3
David A. Velasco [Fri, 25 Oct 2013 07:44:26 +0000 (09:44 +0200)]
Removed urls.xml and moved last URLs to setup.xml
masensio [Thu, 24 Oct 2013 14:33:01 +0000 (07:33 -0700)]
Merge pull request #269 from owncloud/refresh_folder_contents_when_browsed_into
Refresh folder contents when browsed into
David A. Velasco [Thu, 24 Oct 2013 14:31:56 +0000 (16:31 +0200)]
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
David A. Velasco [Thu, 24 Oct 2013 10:47:21 +0000 (12:47 +0200)]
Reset in policy of synchronization for full account: etag is ignored to decide if sync children folders
David A. Velasco [Thu, 24 Oct 2013 07:46:13 +0000 (00:46 -0700)]
Merge pull request #287 from LukeOwncloud/setup_md
Setup.md updated.
Luke Owncloud [Thu, 24 Oct 2013 07:40:03 +0000 (09:40 +0200)]
positive description about what app does
David A. Velasco [Thu, 24 Oct 2013 07:39:11 +0000 (09:39 +0200)]
A new patch for concurrency in SynchronizeFolderOperations
Luke Owncloud [Thu, 24 Oct 2013 07:35:53 +0000 (09:35 +0200)]
"follow" instead of "obey"
Luke Owncloud [Thu, 24 Oct 2013 07:20:13 +0000 (09:20 +0200)]
mention contributor-agreement in SETUP.md
Luke Owncloud [Thu, 24 Oct 2013 07:19:03 +0000 (09:19 +0200)]
Merge branch 'develop' of github.com:owncloud/android into setup_md
David A. Velasco [Wed, 23 Oct 2013 16:44:20 +0000 (18:44 +0200)]
Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects
David A. Velasco [Wed, 23 Oct 2013 16:44:20 +0000 (18:44 +0200)]
Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects
David A. Velasco [Wed, 23 Oct 2013 15:35:07 +0000 (17:35 +0200)]
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
David A. Velasco [Wed, 23 Oct 2013 10:48:55 +0000 (12:48 +0200)]
Replace 'ownCloud' with reference to app_name
David A. Velasco [Tue, 22 Oct 2013 12:15:21 +0000 (05:15 -0700)]
Merge pull request #284 from owncloud/setup_app_name
Setup app name, optional settings, and availability of multiple accounts.
masensio [Tue, 22 Oct 2013 11:24:08 +0000 (13:24 +0200)]
Update data_folder value
masensio [Tue, 22 Oct 2013 11:02:41 +0000 (13:02 +0200)]
Merge branch 'contact_settings' into setup_app_name
masensio [Tue, 22 Oct 2013 11:02:14 +0000 (13:02 +0200)]
OC-1797: Imprint is not shown --> FIXED
David A. Velasco [Tue, 22 Oct 2013 10:48:58 +0000 (12:48 +0200)]
Grant consistency of size of folders with every update operation
masensio [Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Tue, 22 Oct 2013 10:42:19 +0000 (12:42 +0200)]
OC-1795: Background connect button --> btn_default
masensio [Tue, 22 Oct 2013 09:47:15 +0000 (11:47 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Tue, 22 Oct 2013 09:41:36 +0000 (11:41 +0200)]
OC-1794: Having the device in landscape mode the color is not completely changed --> FIXED
Luke Owncloud [Tue, 22 Oct 2013 09:13:55 +0000 (11:13 +0200)]
added first line of PR https://github.com/owncloud/android/pull/219
fixing issue pointed out by dper:
https://github.com/owncloud/android/pull/219#issuecomment-
26715595
masensio [Tue, 22 Oct 2013 08:27:28 +0000 (10:27 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
masensio [Tue, 22 Oct 2013 08:24:02 +0000 (10:24 +0200)]
Delete Override onContentChanged method in AccountSelectActivity
masensio [Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
masensio [Tue, 22 Oct 2013 08:17:09 +0000 (10:17 +0200)]
OC-1770: When deleting the account, log in screen is not shown
David A. Velasco [Tue, 22 Oct 2013 06:26:40 +0000 (08:26 +0200)]
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
David A. Velasco [Mon, 21 Oct 2013 11:27:33 +0000 (13:27 +0200)]
Trigger synchronization of current folder when the app is started or the current account changed
David A. Velasco [Mon, 21 Oct 2013 10:14:44 +0000 (12:14 +0200)]
Keep saved the calculated size of child-folders when a folders is refreshed
David A. Velasco [Mon, 21 Oct 2013 09:56:16 +0000 (02:56 -0700)]
Merge pull request #282 from LukeOwncloud/develop
fix git update instructions
Luke Owncloud [Mon, 21 Oct 2013 09:40:20 +0000 (11:40 +0200)]
fix git update instructions
David A. Velasco [Mon, 21 Oct 2013 08:51:58 +0000 (10:51 +0200)]
Check changes in eTag of folders BEFORE requesting their list of contents
David A. Velasco [Mon, 21 Oct 2013 08:33:29 +0000 (01:33 -0700)]
Merge pull request #281 from LukeOwncloud/develop
Enable building with Maven .
Luke Owncloud [Mon, 21 Oct 2013 07:29:05 +0000 (09:29 +0200)]
enabled project for building with maven (eclipse building stays untouched)
added/updated compile instructions in setup.md
added some eclipse generated files to .gitignore
masensio [Fri, 18 Oct 2013 13:00:16 +0000 (15:00 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Fri, 18 Oct 2013 12:59:42 +0000 (14:59 +0200)]
OC-1769: Modify background_color and login_background_color works fine
David A. Velasco [Fri, 18 Oct 2013 11:24:56 +0000 (13:24 +0200)]
Enforced check of local modification date when synchronizing file contents to avoid problems with apps triggering a wrong FileObserver#CLOSE_WRITE event
David A. Velasco [Fri, 18 Oct 2013 11:16:26 +0000 (13:16 +0200)]
Disable eTag as a criteria for synchronization of file contents
masensio [Fri, 18 Oct 2013 10:42:00 +0000 (12:42 +0200)]
Merge branch 'contact_settings' into setup_app_name
Conflicts:
res/values/setup.xml
masensio [Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)]
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
David A. Velasco [Fri, 18 Oct 2013 10:28:09 +0000 (12:28 +0200)]
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
masensio [Fri, 18 Oct 2013 10:24:29 +0000 (12:24 +0200)]
Merge branch 'setup_colors' into setup_app_name
masensio [Fri, 18 Oct 2013 10:17:37 +0000 (12:17 +0200)]
update strings to transifex
masensio [Fri, 18 Oct 2013 08:33:26 +0000 (10:33 +0200)]
Merge branch 'develop' into release-1.4.6
masensio [Fri, 18 Oct 2013 08:31:48 +0000 (01:31 -0700)]
Merge pull request #278 from owncloud/fix_synchronization_after_addition_of_infinite_propfind_in_server
Added depth parameters to ervery PROPFIND method
David A. Velasco [Fri, 18 Oct 2013 08:22:16 +0000 (10:22 +0200)]
Added depth parameters to ervery PROPFIND method
masensio [Fri, 18 Oct 2013 08:15:55 +0000 (10:15 +0200)]
Delete maxSdkVersion=17 for workaround
David A. Velasco [Fri, 18 Oct 2013 08:08:24 +0000 (10:08 +0200)]
Fixed update of size in folders when browsing down and up through new folders in servers
masensio [Fri, 18 Oct 2013 07:01:17 +0000 (09:01 +0200)]
Update serialVersionUIDs and version name/number
masensio [Thu, 17 Oct 2013 16:20:38 +0000 (18:20 +0200)]
Merge branch 'transifex' into setup_app_name
Conflicts:
res/values-ko/strings.xml
res/values-lt-rLT/strings.xml
res/values-tr/strings.xml
masensio [Thu, 17 Oct 2013 16:07:13 +0000 (18:07 +0200)]
Update transifex strings
masensio [Thu, 17 Oct 2013 14:54:43 +0000 (16:54 +0200)]
OC-1663: Replace references to app_name in code
masensio [Wed, 16 Oct 2013 12:26:02 +0000 (05:26 -0700)]
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
David A. Velasco [Wed, 16 Oct 2013 11:04:49 +0000 (13:04 +0200)]
Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection
masensio [Wed, 16 Oct 2013 07:37:28 +0000 (09:37 +0200)]
OC-1662: app_name to setup.xml
masensio [Wed, 16 Oct 2013 06:56:41 +0000 (08:56 +0200)]
OC-1656: Disable/enable help-imprint-feedback options
masensio [Tue, 15 Oct 2013 12:07:59 +0000 (14:07 +0200)]
Merge branch 'develop' into contact_settings
Conflicts:
res/values/strings.xml
masensio [Tue, 15 Oct 2013 11:26:20 +0000 (13:26 +0200)]
OC-1730: Update Images
masensio [Tue, 15 Oct 2013 09:32:46 +0000 (11:32 +0200)]
OC-1668: Block creation of account from device settings
David A. Velasco [Mon, 14 Oct 2013 12:55:50 +0000 (14:55 +0200)]
Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into
masensio [Mon, 14 Oct 2013 11:39:22 +0000 (13:39 +0200)]
0C-1647: Enable/Disable Create Account option
David A. Velasco [Mon, 14 Oct 2013 11:00:49 +0000 (13:00 +0200)]
Some cleanup and methods renamed in FileDataStorageManager
masensio [Mon, 14 Oct 2013 10:55:21 +0000 (12:55 +0200)]
OC-1646: Adding multiaccount_support property
masensio [Mon, 14 Oct 2013 10:48:26 +0000 (12:48 +0200)]
OC-1701: Conflict detected in keep-in-sync
David A. Velasco [Mon, 14 Oct 2013 10:33:19 +0000 (12:33 +0200)]
Removed interface DataStorageManager
masensio [Fri, 11 Oct 2013 13:14:41 +0000 (15:14 +0200)]
OC-1671: ActionBar Color
masensio [Fri, 11 Oct 2013 13:08:32 +0000 (15:08 +0200)]
OC-1670: owncloud_white --> background_color
masensio [Fri, 11 Oct 2013 12:54:40 +0000 (14:54 +0200)]
OC-1580: Cancel upload
masensio [Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)]
Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
David A. Velasco [Fri, 11 Oct 2013 08:50:11 +0000 (10:50 +0200)]
Avoid occasional crash in app updates due to 'lost' events from previous synchronizations
David A. Velasco [Wed, 9 Oct 2013 08:17:21 +0000 (10:17 +0200)]
Improved navitagation through navigation list, reducing the number of requests to the server to refresh the target folder
David A. Velasco [Tue, 8 Oct 2013 13:06:20 +0000 (15:06 +0200)]
The app goes directly to root folder when the current folder does not exist anymore after refreshing with server
David A. Velasco [Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)]
Merge branch 'develop' into release-1.4.6
David A. Velasco [Tue, 8 Oct 2013 09:24:15 +0000 (11:24 +0200)]
Included name of the 'lost' folder in the toast warning about current folder removed in the server
David A. Velasco [Tue, 8 Oct 2013 09:17:20 +0000 (11:17 +0200)]
Fixed search of an existing current folder when the activity detects that the current folder does not exist any more
David A. Velasco [Tue, 8 Oct 2013 07:19:52 +0000 (09:19 +0200)]
Fixed some crashes in refresh of current folder
David A. Velasco [Tue, 8 Oct 2013 06:52:14 +0000 (08:52 +0200)]
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
masensio [Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)]
Merge branch 'develop' into release-1.4.6
masensio [Mon, 7 Oct 2013 12:03:41 +0000 (05:03 -0700)]
Merge pull request #267 from owncloud/fixed_permanent_redirections
Fixed permanent redirections
David A. Velasco [Mon, 7 Oct 2013 12:00:02 +0000 (14:00 +0200)]
Removed useless log
David A. Velasco [Mon, 7 Oct 2013 10:01:15 +0000 (12:01 +0200)]
Prevent double count of transfer progress when part of an upload is resend
projects / pub / Android / ownCloud.git / log