2837 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jabarros	e4d6f267f7	Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments	2014-11-12 12:46:33 +01:00
David A. Velasco	17afcb0251	Merge pull request #683 from tobiasKaminsky/videoFullsize ... Bugfix: video is now playing in fullscreen	2014-11-12 09:29:28 +01:00
tobiasKaminsky	79cb6106fd	Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps ... Conflicts: src/com/owncloud/android/utils/DisplayUtils.java	2014-11-12 09:02:23 +01:00
tobiasKaminsky	2117c024c4	< 60 seconds -> "seconds ago"	2014-11-12 08:56:53 +01:00
jabarros	3cae3d3eb8	Modify kitkat document provider implementation in order to cover all 'content://' cases	2014-11-12 08:46:29 +01:00
Jenkins for ownCloud	1efefbd22c	[tx-robot] updated from transifex	2014-11-12 01:13:41 -05:00
Magnus Sjoqvist	437d3315e0	merge	2014-11-11 12:49:22 +01:00
jabarros	903b66595f	Add workaround for Drive app in which a creation of a temporal copy is needed	2014-11-11 12:27:57 +01:00
Sam	c2ee5dbff9	This commit targets https://github.com/owncloud/android/issues/596 ... 1. allows multiselect during upload for select applications 2. Added an api check, multiselect is only supported on api level 18+	2014-11-11 09:55:25 +01:00
Jenkins for ownCloud	3c19c59d9e	[tx-robot] updated from transifex	2014-11-11 01:13:34 -05:00
tobiasKaminsky	4560776ecc	- use match_parent instead	2014-11-10 20:14:45 +01:00
Jenkins for ownCloud	54b814a604	[tx-robot] updated from transifex	2014-11-10 01:13:34 -05:00
Jenkins for ownCloud	ae67bbb648	[tx-robot] updated from transifex	2014-11-09 01:13:35 -05:00
tobiasKaminsky	39f7ee996a	fix scenario 1	2014-11-08 08:45:09 +01:00
Jenkins for ownCloud	2f058ad70e	[tx-robot] updated from transifex	2014-11-08 01:13:37 -05:00
jabarros	da7e13ed5c	Include impelementation of Storage Access Framework when device is KITKAT or over	2014-11-07 14:57:47 +01:00
Pro9	0ba228c064	Added an api check, since multiselect only works on api level 18+	2014-11-07 09:25:31 +01:00
Jenkins for ownCloud	4ab6d85c47	[tx-robot] updated from transifex	2014-11-07 01:13:38 -05:00
Jenkins for ownCloud	5b37b99af3	[tx-robot] updated from transifex	2014-11-06 01:13:41 -05:00
tobiasKaminsky	c105861d0f	Merge remote-tracking branch 'upstream/develop' into rotateImage ... Conflicts: src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java	2014-11-05 21:45:08 +01:00
Sam	e96a16b09b	allows multiselect during upload for select applications	2014-11-05 14:51:59 +01:00
David A. Velasco	80cfc55fda	Merge pull request #706 from owncloud/christmas_app ... Winter holidays fix	2014-11-05 09:09:48 +01:00
jabarros	eb77fe1da1	Merge pull request #700 from owncloud/remember_last_share_location_fixed ... Remember last share location	2014-11-05 08:36:16 +01:00
Jenkins for ownCloud	02b8ac0d91	[tx-robot] updated from transifex	2014-11-05 01:13:37 -05:00
jabarros	2790c2379d	Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another	2014-11-04 11:15:59 +01:00
David A. Velasco	183cd732d0	Merge pull request #687 from owncloud/thumbnails_from_server ... Get remote thumbnails from server (OC8)	2014-11-03 13:38:58 +01:00
jabarros	7283f54158	Fixed. App crashes when selecting an account where you have not accessed yet	2014-11-03 13:00:13 +01:00
David A. Velasco	58040881bd	Some clean-up in ThumbnailsCacheManager	2014-11-03 11:30:44 +01:00
David A. Velasco	a09a837585	Adjust the thumbnails size to the size used on screen	2014-11-03 11:27:51 +01:00
jabarros	e53c6001dd	Merge branch 'develop' into christmas_app	2014-11-03 10:41:49 +01:00
jabarros	9f1dd62c90	Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients	2014-11-03 10:37:56 +01:00
Jorge Antonio Diaz-Benito Soriano	bade3b9f6c	Update submodule	2014-11-01 16:15:44 +01:00
Jorge Antonio Diaz-Benito Soriano	9316ce96ac	Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0	2014-11-01 16:08:15 +01:00
tobiasKaminsky	ccdf0f1b96	- adding possibility to create folder during upload	2014-11-01 13:41:06 +01:00
Jenkins for ownCloud	8de92ba3b0	[tx-robot] updated from transifex	2014-11-01 01:13:35 -04:00
David A. Velasco	0bedcb9128	Merge branch 'remember_last_share_location' into remember_last_share_location_fixed	2014-10-31 15:23:59 +01:00
David A. Velasco	87aa0fcfb7	Enable 'up' navigation from home button	2014-10-31 15:20:48 +01:00
David A. Velasco	dbd981f012	Fixed crash and remembered location when there are multiple accounts	2014-10-31 15:08:08 +01:00
David A. Velasco	9709593ccf	Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()	2014-10-31 15:06:45 +01:00
jabarros	f345e3fed2	Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server	2014-10-31 13:52:26 +01:00
jabarros	639d122721	Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated	2014-10-31 13:30:26 +01:00
Jenkins for ownCloud	ca0eac841a	[tx-robot] updated from transifex	2014-10-31 01:13:34 -04:00
jabarros	0a39462210	Merge pull request #697 from owncloud/fix_https_access_via_proxy ... Update reference to library with bugfix	2014-10-30 14:33:58 +01:00
David A. Velasco	c71b0de051	Update reference to library with bugfix	2014-10-30 14:26:58 +01:00
Luke Owncloud	035fc24a17	allow user to save choice of app for sending log ... warn user if no app for sending log available	2014-10-30 09:53:24 +01:00
tobiasKaminsky	595a63bc39	Bugfix	2014-10-30 08:20:55 +01:00
grecep	31ffae0093	Revert "Add "select all" option to photo (or other) upload screen"	2014-10-29 22:37:45 +01:00
grecep	fd7a940dee	Merge pull request #669 from grecep/master ... Add "select all" option to photo (or other) upload screen	2014-10-29 22:29:38 +01:00
jabarros	945c584f34	Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect ... Bugfix multiple select	2014-10-29 18:09:16 +01:00
tobiasKaminsky	3b3d3e05bc	- moved rotateImage() to BitmapUtils	2014-10-29 16:12:03 +01:00