1033 commits

Author	SHA1	Message	Date
tobiasKaminsky	bdd46fd811	cleanup	2014-11-19 09:11:44 +01:00
tobiasKaminsky	4867bb32c3	Merge remote-tracking branch 'upstream/develop' into imageGrid ... Conflicts: owncloud-android-library src/com/owncloud/android/ui/adapter/FileListListAdapter.java	2014-11-18 18:08:28 +01:00
Jenkins for ownCloud	d3bfbb8568	[tx-robot] updated from transifex	2014-11-18 01:13:34 -05:00
Jenkins for ownCloud	3f5b3f0d1d	[tx-robot] updated from transifex	2014-11-17 01:13:35 -05:00
Jenkins for ownCloud	1dbd577166	[tx-robot] updated from transifex	2014-11-15 01:13:35 -05:00
David A. Velasco	1b36e1ca08	Merge pull request #685 from tobiasKaminsky/beautifyTimestamps ... Relative time stamps in the list of files.	2014-11-13 12:21:49 +01:00
Jenkins for ownCloud	02a11c3b91	[tx-robot] updated from transifex	2014-11-13 01:13:37 -05: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
Jenkins for ownCloud	1efefbd22c	[tx-robot] updated from transifex	2014-11-12 01:13:41 -05: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
Jenkins for ownCloud	2f058ad70e	[tx-robot] updated from transifex	2014-11-08 01:13:37 -05: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	f331120a14	Merge remote-tracking branch 'upstream/develop' into imageGrid ... Conflicts: owncloud-android-library res/layout/list_item.xml src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java	2014-11-05 22:07:11 +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
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
David A. Velasco	a09a837585	Adjust the thumbnails size to the size used on screen	2014-11-03 11:27:51 +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
Jenkins for ownCloud	ca0eac841a	[tx-robot] updated from transifex	2014-10-31 01:13:34 -04: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
Jenkins for ownCloud	068b826b32	[tx-robot] updated from transifex	2014-10-29 01:13:41 -04:00
Jenkins for ownCloud	5acc314524	[tx-robot] updated from transifex	2014-10-28 01:13:38 -04:00
Jenkins for ownCloud	495c812671	[tx-robot] updated from transifex	2014-10-27 01:13:33 -04:00
Jenkins for ownCloud	3507ff8003	[tx-robot] updated from transifex	2014-10-26 01:13:34 -04:00
tobiasKaminsky	b18fabe9d7	- bugfix: video is now playing in fullscreen	2014-10-25 18:55:15 +02:00
Jenkins for ownCloud	27bcd4de0a	[tx-robot] updated from transifex	2014-10-25 01:13:41 -04:00
David A. Velasco	01f1f62d2c	Merge pull request #676 from owncloud/sorting_files ... Added sorting by name or date	2014-10-24 13:24:35 +02:00
Jenkins for ownCloud	8a77b0be15	[tx-robot] updated from transifex	2014-10-24 01:13:37 -04:00
jabarros	3bd60c2b0f	Fixed. In devices with Android 2.x 'Sort' option in menu has not icon related	2014-10-23 18:05:28 +02:00
jabarros	6970560d2f	Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 ... Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2014-10-23 11:06:05 +02:00
jabarros	2fad1e1a99	Merge branch 'develop' into sorting_files_2 ... Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java	2014-10-23 10:18:20 +02:00
Jenkins for ownCloud	832a98f47c	[tx-robot] updated from transifex	2014-10-23 01:13:40 -04:00
Jenkins for ownCloud	2e6410e771	[tx-robot] updated from transifex	2014-10-22 01:14:52 -04:00
Magnus Sjoqvist	52bf54a00d	Removes remember last share location setting	2014-10-21 17:27:47 +02:00
Magnus Sjoqvist	2b1865d1d0	Removes translations	2014-10-21 16:17:00 +02:00
Jenkins for ownCloud	7dc7e85df8	[tx-robot] updated from transifex	2014-10-21 01:15:22 -04:00
tobiasKaminsky	c1f920cc75	- update folder_public name	2014-10-20 19:46:10 +02:00
jabarros	3a8ff76d0a	Merge branch 'master' into develop ... Conflicts: owncloud-android-library	2014-10-20 14:54:46 +02:00
Magnus Sjoqvist	844790057b	Merge with develop	2014-10-20 14:38:13 +02:00
David A. Velasco	6ed394195d	Merge pull request #658 from owncloud/instant_upload_path_chooseable ... Instant upload path chooseable	2014-10-20 13:56:18 +02:00
Jenkins for ownCloud	8be4bb14a3	[tx-robot] updated from transifex	2014-10-20 01:14:34 -04:00
Magnus Sjoqvist	b6c7719415	Merge with develop	2014-10-17 11:06:30 +02:00
Jenkins for ownCloud	95a02855ee	[tx-robot] updated from transifex	2014-10-17 01:13:52 -04:00