4360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	f1b3208f1a	Updated ShareFileFragment layout with extra section for public shares	2015-11-25 09:32:15 +01:00
David A. Velasco	a39c857680	Removed unneeded FrameLayout	2015-11-25 09:32:14 +01:00
Jenkins for ownCloud	d60023867c	[tx-robot] updated from transifex	2015-11-25 01:13:40 -05:00
Jenkins for ownCloud	83e2bd588d	[tx-robot] updated from transifex	2015-11-24 01:13:40 -05:00
Jenkins for ownCloud	d244d558e3	[tx-robot] updated from transifex	2015-11-23 01:13:32 -05:00
Andy Scherzinger	ecdb95fa0c	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-22 17:10:37 +01:00
tobiasKaminsky	d901208c1f	rename file is not working across mount points: therefore copying it and then delete	2015-11-22 13:22:59 +01:00
Jenkins for ownCloud	bbfa65cba6	[tx-robot] updated from transifex	2015-11-22 01:13:39 -05:00
tobiasKaminsky	4471d3beb9	changes according to CR (code review)	2015-11-21 09:03:53 +01:00
tobiasKaminsky	2aac1e5270	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master	2015-11-21 08:48:40 +01:00
Jenkins for ownCloud	f8f99af255	[tx-robot] updated from transifex	2015-11-21 01:13:37 -05:00
Maria Asensio	08be3d3433	Merge pull request #1119 from owncloud/strip-index-php-from-server-url ... Strip away index.php/apps/files to allow copy pasting from the server	2015-11-20 12:24:11 +01:00
Jenkins for ownCloud	76bfd8d452	[tx-robot] updated from transifex	2015-11-20 01:13:34 -05:00
Jenkins for ownCloud	05232de750	[tx-robot] updated from transifex	2015-11-19 01:13:47 -05:00
Jenkins for ownCloud	8331456825	[tx-robot] updated from transifex	2015-11-13 01:13:44 -05:00
David A. Velasco	c4f6cac765	Merge pull request #1254 from owncloud/droid-update ... User manual updated with new images and text for 1.8	2015-11-12 19:02:05 +01:00
David A. Velasco	257a9ec0a9	Merge pull request #1274 from owncloud/read_capabilities_for_showing_share_options ... Adapt availability of "Share with users" depending on server capabilities	2015-11-12 10:32:36 +01:00
masensio	35922a08c1	Read capabilities for showing Share Options ... Updated library reference after merge in master	2015-11-12 10:28:37 +01:00
Maria Asensio	80aacce3f3	Merge pull request #1269 from owncloud/fix_video_not_previewed ... Fix video not previewed #1180	2015-11-11 17:13:42 +01:00
Jenkins for ownCloud	adfe21b886	[tx-robot] updated from transifex	2015-11-11 01:13:45 -05:00
Jenkins for ownCloud	c229790208	[tx-robot] updated from transifex	2015-11-10 01:13:45 -05:00
Jenkins for ownCloud	c386801013	[tx-robot] updated from transifex	2015-11-09 01:13:41 -05:00
Jenkins for ownCloud	11be7f0f54	[tx-robot] updated from transifex	2015-11-08 01:13:44 -05:00
Jenkins for ownCloud	48b35330f1	[tx-robot] updated from transifex	2015-11-07 01:13:50 -05:00
David A. Velasco	4326883490	Minimal cleaning	2015-11-06 19:47:19 +01:00
David A. Velasco	2477d496e3	Fixed local URI to video files passed to VideoView	2015-11-06 15:02:57 +01:00
Andy Scherzinger	dfcbaf9521	lib update	2015-11-06 11:43:56 +01:00
Andy Scherzinger	c31f602fd1	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/list_item.xml	2015-11-06 11:38:51 +01:00
Maria Asensio	19cce9c90f	Merge pull request #1184 from Wikinaut/show-certificate-digest ... fix #1024 show cert fingerprints when adding new account w/ untrusted certificate	2015-11-06 11:23:30 +01:00
Jenkins for ownCloud	bf53dfb3af	[tx-robot] updated from transifex	2015-11-06 01:14:02 -05:00
Carla Schroder	b455705d4c	more file management options	2015-11-05 09:48:53 -08:00
Maria Asensio	7e96305668	Merge pull request #1252 from owncloud/share_with_users ... Share with users & groups	2015-11-05 13:19:24 +01:00
masensio	c86ec0f56b	Update Library Reference, share_with_users branch	2015-11-05 13:16:32 +01:00
David A. Velasco	b985935f22	Removed spurious file	2015-11-05 10:24:38 +01:00
Jenkins for ownCloud	94b21ef5d9	[tx-robot] updated from transifex	2015-11-05 01:13:44 -05:00
Carla Schroder	e55bf94498	Updated with new images and text for 1.8	2015-11-04 15:18:15 -08:00
Andy Scherzinger	f7fe0e00de	moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232	2015-11-04 10:51:43 +01:00
Andy Scherzinger	337b8f30a5	Fix visibility of file size and separator for folder see #1232	2015-11-04 10:04:03 +01:00
Jenkins for ownCloud	62287458b8	[tx-robot] updated from transifex	2015-11-04 01:13:47 -05:00
masensio	4ce1ed1e98	Update Library Reference: add unit test for Sharee operations	2015-11-03 09:37:27 +01:00
Jenkins for ownCloud	653a812684	[tx-robot] updated from transifex	2015-11-03 01:13:49 -05:00
Andy Scherzinger	2cfc7237ea	correct text field names	2015-11-02 15:26:00 +01:00
Andy Scherzinger	838aaff224	change devider color to #f8f8f8	2015-11-02 15:25:43 +01:00
Andy Scherzinger	8110be0155	fixed another typo	2015-11-02 12:32:15 +01:00
Andy Scherzinger	90097b107d	typos fixed	2015-11-02 12:22:49 +01:00
Andy Scherzinger	efdcb97963	setting divider color to #eee as decided by @jancborchardt	2015-11-02 12:05:52 +01:00
Andy Scherzinger	f72289f7bf	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-02 08:41:51 +01:00
Andy Scherzinger	6e54dfc55c	flipped size and mod date	2015-11-02 08:40:18 +01:00
Jenkins for ownCloud	2f237fb0cc	[tx-robot] updated from transifex	2015-11-02 01:13:44 -05:00
Jenkins for ownCloud	f817e49515	[tx-robot] updated from transifex	2015-11-01 01:13:47 -04:00