1162 commits

Author	SHA1	Message	Date
Jenkins for ownCloud	6a88d7a9f4	[tx-robot] updated from transifex	2015-02-22 01:13:32 -05:00
Jenkins for ownCloud	099b32fc42	[tx-robot] updated from transifex	2015-02-21 01:13:31 -05:00
Jenkins for ownCloud	fd8e590ea0	[tx-robot] updated from transifex	2015-02-20 01:13:38 -05:00
David A. Velasco	ec6b9d7c70	Merge branch 'master' into develop	2015-02-19 11:01:00 +01:00
Jenkins for ownCloud	ae1bd1b6a1	[tx-robot] updated from transifex	2015-02-18 01:13:36 -05:00
David A. Velasco	2cfed6eaa7	Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts	2015-02-17 14:00:18 +01:00
Jenkins for ownCloud	7fa529d328	[tx-robot] updated from transifex	2015-02-17 01:13:43 -05:00
Jenkins for ownCloud	effee70675	[tx-robot] updated from transifex	2015-02-15 01:13:29 -05:00
Jenkins for ownCloud	5e1048b343	[tx-robot] updated from transifex	2015-02-14 01:13:32 -05:00
Jenkins for ownCloud	754c277fdd	[tx-robot] updated from transifex	2015-02-13 01:13:30 -05:00
Jenkins for ownCloud	f149a9cf77	[tx-robot] updated from transifex	2015-02-12 01:13:31 -05:00
Jenkins for ownCloud	c4110d4be7	[tx-robot] updated from transifex	2015-02-11 01:13:30 -05:00
Jenkins for ownCloud	6162271dff	[tx-robot] updated from transifex	2015-02-10 01:13:32 -05:00
Jenkins for ownCloud	62c54ac2ad	[tx-robot] updated from transifex	2015-02-09 01:13:30 -05:00
Jenkins for ownCloud	7d8cbde64f	[tx-robot] updated from transifex	2015-02-08 01:13:31 -05:00
Jenkins for ownCloud	fa0b91d7fb	[tx-robot] updated from transifex	2015-02-07 01:13:34 -05:00
Jenkins for ownCloud	b047882001	[tx-robot] updated from transifex	2015-02-06 01:13:31 -05:00
Jenkins for ownCloud	f8c91b0458	[tx-robot] updated from transifex	2015-02-05 01:13:34 -05:00
Jenkins for ownCloud	8bc75d54b4	[tx-robot] updated from transifex	2015-02-04 01:14:14 -05:00
David A. Velasco	936d8466c6	Updated with fixes in Spanish translation	2015-02-03 14:01:59 +01:00
David A. Velasco	1726a9352a	Updated translations after new format string for subject in sharing e-mail	2015-02-03 13:37:22 +01:00
David A. Velasco	28e4b35595	Quotes updated in subject message for shared link, better format string	2015-02-03 13:17:14 +01:00
David A. Velasco	e4e50d44c4	Corrections from my own comments	2015-02-03 09:52:22 +01:00
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +01:00
Jenkins for ownCloud	8bf624ff8f	[tx-robot] updated from transifex	2015-02-01 01:13:30 -05:00
Jenkins for ownCloud	2210ce961a	[tx-robot] updated from transifex	2015-01-31 01:13:34 -05:00
masensio	42b5a1e28f	Update some icons	2015-01-30 14:37:16 +01:00
masensio	700318fec0	Update some icons	2015-01-30 11:00:14 +01:00
Jenkins for ownCloud	9d491f71ed	[tx-robot] updated from transifex	2015-01-30 01:13:31 -05:00
Jenkins for ownCloud	16b36d0418	[tx-robot] updated from transifex	2015-01-29 01:13:38 -05:00
masensio	d3b0747dde	Merge pull request #866 from owncloud/download_folder ... Download a folder	2015-01-28 09:31:25 +01:00
masensio	0b8f3db914	Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon	2015-01-28 08:59:57 +01:00
Jenkins for ownCloud	da67575522	[tx-robot] updated from transifex	2015-01-28 01:13:45 -05:00
masensio	8ebaba45e7	Show status icons in gridview	2015-01-27 13:51:44 +01:00
masensio	051265620c	Add share icons and localFileIndicator to grid_image and grid_item layout	2015-01-27 09:46:19 +01:00
Jenkins for ownCloud	97386bdb87	[tx-robot] updated from transifex	2015-01-26 01:13:30 -05:00
jabarros	7d21a9ec5d	Merge pull request #825 from owncloud/SettingsGreyedOut ... Instant Upload settings hide/show	2015-01-23 09:29:11 +01:00
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
Jenkins for ownCloud	9fcb1612fe	[tx-robot] updated from transifex	2015-01-21 01:13:32 -05: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
jabarros	d0cee8be85	Merge branch 'develop' into SettingsGreyedOut	2015-01-20 09:25:20 +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
jabarros	e98fc8b141	Merge branch 'develop' into download_folder	2015-01-19 12:49:28 +01:00