3899 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jorge Antonio Diaz-Benito Soriano	dcffd79b60	Tweaks for source 1.5	2015-08-18 15:55:00 +02:00
Jorge Antonio Diaz-Benito Soriano	91f027fd06	Make oC-android-library track the copy_operation branch	2015-08-18 15:42:05 +02:00
Jorge Antonio Diaz-Benito Soriano	b843bc4387	Updated submodule to point to the branch with the additional stuff for the copy action	2015-08-18 14:20:18 +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	c7205b8f56	Added CopyActivity	2015-08-18 11:39:18 +02:00
Jorge Antonio Diaz-Benito Soriano	dc8ceffddc	Fixed 'Move' action	2015-08-18 11:37:23 +02:00
Jorge Antonio Diaz-Benito Soriano	d9db150a31	Added 'ACTION_COPY_FILES'.	2015-08-18 11:17:54 +02:00
Jorge Antonio Diaz-Benito Soriano	f4432afdeb	Added 'Copy' action	2015-08-18 10:58:37 +02:00
masensio	95db3421f6	Merge branch 'master' into develop	2015-08-18 10:16:13 +02:00
Andy Scherzinger	c13741ba20	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-17 16:14:12 +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	b669bd7737	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-17 16:04:17 +02:00
Andy Scherzinger	4ff231f256	Java Doc added	2015-08-17 16:00:16 +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	16a5bdc8d1	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-17 09:05:33 +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	172767d391	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-14 19:34:08 +02:00
Andy Scherzinger	66bae3914c	read cover art for audio file (works for mp3) and displays it in the media player, sets the default logo (as before) in case it couldn't read and convert a cover art.	2015-08-14 19:33:23 +02:00
Andy Scherzinger	267179ef2e	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-14 18:55:58 +02: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	a7859b4ab4	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/drawer.xml res/layout/drawer_list_item.xml res/values/styles.xml	2015-08-14 17:45:22 +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	7df40c01c8	fixed drawer font size, changed color according to material guide	2015-08-14 16:00:35 +02:00
Andy Scherzinger	9d08a3f306	fix for drawer width	2015-08-14 15:40:22 +02:00
Andy Scherzinger	abb6e2dbd5	Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices	2015-08-14 15:29:22 +02:00
Andy Scherzinger	607fb6f587	group change data and size together and calculate decimals based on total size see comment in PR #1090	2015-08-14 10:05:26 +02:00
Andy Scherzinger	c86e92870f	fixed padding of list items	2015-08-14 00:34:12 +02:00
tobiasKaminsky	be5dbcbb2e	fixed bug caused by rotating the device	2015-08-13 20:11:58 +02:00
Andy Scherzinger	927ce968d7	fixed progress wheel	2015-08-13 19:43:56 +02:00
Andy Scherzinger	414f43f326	fixed arrow coloring on the pull to refresh on the file list	2015-08-13 19:28:44 +02:00
Andy Scherzinger	1c7de5c7a5	coloring the progress wheel	2015-08-13 19:16:11 +02:00
Andy Scherzinger	f17011ff68	some more styling for the log screen	2015-08-13 19:05:20 +02:00
Andy Scherzinger	455b349c08	moved everything to AppCompatActivity since ActionBarActivity is deprecated	2015-08-13 18:46:19 +02:00
Andy Scherzinger	5b92747895	standard material paddings set	2015-08-13 18:39:53 +02:00
Andy Scherzinger	64910f59bb	fixed checkbox (now also material design on pre lollipop)	2015-08-13 18:39:36 +02:00
Andy Scherzinger	8a8eb435a3	set standard 16dp whitespaces via config values not hardcoded	2015-08-13 18:08:21 +02:00
Andy Scherzinger	bbd529289c	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-13 17:58:58 +02:00
Andy Scherzinger	ba3bc9cbfd	minor padding change on logo	2015-08-13 17:54:58 +02:00
Andy Scherzinger	bac0fa5f28	move from deprecated ActionBarActivity to AppCompatActivity	2015-08-13 17:54:33 +02:00
Andy Scherzinger	af2af7198b	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/ssl_untrusted_cert_layout.xml res/layout/ssl_validator_layout.xml	2015-08-13 15:57:38 +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	f7d6939264	fix for text field focus colors	2015-08-12 19:12:56 +02:00
Andy Scherzinger	05ca0270a8	fixed button style blue/grey	2015-08-12 18:54:27 +02:00
Andy Scherzinger	c4d8c423b0	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar	2015-08-12 18:49:33 +02:00