1050 commits

Author	SHA1	Message	Date
jabarros	0df8f178de	Merge pull request #754 from owncloud/RadioListOnAccounts ... Account list is now a radiobutton list	2014-12-10 08:45:12 +01:00
Jenkins for ownCloud	d0ec8b4ea3	[tx-robot] updated from transifex	2014-12-10 01:13:40 -05:00
Jenkins for ownCloud	cd883c67f7	[tx-robot] updated from transifex	2014-12-08 01:13:29 -05:00
Jenkins for ownCloud	dac3ced86d	[tx-robot] updated from transifex	2014-12-07 01:13:35 -05:00
Jenkins for ownCloud	940f0cc89c	[tx-robot] updated from transifex	2014-12-06 01:13:30 -05:00
Jenkins for ownCloud	c7c53c93ba	[tx-robot] updated from transifex	2014-12-05 01:13:30 -05:00
Jenkins for ownCloud	da691e0bfd	[tx-robot] updated from transifex	2014-12-04 01:13:37 -05:00
David A. Velasco	50e39f044f	Merge branch 'master' into develop	2014-12-03 11:31:49 +01:00
jabarros	0a0c808e3b	Merge pull request #662 from tobiasKaminsky/fileCount ... File count	2014-12-02 08:31:54 +01:00
Jenkins for ownCloud	37713d798b	[tx-robot] updated from transifex	2014-11-28 01:13:32 -05:00
David A. Velasco	44c0d86ede	Merge pull request #752 from owncloud/instant_uploads_set_path ... Better UI for settings path of instant uploads	2014-11-26 13:10:04 +01:00
jabarros	5c0e9ca5f2	Changes after CR	2014-11-26 09:05:23 +01:00
tobiasKaminsky	611905a5d0	- Account list is now a radiobutton list	2014-11-25 17:42:41 +01:00
Jenkins for ownCloud	137105a38a	[tx-robot] updated from transifex	2014-11-24 01:13:31 -05:00
Jenkins for ownCloud	2d66aa1dd7	[tx-robot] updated from transifex	2014-11-22 01:13:44 -05:00
tobiasKaminsky	ae6b686775	Merge remote-tracking branch 'upstream/develop' into fileCount	2014-11-21 17:59:51 +01:00
David A. Velasco	e901b609ba	Merge pull request #740 from owncloud/revert-669-master ... Revert "Add "select all" option to photo (or other) upload screen"	2014-11-21 12:23:27 +01:00
Jenkins for ownCloud	ddfe992cbf	[tx-robot] updated from transifex	2014-11-20 01:13:29 -05:00
jabarros	1435e8c406	Merge branch 'develop' into instant_uploads_set_path	2014-11-19 18:40:06 +01:00
jabarros	a2de2f28ab	Add new preference on settings for setting the upload video path	2014-11-19 10:14:27 +01:00
Jenkins for ownCloud	bb8a10f735	[tx-robot] updated from transifex	2014-11-19 01:13:30 -05:00
jabarros	87b242019c	Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long	2014-11-18 14:57:19 +01:00
jabarros	dc8a495e55	Remove files_move layout after creating files_folder_picker one	2014-11-18 14:53:41 +01:00
jabarros	00a8eb415a	Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend	2014-11-18 14:51:49 +01:00
jabarros	12b4b0397f	Add view for selecting upload path folder browsing through local file list in preferences view	2014-11-18 11:01:55 +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
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	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