1117 commits

Author	SHA1	Message	Date
jabarros	0470de47e0	Fixed. Line behind the folder is not shown in the upload view	2015-01-22 09:29:36 +01:00
jabarros	38ea01dc1e	Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/	2015-01-21 17:51:16 +01:00
jabarros	9b1b5f5e3b	Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.	2015-01-21 11:08:15 +01:00
jabarros	f01156527a	Fix. Uploads view is not shown correctly	2015-01-20 14:38:32 +01:00
jabarros	d751df3daa	Add Scrollview in list fragment layout for showing text message	2015-01-20 10:43:39 +01:00
jabarros	451783be22	Merge branch 'develop' into imageGrid	2015-01-20 09:56:45 +01:00
Jenkins for ownCloud	99276bae85	[tx-robot] updated from transifex	2015-01-20 01:13:34 -05:00
tobiasKaminsky	3c79991b12	Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 ... Conflicts: gradle/wrapper/gradle-wrapper.properties owncloud-android-library	2015-01-19 22:24:33 +01:00
tobiasKaminsky	b5fdba576f	changes as requested	2015-01-19 22:13:45 +01:00
tobiasKaminsky	d4e0f3bdb1	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-19 21:02:37 +01:00
Jenkins for ownCloud	880ffab34c	[tx-robot] updated from transifex	2015-01-19 01:13:30 -05:00
tobiasKaminsky	6d5c6f86e5	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-18 17:00:29 +01:00
Jenkins for ownCloud	bdb959f2e2	[tx-robot] updated from transifex	2015-01-18 01:13:30 -05:00
Jenkins for ownCloud	46427dad18	[tx-robot] updated from transifex	2015-01-17 01:13:31 -05:00
Jenkins for ownCloud	86f9d43e8a	[tx-robot] updated from transifex	2015-01-15 01:13:33 -05:00
Jenkins for ownCloud	369fb6a0be	[tx-robot] updated from transifex	2015-01-14 01:13:29 -05:00
Jenkins for ownCloud	f206d8c674	[tx-robot] updated from transifex	2015-01-13 01:13:31 -05:00
Jenkins for ownCloud	26403abd0a	[tx-robot] updated from transifex	2015-01-12 01:13:29 -05:00
Jenkins for ownCloud	acd19c911b	[tx-robot] updated from transifex	2015-01-10 01:13:30 -05:00
Jenkins for ownCloud	f670cfad8f	[tx-robot] updated from transifex	2015-01-07 01:13:30 -05:00
Jenkins for ownCloud	464db6b4c5	[tx-robot] updated from transifex	2015-01-06 01:13:30 -05:00
Jenkins for ownCloud	ea101df8f5	[tx-robot] updated from transifex	2015-01-05 01:13:29 -05:00
Jenkins for ownCloud	c8dc970121	[tx-robot] updated from transifex	2015-01-04 01:13:31 -05:00
Jenkins for ownCloud	57a840c92e	[tx-robot] updated from transifex	2015-01-03 01:13:28 -05:00
Jenkins for ownCloud	c03ea61704	[tx-robot] updated from transifex	2015-01-02 01:13:30 -05:00
Jenkins for ownCloud	2fb89a9238	[tx-robot] updated from transifex	2015-01-01 01:13:33 -05:00
Jenkins for ownCloud	410bb307e1	[tx-robot] updated from transifex	2014-12-31 01:13:30 -05:00
Jenkins for ownCloud	04631b6313	[tx-robot] updated from transifex	2014-12-30 01:13:30 -05:00
Jenkins for ownCloud	56459b1da2	[tx-robot] updated from transifex	2014-12-29 01:13:29 -05:00
Jenkins for ownCloud	4f2a917933	[tx-robot] updated from transifex	2014-12-28 01:13:30 -05:00
jabarros	f0905fbaac	Merge pull request #784 from ekeitho/develop ... subject mail populated when user shares >>file/folder<<	2014-12-26 09:04:02 +01:00
Jenkins for ownCloud	b64e5ff65b	[tx-robot] updated from transifex	2014-12-26 01:13:28 -05:00
Jenkins for ownCloud	db3c9440fb	[tx-robot] updated from transifex	2014-12-25 01:13:29 -05:00
Jenkins for ownCloud	64c3c9d53c	[tx-robot] updated from transifex	2014-12-24 01:13:31 -05:00
Keith Abdulla	150050aeb0	fix tab indent	2014-12-23 09:38:38 -08:00
Keith Abdulla	1db0d7daf2	create an extra string resource	2014-12-23 09:31:59 -08:00
Jenkins for ownCloud	a11f951ed7	[tx-robot] updated from transifex	2014-12-23 01:13:30 -05:00
Jenkins for ownCloud	29eba16031	[tx-robot] updated from transifex	2014-12-22 01:13:44 -05:00
Jenkins for ownCloud	68e8a942a1	[tx-robot] updated from transifex	2014-12-21 01:13:29 -05:00
Jenkins for ownCloud	167c86b4ac	[tx-robot] updated from transifex	2014-12-20 01:13:31 -05:00
Jenkins for ownCloud	78c1a484e7	[tx-robot] updated from transifex	2014-12-19 01:13:38 -05:00
Jenkins for ownCloud	f8acc67eb7	[tx-robot] updated from transifex	2014-12-18 01:13:30 -05:00
Jenkins for ownCloud	b23d33b737	[tx-robot] updated from transifex	2014-12-17 01:13:32 -05:00
Jenkins for ownCloud	2c48adc760	[tx-robot] updated from transifex	2014-12-16 01:13:32 -05:00
Jenkins for ownCloud	3772a9d78e	[tx-robot] updated from transifex	2014-12-15 01:13:29 -05:00
Jenkins for ownCloud	c6ce747d8a	[tx-robot] updated from transifex	2014-12-14 01:13:29 -05:00
Jenkins for ownCloud	885e76abb1	[tx-robot] updated from transifex	2014-12-13 01:13:30 -05:00
Jenkins for ownCloud	9cdcea64ee	[tx-robot] updated from transifex	2014-12-12 01:13:36 -05:00
David A. Velasco	1f796350b0	Merge pull request #781 from owncloud/fix_logs_change_orientation ... User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)	2014-12-11 10:21:41 +01:00
jabarros	c34646aed3	Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation	2014-12-10 14:13:32 +01:00