1164 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	4160e7e256	Merge branch 'develop' into clean_up	2013-10-28 10:11:40 +01:00
David A. Velasco	2ce3ed3133	Updated Chinese translation after fixing bug in version string	2013-10-28 10:10:04 +01:00
David A. Velasco	dde58b6e67	Merge pull request #289 from LukeOwncloud/jackrabbit ... update jackrabbit webdav lib to version 2.6.4	2013-10-28 01:04:09 -07:00
Luke Owncloud	5d236e31b1	bump to 2.6.4 for maven	2013-10-25 13:17:52 +02:00
Luke Owncloud	cfd78d4ed9	update to 2.6.4 (latest stable version)	2013-10-25 12:36:44 +02:00
Luke Owncloud	44acb753ef	update jackrabbit webdav lib to version 2.6.3	2013-10-25 12:26:20 +02:00
masensio	149af2e555	Merge pull request #269 from owncloud/refresh_folder_contents_when_browsed_into ... Refresh folder contents when browsed into	2013-10-24 07:33:01 -07: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	c217f7229b	Merge pull request #287 from LukeOwncloud/setup_md ... Setup.md updated.	2013-10-24 00:46:13 -07:00
Luke Owncloud	0021bc1c97	positive description about what app does	2013-10-24 09:40:03 +02:00
David A. Velasco	7eb82162b1	A new patch for concurrency in SynchronizeFolderOperations	2013-10-24 09:39:11 +02:00
Luke Owncloud	264186ea6b	"follow" instead of "obey"	2013-10-24 09:35:53 +02:00
Luke Owncloud	13da4e0e4b	mention contributor-agreement in SETUP.md	2013-10-24 09:20:13 +02:00
Luke Owncloud	6d83b3503b	Merge branch 'develop' of github.com:owncloud/android into setup_md	2013-10-24 09:19:03 +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	505221f597	Removed languages not mantained, including Chinese from Bulgary; really	2013-10-23 16:55:48 +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	65adf0a452	Removed unused layout resources	2013-10-23 16:27:28 +02:00
David A. Velasco	4aaf3f25b0	Removed unused drawable resources	2013-10-23 16:22:30 +02:00
David A. Velasco	a9f195a035	Updated translations without unused string resources	2013-10-23 13:17: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	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	fed7ee2d1a	Removed unreferenced string resources	2013-10-23 10:31:17 +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	75d58e44a6	Update data_folder value	2013-10-22 13:24:08 +02:00
masensio	865940064d	Merge branch 'contact_settings' into setup_app_name	2013-10-22 13:02:41 +02:00
masensio	01dcdc0672	OC-1797: Imprint is not shown --> FIXED	2013-10-22 13:02:14 +02:00
David A. Velasco	9d490aaab2	Grant consistency of size of folders with every update operation	2013-10-22 12:48:58 +02:00
masensio	aabdaee868	Merge branch 'setup_colors' into setup_app_name	2013-10-22 12:42:57 +02:00
masensio	d4b4dad2a8	OC-1795: Background connect button --> btn_default	2013-10-22 12:42:19 +02:00
masensio	6e0c536490	Merge branch 'setup_colors' into setup_app_name	2013-10-22 11:47:15 +02:00
masensio	47839208d7	OC-1794: Having the device in landscape mode the color is not completely changed --> FIXED	2013-10-22 11:41:36 +02:00
Luke Owncloud	e6f9fc1480	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	2013-10-22 11:13:55 +02:00
masensio	ab82a818d2	Merge branch 'setup_multiaccount' into setup_app_name	2013-10-22 10:27:28 +02:00
masensio	9610c61c9f	Delete Override onContentChanged method in AccountSelectActivity	2013-10-22 10:24:02 +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	4d9305f35f	Merge pull request #282 from LukeOwncloud/develop ... fix git update instructions	2013-10-21 02:56:16 -07:00
Luke Owncloud	6af47d271e	fix git update instructions	2013-10-21 11:40:20 +02:00