687 commits

Author	SHA1	Message	Date
Mr. Jenkins	9cc8efc369	[tx-robot] updated from transifex	2014-04-08 01:15:33 -04:00
Mr. Jenkins	903bf0286e	[tx-robot] updated from transifex	2014-04-07 01:15:11 -04:00
Mr. Jenkins	e573a7066e	[tx-robot] updated from transifex	2014-04-06 01:15:09 -04:00
Mr. Jenkins	e0d4f3cab7	[tx-robot] updated from transifex	2014-04-05 01:15:10 -04:00
Mr. Jenkins	a391f987ae	[tx-robot] updated from transifex	2014-04-04 01:15:17 -04:00
masensio	bd8e442d3a	Merge branch 'develop' into improve_action_bar_pr_392_with_develop	2014-04-03 11:11:13 +02:00
masensio	7a9149a66a	Merge pull request #392 from pmarasse/pullup ... Modified actionbar to allow display of icon+text on tablets	2014-04-03 11:02:54 +02:00
masensio	d164646e28	On any device, any orientation, show the icons for Upload and New folder directly in the bar.	2014-04-03 10:08:57 +02:00
Mr. Jenkins	9587c90abf	[tx-robot] updated from transifex	2014-04-03 01:15:14 -04:00
masensio	6fead9dd7f	Add different action bar configuration for landscape and portrait	2014-04-02 11:19:42 +02:00
masensio	c3da11d244	Revert "Add different action bar configuration for landscape and portrait" ... This reverts commit 6dde4ddd3a.	2014-04-02 11:19:08 +02:00
masensio	6dde4ddd3a	Add different action bar configuration for landscape and portrait	2014-04-02 11:15:05 +02:00
masensio	b50072b019	Merge branch 'develop' into improve_action_bar_pr_392_with_develop	2014-04-02 10:45:52 +02:00
Mr. Jenkins	1037fd1b08	[tx-robot] updated from transifex	2014-04-02 01:15:13 -04:00
Mr. Jenkins	8a0f4fc032	[tx-robot] updated from transifex	2014-04-01 01:15:10 -04:00
masensio	f7bc72f21d	Replace 'directory' by 'folder' in strings.xml	2014-03-31 10:36:56 +02:00
masensio	5f4b46015f	Update string: 'New folder' instead of 'Create directory'	2014-03-31 10:32:49 +02:00
masensio	0b42d2e626	Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop	2014-03-31 09:46:05 +02:00
Mr. Jenkins	c2d4999fa7	[tx-robot] updated from transifex	2014-03-30 01:14:43 -04:00
Mr. Jenkins	b975a0b4f0	[tx-robot] updated from transifex	2014-03-29 01:14:45 -04:00
Mr. Jenkins	0f455203a6	[tx-robot] updated from transifex	2014-03-28 01:14:44 -04:00
Mr. Jenkins	ae16937a09	[tx-robot] updated from transifex	2014-03-27 01:14:47 -04:00
masensio	c9a68d67e9	Merge branch 'master' into develop	2014-03-26 12:44:55 +01:00
Mr. Jenkins	b232d15607	[tx-robot] updated from transifex	2014-03-26 01:14:43 -04:00
David A. Velasco	41f86353da	Updated notification icon for Android 2.x	2014-03-24 13:17:46 +01:00
masensio	b63fb51226	Update notification icons	2014-03-24 10:46:48 +01:00
David A. Velasco	d2ff7d4755	Merge branch 'develop' into release-1.5.5	2014-03-24 10:23:05 +01:00
masensio	1bda7e1e87	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-24 09:31:43 +01:00
Mr. Jenkins	8a1bcd8159	[tx-robot] updated from transifex	2014-03-24 01:14:32 -04:00
David A. Velasco	a3bf6883fc	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-21 11:02:36 +01:00
masensio	7ed3179100	Merge branch 'develop' into improve_notifications_pr_400_with_develop	2014-03-21 10:37:11 +01:00
masensio	2d6826fe8b	Merge pull request #400 from tommyd3mdi/develop ... Notification improvements	2014-03-21 10:32:49 +01:00
masensio	c6f0847866	Changes from comments in PR#443	2014-03-20 16:15:59 +01:00
David A. Velasco	41614a81c1	Added notification icons with dark background to fix contrast in Android 2.x and 3.x	2014-03-20 14:04:09 +01:00
David A. Velasco	8a9f504138	Fixed contrast of text in notifications for Android 2.x and 3.x	2014-03-20 12:56:44 +01:00
David A. Velasco	604abaf3b4	Grant that progress bar in notifications is shown in Android 2.x and 3.x devices	2014-03-20 10:43:06 +01:00
masensio	b0cfec7a00	Add auth_unsupported_basic_auth string	2014-03-20 09:08:02 +01:00
masensio	09cc36272b	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-20 09:02:29 +01:00
Mr. Jenkins	53fbd428af	[tx-robot] updated from transifex	2014-03-20 01:14:32 -04:00
masensio	432d696432	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-19 17:57:56 +01:00
David A. Velasco	f5a9c9600e	Merge pull request #441 from owncloud/allow_multiline_checkbox_preferences_pr_395_with_develop ... Allow multiline preferences, not just checkboxes	2014-03-19 16:59:24 +01:00
David A. Velasco	68482e5f66	Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop	2014-03-19 16:58:10 +01:00
masensio	a9c0d1c62b	Update auth_fail_get_user_name string	2014-03-19 10:31:18 +01:00
masensio	71e049394e	OC-3390: Shows message about 'not support authentication' under server address	2014-03-19 10:07:56 +01:00
masensio	3e108163bc	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-19 08:55:37 +01:00
Mr. Jenkins	d3980d480f	[tx-robot] updated from transifex	2014-03-19 01:14:34 -04:00
masensio	1fff2077a0	OC-3311: Update background color of image preview to black	2014-03-18 14:52:05 +01:00
masensio	b124167f50	Merge pull request #395 from dontcallmedom/master ... allow multi-line checkbox for preferences with long titles	2014-03-18 14:28:17 +01:00
masensio	3806916a48	Merge branch 'develop' into regular_authentication_in_saml_server	2014-03-18 14:21:26 +01:00
masensio	6e86dfb001	OC-3376: 'manage account' field is multiline, in preferences	2014-03-18 13:36:16 +01:00