705 commits

Author	SHA1	Message	Date
David A. Velasco	33b0909e7b	Merge branch 'develop' into videoInstandUploads	2014-04-16 19:31:27 +02:00
Mr. Jenkins	97d4975bc5	[tx-robot] updated from transifex	2014-04-16 01:15:02 -04:00
Mr. Jenkins	0004094313	[tx-robot] updated from transifex	2014-04-14 01:14:06 -04:00
Mr. Jenkins	43446e359f	[tx-robot] updated from transifex	2014-04-13 01:14:05 -04:00
Mr. Jenkins	53840ec422	[tx-robot] updated from transifex	2014-04-11 01:14:08 -04:00
Mr. Jenkins	ebc4f59abd	[tx-robot] updated from transifex	2014-04-10 01:14:08 -04:00
masensio	1a33e4cf65	Merge branch 'develop' into videoInstandUploads	2014-04-09 08:42:30 +02:00
Mr. Jenkins	0e133984d4	[tx-robot] updated from transifex	2014-04-09 01:14:36 -04:00
masensio	3351db6527	Merge branch 'develop' into videoInstandUploads	2014-04-08 12:50:50 +02:00
Mr. Jenkins	69d40e505e	[tx-robot] updated from transifex	2014-04-08 04:59:00 -04:00
masensio	119c61dcf4	Merge pull request #458 from owncloud/operations_service ... Operations started by AuthenticatorActivity are run in OperationsService, and end of operations is granted to be dispatched.	2014-04-08 09:17:47 +02:00
Mr. Jenkins	9cc8efc369	[tx-robot] updated from transifex	2014-04-08 01:15:33 -04:00
masensio	af45cabf35	Merge branch 'develop' into operations_service	2014-04-07 08:49:01 +02: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
David A. Velasco	7cf05f3647	Internal refactorization of AccountAuthenticatorActivity (and related dependencies)	2014-04-04 14:18:42 +02:00
Mr. Jenkins	a391f987ae	[tx-robot] updated from transifex	2014-04-04 01:15:17 -04:00
David A. Velasco	5611205f1d	Merge branch 'develop' into operations_service	2014-04-03 11:27:44 +02: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
David A. Velasco	0024569aff	AuthenticatorActivity clean up: removed commented code and warnings	2014-04-02 12:46:54 +02: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
masensio	5ac1a1ebbb	Merge branch 'develop' into operations_service	2014-04-01 14:18:32 +02: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
David A. Velasco	565875d753	AuthenticatorActivity is bound to OperationsService when created	2014-03-28 12:55:07 +01: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