1481 commits

Author	SHA1	Message	Date
masensio	fc5c4d899c	Merge branch 'master' into text_file_preview_pr_707_with_develop ... Conflicts: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-09-04 14:31:10 +02:00
masensio	f787213cd1	Merge pull request #1102 from owncloud/copy ... Copy files	2015-09-04 11:14:42 +02:00
Jenkins for ownCloud	f70de1736e	[tx-robot] updated from transifex	2015-09-04 01:13:40 -04:00
masensio	a0707428ff	Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop ... Conflicts: res/layout/file_preview.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java	2015-09-02 13:23:42 +02:00
Jenkins for ownCloud	2b001a8bf2	[tx-robot] updated from transifex	2015-09-02 07:06:14 -04:00
Jenkins for ownCloud	f70817f5fb	[tx-robot] updated from transifex	2015-09-01 13:02:18 -04:00
David A. Velasco	e6be60679f	Merge branch 'master' into copy ... Conflicts FIXED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/com/owncloud/android/ui/preview/FileDownloadFragment.java src/com/owncloud/android/ui/preview/PreviewImageFragment.java src/com/owncloud/android/ui/preview/PreviewMediaFragment.java	2015-09-01 18:35:51 +02:00
David A. Velasco	136db6a765	Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader ... 'Create folder' button moved to action bar in Uploader activity	2015-08-31 17:48:12 +02:00
Jenkins for ownCloud	ef7cf6edb0	[tx-robot] updated from transifex	2015-08-31 01:13:46 -04:00
Jenkins for ownCloud	11fa921860	[tx-robot] updated from transifex	2015-08-28 01:13:40 -04:00
Jenkins for ownCloud	6b8a052a5e	[tx-robot] updated from transifex	2015-08-27 01:13:43 -04:00
Jenkins for ownCloud	8ecfdfe614	[tx-robot] updated from transifex	2015-08-26 01:13:41 -04:00
masensio	b81de1d547	Merge branch 'master' into create_folder_button_on_action_bar_for_uploader ... Conflicts: res/layout/uploader_layout.xml	2015-08-25 14:53:42 +02:00
Jenkins for ownCloud	8f0a83a495	[tx-robot] updated from transifex	2015-08-25 01:13:43 -04:00
Jenkins for ownCloud	573b9d1727	[tx-robot] updated from transifex	2015-08-24 12:38:30 +02:00
Jenkins for ownCloud	806f258bbd	[tx-robot] updated from transifex	2015-08-24 12:38:30 +02:00
Jenkins for ownCloud	763ecd2d84	[tx-robot] updated from transifex	2015-08-24 12:38:29 +02:00
Jenkins for ownCloud	9448a809b1	[tx-robot] updated from transifex	2015-08-24 12:38:28 +02:00
tobiasKaminsky	8e3787909f	Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground	2015-08-21 17:48:58 +02:00
Andy Scherzinger	a544a0cfb6	correct copyright info	2015-08-20 13:08:28 +02:00
Andy Scherzinger	cbb0f8743f	Fix for long click menue for account management in preferences screen	2015-08-18 23:13:10 +02:00
Andy Scherzinger	dbed65610b	fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle	2015-08-18 22:09:53 +02:00
Andy Scherzinger	da89715045	reverted back to light colored login	2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano	eb1e41bc76	Added error messages for copy action. English only.	2015-08-18 17:04:47 +02:00
Andy Scherzinger	e79f92f566	Conflict Dialog Fix	2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano	7c19fcdc94	Added error messages for copy action. English only.	2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano	fe5b6aa4a8	Added copy action	2015-08-18 13:35:28 +02:00
Andy Scherzinger	a393531774	visual fix for Progress DialogFragment(s)	2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano	f4432afdeb	Added 'Copy' action	2015-08-18 10:58:37 +02:00
Andy Scherzinger	3a82db451c	Merge branch 'master' of https://github.com/owncloud/android into material_toolbar	2015-08-17 16:13:30 +02:00
Andy Scherzinger	ba80646e4e	Fix for 4.0 file action context menu (re-implement it via DialogFragment)	2015-08-17 15:58:03 +02:00
Andy Scherzinger	80e7836840	set back font weight on drawer list items	2015-08-17 09:04:37 +02:00
Jenkins for ownCloud	ba4b258697	[tx-robot] updated from transifex	2015-08-17 01:13:37 -04:00
Jenkins for ownCloud	d09baff068	[tx-robot] updated from transifex	2015-08-15 01:13:39 -04:00
Andy Scherzinger	71f68b4c8c	fix for progressbars on pre lollipop and post ics for seekbar thumbs	2015-08-14 18:55:31 +02:00
Andy Scherzinger	92af92ee3b	merged part of the fixes from material buttons branch to fix bugs reported in PR #1076	2015-08-14 17:18:36 +02:00
Andy Scherzinger	60e0f09278	Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons	2015-08-13 15:41:59 +02:00
Jenkins for ownCloud	a244bdf1ca	[tx-robot] updated from transifex	2015-08-13 01:13:38 -04:00
Andy Scherzinger	5257af90bc	fixed username to be single line and ellipsized in case of lang names	2015-08-12 18:48:33 +02:00
Jenkins for ownCloud	c4b639e964	[tx-robot] updated from transifex	2015-08-12 01:13:37 -04:00
masensio	eda6f71491	Move create folder button to action bar in Uploader	2015-08-11 11:14:26 +02:00
Jenkins for ownCloud	c19bb85a24	[tx-robot] updated from transifex	2015-08-11 01:13:39 -04:00
Andy Scherzinger	275028a5e3	Merge branch 'master' of https://github.com/owncloud/android into material_toolbar	2015-08-10 13:01:40 +02:00
Jenkins for ownCloud	2b79f3292f	[tx-robot] updated from transifex	2015-08-10 01:13:35 -04:00
Jenkins for ownCloud	2206585f52	[tx-robot] updated from transifex	2015-08-09 01:13:36 -04:00
Jenkins for ownCloud	5258172ffd	[tx-robot] updated from transifex	2015-08-08 01:13:38 -04:00
Andy Scherzinger	4a4296a07e	Material Buttons (draft)	2015-08-07 17:09:47 +02:00
Jenkins for ownCloud	8d4d1bfffb	[tx-robot] updated from transifex	2015-08-07 04:57:36 -04:00
Jenkins for ownCloud	e935e9239d	[tx-robot] updated from transifex	2015-08-07 01:13:50 -04:00
Andy Scherzinger	ddd01569cd	Optimized translucence for lollipop on image preview	2015-08-06 19:14:52 +02:00