15 commits

Author	SHA1	Message	Date
tobiasKaminsky	b2ae3fa467	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles	2015-12-31 13:26:36 +01:00
masensio	3b2c61a48c	Merge branch 'master' into uploadShowsFiles ... Conflicts: res/layout/uploader_layout.xml res/layout/uploader_list_item_layout.xml src/com/owncloud/android/ui/activity/Uploader.java	2015-09-02 16:45:33 +02:00
Andy Scherzinger	c085ffd545	inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes	2015-08-10 18:32:25 +02:00
masensio	84678c9903	Fix: Import file from other app shows all folders as TextView	2015-06-22 12:58:41 +02:00
tobiasKaminsky	6d4207a06b	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
masensio	0bef9fdedb	Update year in license	2015-03-05 13:27:45 +01:00
tobiasKaminsky	0ae80926ac	update	2015-01-05 19:53:40 +01:00
tobiasKaminsky	9b61fc9af6	- fixes #674, #198	2014-12-27 09:08:11 +01:00
tobiasKaminsky	5434504486	- renamed ImageViews ... - switch to 80x80px filetype icon	2014-09-18 21:36:43 +02:00
David A. Velasco	bdc0332c23	Copyright note fixes	2013-04-17 12:26:13 +02:00
David A. Velasco	2623e9c195	Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished	2013-02-08 09:22:46 +01:00
David A. Velasco	bb257ec729	Updated copyright in source files	2013-02-07 18:45:10 +01:00
David A. Velasco	4e57c008b7	Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI	2012-08-22 13:53:03 +02:00
Bartek Przybylski	0aeb425885	adjusting design to holo, stability for account setup	2012-05-13 16:13:13 +02:00
Bartek Przybylski	154bb85cf1	initial commit	2011-08-19 22:37:35 +02:00