1192 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	fa1d9c4d1f	Merge branch 'develop' into review_build_process	2013-11-04 12:39:30 +01:00
David A. Velasco	57de0c0368	Merge branch 'develop' into review_build_process	2013-11-04 12:21:57 +01:00
Mr. Jenkins	4219511665	[tx-robot] updated from transifex	2013-11-04 05:57:20 -05:00
David A. Velasco	b3267c409b	Added workaround app project to environment setup files	2013-11-04 11:40:07 +01:00
Mr. Jenkins	bcb3f34d47	[tx-robot] updated from transifex	2013-11-03 11:32:25 -05:00
David A. Velasco	797d164184	Merge branch 'develop' into review_build_process	2013-10-31 17:30:38 +01:00
David A. Velasco	7335759b85	Translations updated after clean up of source language in Transifex	2013-10-31 17:26:51 +01:00
David A. Velasco	1c9f9d47d0	Merge pull request #292 from owncloud/clean_up ... Clean up: removed unused resources (specially strings and drawables)	2013-10-31 09:12:20 -07:00
David A. Velasco	bb34e0f480	Merge branch 'develop' into clean_up	2013-10-31 17:10:09 +01:00
David A. Velasco	cfa1b1744f	Merge branch 'develop' into review_build_process	2013-10-30 13:46:14 +01:00
Mr. Jenkins	0dbb1876fa	[tx-robot] updated from transifex	2013-10-30 01:39:00 -04:00
David A. Velasco	7e30ab281d	Removed unnecessary full namespaces	2013-10-29 14:39:56 +01:00
David A. Velasco	c75e5aa71c	Merge branch 'develop' into review_build_process	2013-10-29 13:56:27 +01:00
David A. Velasco	a103eb3f96	Included in setup.xml the background color for logo in login view	2013-10-29 11:12:57 +01:00
Mr. Jenkins	dd9da1a1af	[tx-robot] updated from transifex	2013-10-29 05:35:45 -04:00
David A. Velasco	ae179c4686	Merge branch 'develop' into review_build_process	2013-10-28 14:31:05 +01:00
David A. Velasco	5e30465704	Revert "update jackrabbit webdav lib to version 2.6.3" ... This reverts commit 44acb753ef.	2013-10-28 14:24:18 +01:00
David A. Velasco	7e8fbc56f5	Revert "update to 2.6.4 (latest stable version)" ... This reverts commit cfd78d4ed9.	2013-10-28 14:24:14 +01:00
David A. Velasco	c3bf2fb242	Revert "bump to 2.6.4 for maven" ... This reverts commit 5d236e31b1.	2013-10-28 14:24:04 +01:00
David A. Velasco	a6807cb93e	Merge branch 'develop' into review_build_process	2013-10-28 13:22:06 +01:00
David A. Velasco	c3b2451b37	Fixed replacement markers in Portuguese from Brazil	2013-10-28 13:20:58 +01:00
David A. Velasco	4a038acdd2	Fixed references to old string, now removed	2013-10-28 13:20:24 +01:00
David A. Velasco	586ef8ad2d	Merge branch 'develop' into review_build_process	2013-10-28 12:52:20 +01:00
David A. Velasco	ea26174440	Added name to build.xml for ActionBarSherlock and fixed calls to git in Windows	2013-10-28 12:49:28 +01:00
Mr. Jenkins	5af4eda38a	[tx-robot] updated from transifex	2013-10-28 07:11:55 -04:00
Mr. Jenkins	e0e51f5dbe	[tx-robot] updated from transifex	2013-10-28 06:26:38 -04:00
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
David A. Velasco	a34423d367	Removed problematic target assignation in setup_env.bat, and improved setup of test project to avoid change of folders	2013-10-25 14:50:28 +02: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
David A. Velasco	56645d9640	Removed urls.xml and moved last URLs to setup.xml	2013-10-25 09:44:26 +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