18 commits

Author	SHA1	Message	Date
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
masensio	eda6f71491	Move create folder button to action bar in Uploader	2015-08-11 11:14:26 +02:00
Andy Scherzinger	4a4296a07e	Material Buttons (draft)	2015-08-07 17:09:47 +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	876204faf0	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-16 11:15:27 +01: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	ccdf0f1b96	- adding possibility to create folder during upload	2014-11-01 13:41:06 +01:00
masensio	20b5ecbac1	Update images. New Styles for Buttons, Dropdown and Progress	2013-10-30 18:37:05 +01:00
masensio	6ace8ab1c1	Update packageName	2013-10-29 14:10:42 +01:00
masensio	dd59f5871c	OC-1833: Add CustomButton class to can change the background of buttons	2013-10-28 12:58:56 +01:00
David A. Velasco	bdc0332c23	Copyright note fixes	2013-04-17 12:26:13 +02:00
David A. Velasco	97ae9007e4	Fixed hardcoded string in UploaderActivity layout; and German translations	2013-03-27 17:19:19 +01: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
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