3900 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	d09baff068	[tx-robot] updated from transifex	2015-08-15 01:13:39 -04: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	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
tobiasKaminsky	be5dbcbb2e	fixed bug caused by rotating the device	2015-08-13 20:11:58 +02:00
Andy Scherzinger	bac0fa5f28	move from deprecated ActionBarActivity to AppCompatActivity	2015-08-13 17:54:33 +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	c4d8c423b0	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar	2015-08-12 18:49:33 +02: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
Andy Scherzinger	066190f977	Update SETUP.md ... updated documentation due to move to android-22 for actual AppCompat lib and ownCloud app compile Target	2015-08-11 15:40:27 +02: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	dde5e5575c	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar	2015-08-10 13:02:16 +02:00
Andy Scherzinger	275028a5e3	Merge branch 'master' of https://github.com/owncloud/android into material_toolbar	2015-08-10 13:01:40 +02:00
David A. Velasco	64ebb2c1d3	Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view	2015-08-10 11:12:43 +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	80c112ad1a	[tx-robot] updated from transifex	2015-08-07 04:44:18 -04:00
David A. Velasco	537e075fca	Merge branch 'develop' ... Conflicts FIXED: owncloud-android-library	2015-08-07 10:17:03 +02:00
David A. Velasco	00482b6dcb	Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs ... Updated documents and .gitmodules with new policy: PRs should go to m…	2015-08-07 10:10:57 +02:00
David A. Velasco	3141659306	Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop	2015-08-07 09:15:14 +02: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
Andy Scherzinger	6b6227125b	added back translucent action bar for image preview	2015-08-06 19:04:22 +02:00
Andy Scherzinger	9d9efd1c1d	Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar ... Conflicts: owncloud-android-library	2015-08-06 17:23:02 +02:00
Andy Scherzinger	a257935b8c	Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency	2015-08-06 17:13:00 +02:00
Andy Scherzinger	1ce7d79ff0	Move alert dialog to material variant and setting the correct accent color for the button texts via styles	2015-08-06 16:27:56 +02:00
masensio	419dbeabec	Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml ... change the subject when sharing in saml	2015-08-06 11:00:59 +02:00
masensio	1ae203760e	Update library reference with fix for saml username	2015-08-06 10:53:35 +02:00
masensio	0110601cb2	Update library reference	2015-08-06 10:44:55 +02:00
David A. Velasco	6a8034ec24	Added username to SAML credentials	2015-08-06 10:23:29 +02:00
purigarcia	91000ba405	change the subject	2015-08-06 10:23:27 +02:00
Jenkins for ownCloud	e0594d4005	[tx-robot] updated from transifex	2015-08-06 01:14:11 -04:00
masensio	fafc422ca4	Fix Java version to 1.7	2015-08-05 17:40:20 +02:00
masensio	d1257b34c0	Fix problems in PreviewTextFragment related with changes in develop	2015-08-05 17:18:17 +02:00
masensio	b694fee63d	Merge commit 'refs/pr/707' into text_file_preview_pr_707_with ... Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-08-05 16:48:12 +02:00
Andy Scherzinger	270fea6a33	fix for the grid footer	2015-08-05 15:21:05 +02:00
Andy Scherzinger	b276b623a9	added bottom padding to logo, logo slightly bigger	2015-08-05 14:48:04 +02:00
Andy Scherzinger	5ded9e818b	aligned account name with menu items	2015-08-05 14:07:00 +02:00
Andy Scherzinger	c2418d24d5	added missing progressbar	2015-08-05 13:43:23 +02:00
Andy Scherzinger	97b9932d81	changed color for hint text on login screens to 777	2015-08-05 13:36:12 +02:00
Andy Scherzinger	f289998946	removed unused listener (would only be useful in case of using toolbar instead of actionbar)	2015-08-05 13:01:37 +02:00
Andy Scherzinger	3956a50855	fixed deprecated getDrawable call	2015-08-05 12:58:40 +02:00
Andy Scherzinger	7c9c4a4ca6	remove two-times init of the drawer	2015-08-05 12:54:31 +02:00
masensio	9a0361945c	Merge pull request #1068 from owncloud/conflictDialog_newWording ... Conflict dialog: new wording	2015-08-05 12:53:03 +02:00