1315 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
masensio	186aeca43b	Update images	2013-10-31 17:25:12 +01:00
masensio	3338f86be1	Update comment	2013-10-31 17:20:00 +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
masensio	39688fe30f	Remove custom_buttons option from setup.xml. Review account_setup and pincodelock	2013-10-31 16:59:38 +01:00
masensio	20b5ecbac1	Update images. New Styles for Buttons, Dropdown and Progress	2013-10-30 18:37:05 +01:00
masensio	4849affc6f	Update image buttons and remove CustomButton class	2013-10-30 17:29:22 +01:00
David A. Velasco	cfa1b1744f	Merge branch 'develop' into review_build_process	2013-10-30 13:46:14 +01:00
masensio	920b6f4ecc	Update preferences and style	2013-10-30 10:30:48 +01:00
masensio	19e065538b	Update setup	2013-10-30 10:24:15 +01:00
masensio	cc10cce87c	Update Strings (values-es)	2013-10-30 10:20:41 +01:00
masensio	ebbc8f2ead	Update images	2013-10-30 09:08:02 +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
masensio	e86d7cd9b4	Update setup and strings	2013-10-29 14:36:09 +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
David A. Velasco	c75e5aa71c	Merge branch 'develop' into review_build_process	2013-10-29 13:56:27 +01:00
masensio	ab946b9af6	Adding default images for dropdown and indeterminate_progress in ActionBar	2013-10-29 13:18:49 +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
masensio	2c1b67e143	OC-1832: Customize dropdown and spinner in ActionBar	2013-10-29 10:33:30 +01: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
masensio	b3752166e4	OC-1833: New color button_text_color in setup.xml	2013-10-28 13:38:15 +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
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	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
masensio	6e21c84026	Customize buttons	2013-10-25 15:06:10 +02: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
masensio	a22ca4f4a2	Fix error in AndroidManifest	2013-10-25 14:08:52 +02:00
masensio	de9b09fd3b	Update colors	2013-10-25 13:55:15 +02:00
Luke Owncloud	5d236e31b1	bump to 2.6.4 for maven	2013-10-25 13:17:52 +02:00