15449 commits

Author	SHA1	Message	Date
Joas Schilling	4c0263b78a	Move event and todo parsing to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-29 16:27:12 +01:00
Joas Schilling	8d87e39146	Deduplicate icon assignment ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-29 16:08:58 +01:00
Joas Schilling	ddc82b4ca2	Move calendar activity parsing to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-29 15:47:43 +01:00
Joas Schilling	a16fd3991a	Move CalDAV activity settings to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-29 15:06:54 +01:00
Joas Schilling	253a75e5ae	Move CalDAV activity filters to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-29 15:04:08 +01:00
John Molakvoæ (skjnldsv)	bd18349f46	Fix mobile view ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-11-29 13:47:37 +01:00
John Molakvoæ (skjnldsv)	a984f4b430	Fix #2384 ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-11-29 07:06:41 +01:00
Nextcloud bot	e8ea9a5d27	[tx-robot] updated from transifex	2016-11-29 01:06:47 +00:00
Roeland Jago Douma	8a9343a709	Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications ... Add an icon to the federated sharing notification	2016-11-28 21:00:27 +01:00
blizzz	cd9d1f589f	Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications ... Rich strings and icons for mention notifications	2016-11-28 18:13:54 +01:00
Joas Schilling	b31d621840	Add an icon to the federated sharing notification ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-28 17:23:42 +01:00
Morris Jobke	587f28ad42	Merge pull request #2378 from nextcloud/fix-preview-image_src ... Fix image_src link	2016-11-28 17:03:25 +01:00
Lukas Reschke	9def8225c0	Fix image_src link ... The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-28 16:20:57 +01:00
Morris Jobke	a12d2e67e7	Merge pull request #2335 from nextcloud/grouping-for-activities ... Bring back grouping for activities	2016-11-28 16:18:02 +01:00
Bjoern Schiessle	e5c31b72e1	bring back permissions for mail shares ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-28 11:24:05 +01:00
Björn Schießle	46b4891bd7	Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api ... Move ShareByMail activities to new API	2016-11-28 11:09:47 +01:00
Nextcloud bot	ca7b9e5490	[tx-robot] updated from transifex	2016-11-28 09:51:57 +00:00
Nextcloud bot	4e682d4113	[tx-robot] updated from transifex	2016-11-28 01:06:56 +00:00
Joas Schilling	7e6f829d54	Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect ... [Minor] Fix link to external storage settings on error notification	2016-11-27 09:02:26 +01:00
Nextcloud bot	9788cf04ee	[tx-robot] updated from transifex	2016-11-27 01:07:08 +00:00
Felix A. Epp	c911a876bf	Fix link to external storage settings on error notification ... Signed-off-by: Felix A. Epp <work@felixepp.de>	2016-11-26 10:15:42 +01:00
Nextcloud bot	8f4ec8583d	[tx-robot] updated from transifex	2016-11-26 01:06:57 +00:00
Joas Schilling	da9468522b	Add an event merger and use it for the files activities ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 15:36:11 +01:00
Joas Schilling	5ba2b1c193	Working towards groups ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 15:19:55 +01:00
Joas Schilling	f067d0ee66	Correctly match the subjects to the parameters ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 11:45:40 +01:00
Joas Schilling	9f915e061c	Remove old test ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 11:17:40 +01:00
Joas Schilling	719b1905d7	Get user name from contacts if available ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-25 11:17:06 +01:00
Roeland Jago Douma	72f9920a58	Add Identityproof tests ... * Add tests for Key * Add tests for Manager * Add tests for Signer * Removed URLGenerator from Signer Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-24 21:50:19 +01:00
Roeland Jago Douma	6f5316e443	Add DAV repair step to fix calendar data ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-24 20:31:01 +01:00
Morris Jobke	8f14ffd734	Merge pull request #2306 from nextcloud/dont-log-user-password ... Don't log the user password in case something goes wrong	2016-11-24 17:08:25 +01:00
Joas Schilling	5c2ec58440	Move ShareByMail activities to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-24 16:15:51 +01:00
Jan-Christoph Borchardt	e75dede590	fix some outdated naming ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-24 16:05:05 +01:00
Joas Schilling	df0eeb8089	Don't log the user password in case something goes wrong ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-24 13:58:03 +01:00
Lukas Reschke	f4cf125a4a	Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section ... Fix some language issues in the federation admin panel	2016-11-24 10:13:57 +01:00
Joas Schilling	fbd574cc82	Fix some language issues in the federation admin panel ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-24 09:34:06 +01:00
Joas Schilling	1c564fd554	Fix placeholder typo in public link activity ... https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/	2016-11-23 21:43:14 +01:00
Lukas Reschke	4c5e7d270a	Add tests ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-23 19:58:43 +01:00
root	861c8572c0	restore ldap_password_pr ... Signed-off-by: Roger Szabo <roger.szabo@web.de> remove notification part Signed-off-by: Roger Szabo <roger.szabo@web.de> blizzz comments Signed-off-by: Roger Szabo <roger.szabo@web.de> morris comment Signed-off-by: Roger Szabo <roger.szabo@web.de> improved error message for changing password Signed-off-by: Roger Szabo <roger.szabo@web.de> blizz comments 20161013 Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de> Adjust HintException usage Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de>	2016-11-23 19:02:48 +01:00
Morris Jobke	59db9fada2	Merge pull request #2281 from nextcloud/fix-translation ... Fix language typo	2016-11-23 17:53:21 +01:00
Lukas Reschke	5473475fa7	Merge pull request #2232 from nextcloud/imagescale-fix ... Workaround for PHP bug when calling imagescale	2016-11-23 17:45:59 +01:00
Joas Schilling	14f01dbe33	Fix language typo ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-23 16:55:49 +01:00
Lukas Reschke	6d92550772	Merge pull request #2278 from nextcloud/filelist-share-visible ... make the share icon in the filelist visible again	2016-11-23 16:40:10 +01:00
Morris Jobke	6281607d7a	improved style of shared entry ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-23 15:25:48 +01:00
Lukas Reschke	aa30c4cd80	Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key ... init Session/privateKeys on Master Key	2016-11-23 15:19:24 +01:00
Morris Jobke	25f519c855	Merge pull request #2266 from nextcloud/avatar_image ... VCARDS don't hold binary data	2016-11-23 14:49:32 +01:00
Robin Appelman	3bb3296c53	make the share icon in the filelist visible again ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-23 14:44:53 +01:00
Lukas Reschke	2eca9cc384	Merge pull request #2262 from nextcloud/specify-parameters-on-public-download ... Specify the parameters on public download	2016-11-23 14:02:38 +01:00
Roeland Jago Douma	e9f98fd5a9	VCARDS don't hold binary data ... * We need to base64 encode the avatar! * Switched to vcard v4 * User proper data uri Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-23 13:30:32 +01:00
Bjoern Schiessle	8a401ee156	check if session is initialized ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-23 12:20:43 +01:00
Lukas Reschke	f692ea34f1	Merge pull request #2263 from nextcloud/remove91_migration ... Remove migration steps in app dav	2016-11-23 12:18:06 +01:00
Joas Schilling	d2489ebee4	Adjust tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-23 11:31:35 +01:00
Joas Schilling	bfecdd4422	Use the comment icon for the notifications ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-23 11:19:44 +01:00
Joas Schilling	56cfd0a6e4	Set the rich object string for comment notifications ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-23 11:19:41 +01:00
Joas Schilling	a36d26950e	Only do stuff when its a remote-share activity ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-22 22:46:18 +01:00
Thomas Müller	181af830fd	Remove 9.1 migration steps in app dav (#25654)	2016-11-22 20:17:05 +01:00
Joas Schilling	e9336dddd5	Specify the parameters on public download ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-22 20:14:42 +01:00
Lukas Reschke	f4470b6861	Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again ... Use the display name for files activities again	2016-11-22 18:25:52 +01:00
Lukas Reschke	717fd9fdd6	Merge pull request #2229 from nextcloud/select2-fix-bis ... Select2 fix bis	2016-11-22 17:50:53 +01:00
Morris Jobke	f6e7269628	document new variable ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-22 16:55:28 +01:00
Joas Schilling	e1feb72583	Use the display name for files activities again ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-22 16:39:29 +01:00
Maxence Lange	558a934842	init Session/privateKeys on Master Key ... I can't find another way to init the session ...	2016-11-22 13:19:42 -01:00
Roeland Jago Douma	9619f49ba4	Fix undefined systemtags stuff ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-22 14:59:51 +01:00
Julius Haertl	6c4664bc82	Workaround for PHP bug when calling imagescale ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-22 12:12:59 +01:00
Joas Schilling	b8732a1a53	Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api ... Update systemtags activity to new API	2016-11-22 11:05:06 +01:00
John Molakvoæ	6bcb6e08be	Fix systemtagsfilelist unwanted margin and clean aera a bit ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-11-22 10:49:24 +01:00
Roeland Jago Douma	08ef7356f6	Merge pull request #2165 from nextcloud/sharing-activities-update ... Move file sharing activities to the new API	2016-11-22 10:19:15 +01:00
Morris Jobke	a02d0975dd	Merge pull request #2154 from nextcloud/comments-activities-update ... Move comments activities to the new API	2016-11-22 09:56:22 +01:00
Nextcloud bot	b0cf78aa1e	[tx-robot] updated from transifex	2016-11-22 01:06:54 +00:00
Lukas Reschke	d0c3c5cee3	Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests ... fix PropPatch requests on calendars	2016-11-21 22:54:17 +01:00
Georg Ehrke	3a8c4230be	fix PropPatch requests on calendars ... Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2016-11-21 22:10:51 +01:00
Lukas Reschke	ccf3e4255a	Remove debug code ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-21 11:30:02 +01:00
Lukas Reschke	7b3855a375	Add config switch ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-21 11:30:02 +01:00
Lukas Reschke	c49b0d3834	Remove unused variable ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-21 11:30:01 +01:00
Lukas Reschke	dac980115f	Add retry job ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-21 11:30:01 +01:00
Roeland Jago Douma	15c075eba8	Fix lookup url ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-21 11:30:01 +01:00
Roeland Jago Douma	c20c7f31da	Push json to the lookupserver ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-21 11:30:01 +01:00
Roeland Jago Douma	f7f70028d1	Search on lookup server ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-21 11:30:00 +01:00
Lukas Reschke	fb91bf6a5b	Add a signer class for signing ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-21 11:30:00 +01:00
Bjoern Schiessle	069023416c	lookup server connector ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-21 11:29:59 +01:00
Bjoern Schiessle	b23a4ca96b	push public user data to the lookup server ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-21 11:29:59 +01:00
Bjoern Schiessle	3a880879ce	update unit tests ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-21 11:29:59 +01:00
Bjoern Schiessle	8f33d9d1c0	update system address book if the user change the personal settings ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-21 11:29:57 +01:00
John Molakvoæ (skjnldsv)	b75ef0f8b3	Fix popover layout fix for files and global ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-11-21 11:29:57 +01:00
Nextcloud bot	ba9b17c906	[tx-robot] updated from transifex	2016-11-21 01:06:58 +00:00
Nextcloud bot	97af4f762d	[tx-robot] updated from transifex	2016-11-20 01:06:44 +00:00
Nextcloud bot	b1ee9862f8	[tx-robot] updated from transifex	2016-11-19 01:06:44 +00:00
Joas Schilling	041dd937cf	Update test ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-18 16:51:50 +01:00
Morris Jobke	332eaec4c0	Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions ... Password confirmation for some actions	2016-11-18 15:42:30 +01:00
Morris Jobke	faee255ff4	Merge pull request #840 from nextcloud/theming-icon-endpoint ... Add dynamic icon creation	2016-11-18 15:35:34 +01:00
Morris Jobke	e8511660f0	Merge pull request #2109 from nextcloud/oc_26533 ... Transfer ownership only analyze home storage	2016-11-18 15:32:28 +01:00
Robin Appelman	8b9ad46ba3	Merge pull request #768 from nextcloud/s3-objectstore ... Add S3 objectstore backend	2016-11-18 14:55:07 +01:00
Lukas Reschke	6c11c54434	Merge pull request #2196 from nextcloud/cache-owner-displayname ... cache the displayname of the share owner	2016-11-18 13:51:24 +01:00
Morris Jobke	310d60b585	Merge pull request #2064 from nextcloud/oc-26189 ... [downstream] Add submit button to validate the federated server,	2016-11-18 12:12:53 +01:00
Joas Schilling	b2d9c20aac	Fix unit tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-18 12:10:51 +01:00
Joas Schilling	410e0fc28f	Require password confirmation when changing workflow rules ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-18 12:10:50 +01:00
Joas Schilling	86aa6197b8	Require confirmation when generating backup codes ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-18 11:57:16 +01:00
Morris Jobke	0e699c4d14	Merge pull request #2116 from nextcloud/downstream-26511 ... Display changes in file versions tab view and detailsView	2016-11-18 11:37:29 +01:00
Morris Jobke	ccdf387041	Merge pull request #2184 from nextcloud/share-join-cache ... Get the share root info directly when querying for shares	2016-11-18 11:33:33 +01:00
Robin Appelman	dbd7f6dea6	cache the displayname of the share owner ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-18 11:26:00 +01:00
Julius Haertl	2ab4d1e0a3	Use IAppManager instead of OC_App ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 11:07:44 +01:00
Julius Haertl	d409fe1c52	Error handling and tests if file was not found ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:25 +01:00
Julius Haertl	78de213b85	Sanitize input and small fixes ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:25 +01:00
Julius Haertl	3a400f92d1	Replace null return with NotFoundException ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:25 +01:00
Julius Haertl	cc8b1d3829	Fix icon-folder css ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	43097eabee	Fix svg resizing and remove deprecated method call ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	2e8dd21815	Improve caching ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	492d0b9f9b	Caching for icon files using AppData ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	9e28a3ba12	Theming: Code cleanup and cache buster for mime icons ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	237034818d	Check if dynamic icons can be used ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	af8976ab03	Add IconBuilder class to encapsulate icon generation ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:24 +01:00
Julius Haertl	b466628bfd	Improve unit tests for image generation ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	ac7f852ed9	Theming: Add IconController tests ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	4945592a86	Fix IconController after rebase ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	6c7ebb1204	Theming: Add icon caching ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	d1fcfe8e7d	Theming: Add colorized icon css from icons.css ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	c7adcb85ae	Theming: Fix default parameters in icon routes ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:23 +01:00
Julius Haertl	64510bd87a	Theming: Add PHPdoc and icon fallback to theming logo ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:22 +01:00
Julius Haertl	2d65b8c600	Theming: Add favicon-touch and fix icon creation with non svg images ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:22 +01:00
Julius Haertl	b3eab7db01	Theming: Add dynamic icon and favicon endpoints ... Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-18 10:23:22 +01:00
Nextcloud bot	00fffae47f	[tx-robot] updated from transifex	2016-11-18 01:07:04 +00:00
Morris Jobke	19e4ac33a9	Merge pull request #2178 from nextcloud/federation_sharing_changes ... don't add server automatically to trusted server	2016-11-18 00:49:48 +01:00
Jan-Christoph Borchardt	6fa5c18a79	Merge pull request #2136 from nextcloud/sharing-layout ... Sharing layout fixes	2016-11-18 00:40:46 +01:00
Jan-Christoph Borchardt	a32c781326	use copy icon for local link rather than link icon to prevent confusion with sharing ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-17 21:46:07 +01:00
Jan-Christoph Borchardt	88865e9728	properly align input box items in share tab view ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-17 19:11:49 +01:00
Jan-Christoph Borchardt	5eab1cdece	fix layout of sharing list ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-17 19:02:33 +01:00
Robin Appelman	b85459964c	fix getting root entry when not provided by the share provider ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-17 18:48:39 +01:00
Robin Appelman	2f03fcab4a	let the share backend get the node cacheentry to save queries ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-17 18:48:38 +01:00
Robin Appelman	065753f0ae	dont use the source cache/storage until needed ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-17 18:48:38 +01:00
Morris Jobke	02bfd91553	Merge pull request #2176 from nextcloud/share-cache-root-info ... reuse the known rootinfo in the shared cache when possible	2016-11-17 18:47:39 +01:00
Bjoern Schiessle	7df5c5db2d	don't add server automatically to trusted server ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-17 18:08:45 +01:00
Robin Appelman	e36293195f	Merge pull request #2173 from nextcloud/bugfix/2171/birthday-12-31-too-young ... BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31st	2016-11-17 18:00:22 +01:00
Georg Ehrke	44f55fe415	BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31st ... Signed-off-by: Georg Ehrke <developer@georgehrke.com>	2016-11-17 15:28:15 +01:00
Robin Appelman	30e7c27d86	reuse the known rootinfo in the shared cache when possible ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-17 14:59:31 +01:00
Joas Schilling	64b58d2321	Update systemtags activity to new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-17 12:53:51 +01:00
Nextcloud bot	ab18d2f55e	[tx-robot] updated from transifex	2016-11-17 01:07:02 +00:00
Morris Jobke	8a02647e65	Merge pull request #2122 from nextcloud/downstream-26520 ... Hack to prevent warning for read-only wrapper in public links	2016-11-17 00:54:08 +01:00
Morris Jobke	a728766bf4	Merge pull request #2151 from nextcloud/theming-fixes ... theming: move reset button into field and only show when focused	2016-11-16 23:44:39 +01:00
Joas Schilling	4035d60847	Merge pull request #2157 from nextcloud/fix-checkboxes ... Fix checkboxes when theming color is enabled	2016-11-16 19:25:25 +01:00
Joas Schilling	8f38adaab1	Merge pull request #2123 from nextcloud/downstream-26522 ... Skip hidden files when counting visible files in list	2016-11-16 19:10:35 +01:00
Morris Jobke	b373f52fa8	only use one kind of hack for the storage wrappers of the sharing code ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-16 19:04:47 +01:00
Vincent Petry	e7b1196dd6	Hack to prevent warning for read-only wrapper in public links ... Storage wrappers should normally always be registered inside a presetup hook. However in the public link scenario this is not possible and there is currently no good alternative with the current architecture. Instead of logging a warning every time, this fix prevents the warning to be shown but also adds a FIXME in the code for the future. This is ok because this app is already using private/internal APIs at the moment and should be reworked properly in the future.	2016-11-16 19:04:42 +01:00
Roeland Jago Douma	7100a1b347	Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard ... Adds copy tooltip to clipboards	2016-11-16 17:57:35 +01:00
Joas Schilling	bdaf334c53	Move file sharing activities to the new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 16:45:08 +01:00
Morris Jobke	b7e6e9f83c	Fix tooltips - they now properly change on click ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-16 15:43:26 +01:00
Robin Appelman	d5bfff6f4f	add comment for non empty text file ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-16 15:30:37 +01:00
Roeland Jago Douma	07acd34d6e	Fix themeing unit tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-16 15:30:37 +01:00
Robin Appelman	c22776f04a	Dont create 0 byte text files ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-16 15:30:37 +01:00
Robin Appelman	eb21dc2bd3	fix theming images when using primary storage ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-16 15:30:36 +01:00
Robin Appelman	0a246f9852	split off s3 connection logic ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-16 15:30:36 +01:00
Robin Appelman	b56f2c9ed0	basic lockdown logic ... Signed-off-by: Robin Appelman <icewind@owncloud.com>	2016-11-16 15:24:23 +01:00
Julius Haertl	520f2f6221	Revert "Fix #1782" ... This reverts commit bc5268bdc8. Signed-off-by: Julius Haertl <jus@bitgrid.net>	2016-11-16 13:52:51 +01:00
Joas Schilling	a845f7bc01	Fix wrong copyright headers ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 12:20:04 +01:00
Joas Schilling	cf205fcaa5	Use the display name for users ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 12:20:04 +01:00
Joas Schilling	8105ba9929	Move comments activities to the new API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 12:20:03 +01:00
Jan-Christoph Borchardt	e595c50042	theming: move reset button into field and only show when focused ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-16 11:38:01 +01:00
Joas Schilling	6b88d56e3a	Update the since version to 11.0.0 ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:29:27 +01:00
Joas Schilling	6047493b6d	Fix integration tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:46 +01:00
Joas Schilling	1dc23f2fd6	Remove the old activity extension ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:46 +01:00
Joas Schilling	cf8b91be52	Add back the support for the short translations ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:45 +01:00
Joas Schilling	27c08167df	Don't even try to combine when the subject is different ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:45 +01:00
Joas Schilling	6ddf43e27a	Provider for the files app ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:45 +01:00
Joas Schilling	ca2124a2a1	Register the settings of the files app via info.xml ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:44 +01:00
Joas Schilling	0d940e581a	Move the favorites filter to IFilter ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:44 +01:00
Joas Schilling	5d71896c8e	Move files filter to IFilter ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-16 09:25:44 +01:00
Roeland Jago Douma	f7c637071a	Adds copy tooltip to clipboards ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-15 19:30:59 +01:00
Lukas Reschke	bc1008ac38	Use 11.0 instead 9.2 ... As discussed we're changing the version from 9.2 to 11.0 to make some more sense. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-15 14:45:58 +01:00
Roeland Jago Douma	7e6830729e	Test on storage ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-15 09:53:43 +01:00
Nextcloud bot	571c5aac5e	[tx-robot] updated from transifex	2016-11-15 01:07:05 +00:00
Morris Jobke	e5b61527da	Merge pull request #2125 from nextcloud/downstream-26546 ... Transfer ownership now returns exit code on error	2016-11-15 00:08:09 +01:00
Roeland Jago Douma	d5afe2f3ca	Merge pull request #2119 from nextcloud/downstream-26555 ... disabling dropping on dragging objects temporarily	2016-11-14 17:45:15 +01:00
Morris Jobke	42d754becd	Merge pull request #2084 from nextcloud/files_drop_avatars_disabled ... Fixes files_drop when avatars are disabled	2016-11-14 17:14:09 +01:00
Roeland Jago Douma	561a4fd989	Merge pull request #2115 from nextcloud/oc_26527 ... Skip broken shares when transferring ownership (#26527)	2016-11-14 17:07:59 +01:00
Roeland Jago Douma	c9b1108e8e	Merge pull request #2110 from nextcloud/oc_26526 ... First process group shares and then user shares	2016-11-14 17:06:28 +01:00
Roeland Jago Douma	030118cd85	Merge pull request #2111 from nextcloud/oc_26549 ... Remove unused $view from FilesPlugin (#26549)	2016-11-14 17:00:04 +01:00
Vincent Petry	1355f2039e	Transfer ownership now returns exit code on error (#26546)	2016-11-14 16:57:18 +01:00
Vincent Petry	1141fcc9ac	Skip hidden files when counting visible files in list (#26522) ... The file list UI logic that renders the next page doesn't properly exclude hidden files when not shown. This fix makes sure that only rows that are actually visible are counted when rendering a page, this makes sure that the page will always have enough elements displayed.	2016-11-14 16:21:57 +01:00
Roeland Jago Douma	04f8521b2c	Merge pull request #2112 from nextcloud/downstream-26206 ... Introduce an event for first time login based on the last login time …	2016-11-14 16:13:16 +01:00
Michael Jobst	03cbc7217c	disabling dropping on dragging objects temporarily ... better solution	2016-11-14 15:35:25 +01:00
Michael Jobst	96debafd08	Display changes in file versions tab view and detailsView (#26511) ... * Display changes in file versions tab view and detailsView * versions tab enhancements enhanced js test file removed css superscript attribute for version size * Replaced spaces with tabs	2016-11-14 15:22:27 +01:00
Roeland Jago Douma	ff96fffe39	Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms ... Fixes not allowed increasing of link share permissions	2016-11-14 15:21:08 +01:00
Vincent Petry	2b61b89391	Skip broken shares when transferring ownership (#26527)	2016-11-14 15:18:34 +01:00
Thomas Müller	506ccdbd8d	Introduce an event for first time login based on the last login time stamp ... Use firstLogin event to trigger creation of default calendar and default address book Delay login of admin user after setup so that firstLogin event can properly be processed for the admin Fixing tests ... Skeleton files are not copied over -> only 3 cache entries are remaining Use updateLastLoginTimestamp to properly setup lastLogin value for a test user	2016-11-14 14:50:10 +01:00
Vincent Petry	17ea1bfb75	Remove unused $view from FilesPlugin (#26549) ... The Sabre FilesPlugin never uses the view so remove it.	2016-11-14 14:45:33 +01:00
Vincent Petry	3fe7186e31	First process group shares and then user shares ... This prevents a validation failure where the code checks whether a file is already shared with another user, but the check disables itself when the owner is the same. Processing the groups first prevents the check to kick in too early when the group share still has the old owner while we try transferring the user share.	2016-11-14 14:39:17 +01:00
Vincent Petry	f31b794add	Transfer ownership only analyze home storage ... When transferring ownership, only the local files will be transferred during the rename operation. This means that the analyzing code doesn't need to recurse into any mount points. Furthermore this fixes issues where FailedStorage might appear as mount points as a result of inaccessible external storages or shares. So this makes it more robust.	2016-11-14 14:34:30 +01:00
Morris Jobke	cebb689925	Merge pull request #2106 from nextcloud/proper-empty-message-for-tags ... Show specific empty message for tag input fields	2016-11-14 14:02:07 +01:00
Morris Jobke	fdd904414f	Merge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent ... remove unneeded getDirectoryContent when getting share types for a folder	2016-11-14 11:49:24 +01:00
Morris Jobke	b35812fce6	Show specific empty message for tag input fields ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-14 11:46:21 +01:00
Morris Jobke	16a110e803	Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages ... only query substorages to calculate the final mtime/size/etag when we need it	2016-11-14 11:39:02 +01:00
Joas Schilling	a06398f804	Focus the input after clicking the "Tags" label ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-14 10:52:45 +01:00
Nextcloud bot	8c1cd07de3	[tx-robot] updated from transifex	2016-11-14 01:07:06 +00:00
Roeland Jago Douma	965981486f	Fixes not allowed increasing of link share permissions ... Fixes the following: 1. user0 shares folder with user1 (RO but with sharing permissions) 2. user1 shares by link 3. user1 send 'publicUpload=true' OCS request to the link share before this increased the permissions of the link share. Which should not happen. now: API reponds with an error that the permissions can't be increased. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-13 20:29:34 +01:00
Roeland Jago Douma	1056692fff	Fixes files_drop when avatars are disabled ... Fixes: #2080 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-13 14:39:38 +01:00
Nextcloud bot	150b86a7db	[tx-robot] updated from transifex	2016-11-13 01:07:09 +00:00
Nextcloud bot	1d65d31e0f	[tx-robot] updated from transifex	2016-11-12 01:07:11 +00:00
Joas Schilling	d61c8d74bb	Merge pull request #2082 from nextcloud/files_drop_sabre32 ... Fixes files_drop for sabre 3.2	2016-11-11 15:09:50 +01:00
Nextcloud bot	d969fc4ac6	[tx-robot] updated from transifex	2016-11-11 01:07:18 +00:00
Roeland Jago Douma	4b3b562c4f	Fixes files_drop for sabre 3.2 ... In the new sabre (3.2) the order of beforeMethod is switched. it used to be that beforeMethod:METHOD was called after beforeMethod. But now it is called before. Since we need the view this was broken. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-10 20:44:41 +01:00
Joas Schilling	cbc6118f51	Only check the sharing backends for file/folder items ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-10 16:46:01 +01:00
Robin Appelman	ec2235e14b	fix tests ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-10 15:06:24 +01:00
Robin Appelman	cbcdf69dc2	only query substorages to calculate the final mtime/size/etag lazily ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-10 13:59:22 +01:00
Nextcloud bot	cfda17d8f3	[tx-robot] updated from transifex	2016-11-10 01:07:14 +00:00
Robin Appelman	d1291f7aee	remove unneeded getDirectoryContent when getting share types for a folder ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-11-09 17:04:44 +01:00
Felix Heidecke	d4afccfeb0	Add submit button to validate the federated server, ... fixes issue #25364	2016-11-09 14:27:05 +01:00
Roeland Jago Douma	6a75296ccb	Merge pull request #1792 from nextcloud/bump_sabre ... Bump sabre	2016-11-09 13:06:52 +01:00
Lukas Reschke	58ca624b62	Add tests ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-09 11:52:40 +01:00
Björn Schießle	1ad3043e4f	Merge pull request #1998 from nextcloud/share-by-mail-notification ... add share by mail activity	2016-11-08 17:37:46 +01:00
Joas Schilling	1c97d1b4ed	Fix some typos ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-08 17:05:29 +01:00
Morris Jobke	5f15020b9b	Merge pull request #1618 from nextcloud/show-folder-shared-status ... make it possible to share the current folder	2016-11-08 16:23:47 +01:00
Bjoern Schiessle	25bcd71d02	add activity if a file was shared by mail ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-08 15:58:52 +01:00
Bjoern Schiessle	087dab85b4	add activity for share by mail ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-08 15:42:07 +01:00
Morris Jobke	742ece8b7a	Fix styling of the breadcrumbs icon ... * properly center share icon * also apply styles for public share icon Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-08 11:14:36 +01:00
Christoph Wurst	6c323496ab	fix share icon position and remove debug log	2016-11-08 10:36:39 +01:00
Nextcloud bot	8d7df51a0e	[tx-robot] updated from transifex	2016-11-08 01:06:57 +00:00
Roeland Jago Douma	0c1fd16d54	Add tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-07 21:02:23 +01:00
Roeland Jago Douma	07d027feeb	Show link icon when shared by link ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-07 15:38:56 +01:00
Roeland Jago Douma	b39a17e499	Actually update the state ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-07 14:58:45 +01:00
Jan-Christoph Borchardt	8de4d4f76e	detail fixes for share current folder ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-07 14:58:45 +01:00
Roeland Jago Douma	1190ce1dd5	Listen to sharetab changes ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-07 14:58:45 +01:00
Christoph Wurst	c55718ae5e	update breadcrumb view whenever the share information on the directory info model changes ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Christoph Wurst	36cf779140	the root folder must not be shared ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Christoph Wurst	5bf7e5533d	visually reflect sharing state of current folder ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Christoph Wurst	9e5e120ef9	refactor share permission logic into own method to reuse it for the share tab ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Christoph Wurst	bc1cb8a6d0	let users share the curren folder ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Christoph Wurst	c5597baf88	show whether the current folder was shared or not ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	2016-11-07 14:58:45 +01:00
Joas Schilling	538b2e097c	Also sort the tags in the filter ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-07 14:56:31 +01:00
Joas Schilling	52b4606d08	Sort tags by name on the admin page ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-07 14:56:31 +01:00
Joas Schilling	dc5c7d2b04	First list tags the user used lately ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-07 14:56:31 +01:00
Joas Schilling	6573debb0a	Fix translation string ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-07 11:25:53 +01:00
Nextcloud bot	8d954c0ece	[tx-robot] updated from transifex	2016-11-07 01:07:03 +00:00
Nextcloud bot	e217040402	[tx-robot] updated from transifex	2016-11-06 01:07:48 +00:00
Nextcloud bot	ca3616cb58	[tx-robot] updated from transifex	2016-11-05 01:07:14 +00:00
Roeland Jago Douma	fb562e93cc	Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad ... Cleanup OC_Group usage a bit	2016-11-04 22:40:34 +01:00
Roeland Jago Douma	04ece69a33	Cleanup OC_Group usage a bit ... This is deprecated internal stuff. Should not be used anymore. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 20:55:47 +01:00
Roeland Jago Douma	1e6175dfcb	Fix CalendarTest ... * Made sure delete from self works again (and is tested) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 15:40:59 +01:00
Roeland Jago Douma	c016d947e2	Fix plugin ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 15:10:38 +01:00
Roeland Jago Douma	6d1c0be47d	Minor fixes ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 15:10:15 +01:00
Roeland Jago Douma	9fa3a22ddd	Fix tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 13:37:00 +01:00
Thomas Müller	c778b1bade	Update sabre dav to 3.2 (#26115) ... * Update sabre/dav to 3.2.0 * Adjust code to work with sabre/dav 3.2.0 and it's dependencies * Adding own CalDAV plugin to fix calendar home property * Test if there is a user logged in when listing files home * Update sabre version used by integration tests * Disable unauthenticated DAV access This is needed to make Sabre 3.2 behave like we did before. Eventually we should integrate better with the ACL plugin which itself should implement an auth failure when appropriate. ===== * Fixed so cherry-pick was succesfull Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-04 13:35:10 +01:00
Michael Jobst	bf9376a7f6	Fixed disappearing of share info in file view	2016-11-04 10:37:30 +01:00
Nextcloud bot	479d76d426	[tx-robot] updated from transifex	2016-11-04 01:07:04 +00:00
Lukas Reschke	c0bbae28f0	Merge pull request #1741 from nextcloud/new_preview ... Improve previews	2016-11-03 21:07:16 +01:00
Roeland Jago Douma	f6ff624e3d	Merge pull request #1733 from nextcloud/dav-events ... Activities for calendars, events and todos	2016-11-03 19:31:20 +01:00
Björn Schießle	1c52d87821	Merge pull request #2000 from nextcloud/sharebymail-icon ... add share by mail icon, fix #1979	2016-11-03 15:33:58 +01:00
Joas Schilling	7a0e003ade	Add more tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 15:24:18 +01:00
Joas Schilling	36b656e207	Add tests for triggerCalendarActivity ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 14:30:02 +01:00
Morris Jobke	ae5eb79593	Merge pull request #1908 from nextcloud/downstream-26078 ... Upload autorename on client side	2016-11-03 14:21:35 +01:00
Jan-Christoph Borchardt	219b536f70	add share by mail icon, fix #1979 ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-11-03 14:05:43 +01:00
Roeland Jago Douma	55af6b45f7	More tests ... * PreviewController test * PublicPreview test * Versions Preview test * Trash Preview test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Roeland Jago Douma	87855aa97b	Added genertor helper & tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Roeland Jago Douma	3d6ee7ffc9	Update thumbnail endpoint to new generato ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Roeland Jago Douma	5d11085190	Move over files_trashbin ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Roeland Jago Douma	d720a2fb57	Moved over files_versions ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Roeland Jago Douma	3822bceea2	Move publicpreview over ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-03 14:00:33 +01:00
Joas Schilling	c4775a5bce	Start unit tests for the activity listener ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:57:40 +01:00
Joas Schilling	e8f82c6b61	Add tests for dispatching of the events ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:28:12 +01:00
Lukas Reschke	b33ceb6fdd	Merge pull request #1915 from nextcloud/downstream-26398 ... Add using casing check/fix for initMountPoints	2016-11-03 12:14:28 +01:00
Joas Schilling	52dd27892b	Use the event dispatcher ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:59 +01:00
Joas Schilling	d3e8463de2	Use a different type for events and todos ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:59 +01:00
Joas Schilling	43b46bcc6a	Activities for events and todos ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:58 +01:00
Joas Schilling	07f6747305	Move the methods into a new class ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:58 +01:00
Joas Schilling	776622f3de	Add activities for shares ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:58 +01:00
Joas Schilling	35ce4c772c	Fix unshare actions for author != owner ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:58 +01:00
Joas Schilling	9a7c522cc6	Add activity for unshare from group ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:58 +01:00
Joas Schilling	83d51afab1	Unshare user activities ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:57 +01:00
Joas Schilling	90578327d5	Start working on calendar activities ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-11-03 12:07:57 +01:00
Morris Jobke	9ebbb3c654	Merge pull request #1991 from nextcloud/code-check-more-shipped-apps ... Run code checker on more shipped apps	2016-11-03 09:16:20 +01:00
Nextcloud bot	8471219b7c	[tx-robot] updated from transifex	2016-11-03 01:07:06 +00:00
Lukas Reschke	ffba8297df	Run code checker on more shipped apps ... Adds: - sharebymail - systemtags - theming - workflowengine Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-03 00:11:28 +01:00
Morris Jobke	39573e602d	Merge pull request #1978 from nextcloud/remove-send-mail-option ... Remove send mail option	2016-11-02 22:36:05 +01:00
Vincent Petry	f737426eca	Add using casing check/fix for initMountPoints	2016-11-02 22:21:46 +01:00
Vincent Petry	6a4ea2c15a	Upload autorename on client side ... Removes the need for POST to collection which would hit against upload limits. The client tries to auto rename the file by adding a suffix "(2)". It tries to use the file list on the client side to guess a suitable name. In case a file still cannot be uploaded and creates a conflict, which can happen when the file was concurrently uploaded, the logic will continue increasing the suffix.	2016-11-02 22:15:03 +01:00
Roeland Jago Douma	a8d9bf48ff	Merge pull request #1511 from nextcloud/master-kill-upload-limit ... Remove upload_limit in files app as it is not needed with PUT upload	2016-11-02 21:24:10 +01:00
Bjoern Schiessle	d235c4833f	remove the 'shareapi_allow_mail_notification' setting ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-02 21:17:05 +01:00
Vincent Petry	7e701504be	Remove upload_limit in files app as it is not needed with PUT upload (#26069) ... The web UI now uses for PUT uploads which aren't restricted by PHP's upload_max_filesize and post_max_size Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-11-02 20:43:35 +01:00
Lukas Reschke	50cb3a5e5a	Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing ... improved error messages in case federated sharing fails	2016-11-02 20:19:44 +01:00
Roeland Jago Douma	3bdec28dad	Merge pull request #1971 from nextcloud/fix-checkbox-glitch ... Fix checkbox left margin glitch	2016-11-02 20:02:36 +01:00
Bjoern Schiessle	f556c58c22	remove 'send mail notification' option from sharing, replaced by send-by-mail feature ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-02 18:30:38 +01:00
Bjoern Schiessle	4623b70cc9	catch all exception and return a user friendly exception message ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-02 18:05:14 +01:00
Michael Grosser	e81d04cd8d	Merge pull request #1940 from nextcloud/new-appstore ... Use new appstore API	2016-11-02 17:00:24 +00:00
John Molakvoæ	bc5268bdc8	Fix #1782 ... Fix checkbox left margin glitch Fix tests fix unit tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-11-02 15:07:24 +01:00
Morris Jobke	ffebc050d0	Merge pull request #1887 from nextcloud/downstream-26370 ... Added functions to check etag of elements - integration tests	2016-11-02 14:57:45 +01:00
Roeland Jago Douma	acf01b7f06	Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default ... use https by default if no protocol is given.	2016-11-02 12:09:11 +01:00
Joas Schilling	7da3ba3f91	Merge pull request #657 from nextcloud/share-by-mail ... New share provider: Share by mail	2016-11-02 11:04:33 +01:00
Bjoern Schiessle	76b1dee499	use https by default if no protocol is given. Only use unsecure connection if it is explicitely given ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-02 10:44:55 +01:00
Roeland Jago Douma	e5bc45c349	Fix OCS API to be able to remove group shares from self as recipient ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-02 08:49:58 +01:00
Nextcloud bot	122fbf0092	[tx-robot] updated from transifex	2016-11-02 01:07:09 +00:00
Bjoern Schiessle	f2b2b8d894	import exception ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 20:12:01 +01:00
Bjoern Schiessle	6e52091c8e	remove unused variable ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 20:11:30 +01:00
Bjoern Schiessle	32dbf32bc5	add new method getSharesInFolder(), see #339 ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 20:05:09 +01:00
Bjoern Schiessle	16ec0f2177	add tests for the share-by-mail provider ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	86b362809b	always show correct place holder, mention share by mail only if the share provider is enabled ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	ce08682c2f	enabled by default and add to shipped.json ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	6d7520b1e2	unit tests updated and new added ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	1e930df91f	find and show share-by mail links ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	561dd80d57	don't show 'notify by mail' option or permissions not available for mail shares ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:41 +01:00
Bjoern Schiessle	31c8c38bd6	send mail for share-by-mail shares ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	7436e45c91	if we have a exact match, either for the federated cloud id or for the ... email address we only return the exact match. It is highly unlikely that the exact same email address and federated cloud id exists Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	392c8a115f	unified way to display remote shares and mail shares ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	8c8a019b7e	show correct display name if we have the user in one of our address books ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	60a3893ca8	improve search for federated cloud ids and email adresses ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	77f74b9780	handle case if no share-by-mail share provider is loaded ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:54:40 +01:00
Bjoern Schiessle	96c40d14a1	update permissions ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:51:11 +01:00
Bjoern Schiessle	a17c6a485d	add share by mail share provider ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:51:11 +01:00
Bjoern Schiessle	0a6f02801f	introduce share by mail, ui part ... Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	2016-11-01 19:51:11 +01:00
Lukas Reschke	ef467c3195	Merge pull request #339 from nextcloud/share-types-by-folder ... Add getShareTypesInFolder to optimize folder listening	2016-11-01 18:44:00 +01:00
Roeland Jago Douma	7e2159e9bb	Add defaultShareProvider & federatedshareprovider tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-01 13:52:37 +01:00
Roeland Jago Douma	fc4d0a86ef	Fix merging backend results ... * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-11-01 12:16:05 +01:00
Nextcloud bot	20f45e6fe4	[tx-robot] updated from transifex	2016-11-01 01:06:57 +00:00
Roeland Jago Douma	ce7eb02685	Add remoteprovider getsharesinfolder function ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-31 20:26:11 +01:00
Lukas Reschke	8acb54aa0b	Add update support ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-31 17:17:47 +01:00
Lukas Reschke	8d83e239f3	Fix tests ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-31 17:17:45 +01:00
Lukas Reschke	32cf661215	Use new appstore API ... This change introduces the new appstore API in Nextcloud. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-31 17:17:44 +01:00
Robin Appelman	3692769b0a	Add getShareTypesInFolder to optimize folder listening ... Signed-off-by: Robin Appelman <icewind@owncloud.com>	2016-10-31 15:55:40 +01:00
Lukas Reschke	85016977f4	Merge pull request #1935 from nextcloud/downstream-ldap-26 ... Add prefix to the connection	2016-10-31 09:27:09 +01:00
Lukas Reschke	230dca0065	Merge pull request #1903 from nextcloud/fix-log-in-button ... remove slight transparency of primary action button, ref #1615	2016-10-31 08:51:09 +01:00
Nextcloud bot	6d2d069c17	[tx-robot] updated from transifex	2016-10-31 01:06:55 +00:00
Marius Blüm	a08a4b5981	Merge pull request #1955 from nextcloud/issue_#1776 ... Issue-1776: Add unshare function to 3-dot menu.	2016-10-30 11:27:57 +01:00
Nextcloud bot	1187a8c183	[tx-robot] updated from transifex	2016-10-30 00:06:56 +00:00
Julia Bode	2d91831b50	Issue-1776: Add unshare function to 3-dot menu. ... Signed-off-by: Julia Bode <julia.bode@lulisaur.us>	2016-10-29 17:07:06 +02:00
Lukas Reschke	e48fa1c337	Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n ... Move away from legacy OC_L10N	2016-10-29 09:39:22 +02:00
Nextcloud bot	035890aeb1	[tx-robot] updated from transifex	2016-10-29 00:07:14 +00:00
Morris Jobke	a78f6e9586	Use OCP\\IL10N in tests too ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-10-28 23:04:36 +02:00
Morris Jobke	48ce0ef19c	Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities ... Fix comment mentions in activities	2016-10-28 22:47:15 +02:00
Roeland Jago Douma	83e7cfd13a	Fix more tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-28 22:16:28 +02:00
Roeland Jago Douma	740659a04c	Move away from OC_L10N ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-28 21:46:28 +02:00
Joas Schilling	286482656b	Fix comment mentions in activities ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-28 12:32:10 +02:00
Jörn Friedrich Dreyer	f8352fcb8d	introduce callForSeenUsers and countSeenUsers (#26361) ... * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0	2016-10-28 08:44:05 +02:00
Nextcloud bot	ad597d498d	[tx-robot] updated from transifex	2016-10-28 00:07:11 +00:00
Morris Jobke	d4969abc9d	Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings ... Nextcloud rich object strings	2016-10-27 15:30:58 +02:00
Juan Pablo Villafáñez	1937e58ec0	Add prefix to the connection ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-27 13:08:09 +02:00
Nextcloud bot	9984eba727	[tx-robot] updated from transifex	2016-10-27 00:07:01 +00:00
Morris Jobke	cde7f535bd	Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions ... comment mentions: show displayname not uid	2016-10-26 14:02:49 +02:00
Morris Jobke	ffb0e91b60	Merge pull request #1907 from nextcloud/downstream-26164 ... Highlight files and update storage stats at end of upload (#26164)	2016-10-26 13:17:35 +02:00
Nextcloud bot	a973c1bfb9	[tx-robot] updated from transifex	2016-10-26 00:07:12 +00:00
Roeland Jago Douma	1b6ba5ad32	Merge pull request #1911 from nextcloud/downstream-26477 ... Fix malformed attribute in files app	2016-10-25 22:04:43 +02:00
Roeland Jago Douma	d89c1a49c1	Merge pull request #1913 from nextcloud/downstream-26441 ... Require to use at least desktop client 2.0 by default	2016-10-25 22:04:15 +02:00
Arthur Schiwon	b12b52b73b	fix JS test and introduce tests for rendering mentions to displaynames ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-25 18:33:59 +02:00
Thomas Müller	9df3869bfc	Fix unit tests for BlockLegacyClientPlugin	2016-10-25 18:03:10 +02:00
Thomas Müller	1c39b30d50	Require to use at least desktop client 2.0 by default	2016-10-25 18:01:25 +02:00
Morris Jobke	fa4bf7b0b0	Merge pull request #1906 from nextcloud/downstream-26460 ... Remove any detailed information about the exception in the browser er…	2016-10-25 17:58:19 +02:00
Vincent Petry	e456df14ab	Fix malformed attribute in files app	2016-10-25 17:32:59 +02:00
Vincent Petry	50b8221255	Highlight files and update storage stats at end of upload (#26164) ... Properly trigger the "stop" even from the uploader. Also update storage stats at the end of all uploads instead of for each upload.	2016-10-25 14:51:44 +02:00
Thomas Müller	726994ecae	Remove any detailed information about the exception in the browser error plugin	2016-10-25 14:47:33 +02:00
Morris Jobke	89574367bc	Merge pull request #1871 from nextcloud/use-csp-nonces ... Use CSP nonces	2016-10-25 14:46:00 +02:00
Jan-Christoph Borchardt	cbd9fb3c5c	also fix log in button confirm arrow when theming, fix #1615 ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-25 14:24:24 +02:00
Morris Jobke	01a85a98f2	Merge pull request #1876 from nextcloud/shareesAPI_email ... Add ShareesAPI E-mail search	2016-10-25 13:53:59 +02:00
Morris Jobke	c0adc3c2cf	Merge pull request #1883 from nextcloud/downstream-26145 ... Storage 503 message improvements	2016-10-25 13:19:46 +02:00
Jan-Christoph Borchardt	551cffd1b8	remove slight transparency of primary action button, ref #1615 ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-25 13:16:13 +02:00
Nextcloud bot	e23a298a81	[tx-robot] updated from transifex	2016-10-25 09:36:09 +00:00
Morris Jobke	e8c359d86e	Merge pull request #1897 from nextcloud/fix-public-button ... fix button on public upload page for mobile	2016-10-25 11:03:21 +02:00
Joas Schilling	890f752a6b	Merge pull request #1452 from nextcloud/appconfig-endpoint ... Appconfig endpoint	2016-10-25 10:57:48 +02:00
Lukas Reschke	79706e0ddc	Merge pull request #1283 from nextcloud/us_files-ui-webdav-upload ... Use Webdav PUT for uploads	2016-10-25 10:31:03 +02:00
Roeland Jago Douma	60fa82d92f	Merge pull request #1860 from ryanwr/feature-sort-favorite ... Sort favorite files first	2016-10-25 08:22:33 +02:00
Jan-Christoph Borchardt	d4515ae603	fix button on public upload page ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-24 23:26:56 +02:00
Roeland Jago Douma	c8a13f644e	Only enable files_drop plugin when we actuall do files_drop ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Roeland Jago Douma	0abcc630a5	Fix public files_drop page ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Roeland Jago Douma	7a6dbeb398	Make files_drop work ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Roeland Jago Douma	e73a11d106	Fix permision mask ... If we move a file from the temp part file to the original file we don't need update permissions. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Vincent Petry	f374eb5f1d	More fixes to file upload ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Vincent Petry	f72ffa2f11	Fix js unit tests for webdav put upload changes ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Vincent Petry	786e858d23	Add support for chunked upload ... Hacked around Blueimp's jquery.fileupload to make it work with our new chunking API. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Vincent Petry	c68e273664	Goodbye Iframe transport ! ... Not needed any more in IE >= 11 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
Vincent Petry	59c5be1cc5	Use Webdav PUT for uploads in the web browser ... - uses PUT method with jquery.fileupload for regular and public file lists - for IE and browsers that don't support it, use POST with iframe transport - implemented Sabre plugin to handle iframe transport and redirect the embedded PUT request to the proper handler - added RFC5995 POST to file collection with "add-member" property to make it possible to auto-rename conflicting file names - remove obsolete ajax/upload.php and obsolete ajax routes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 21:45:00 +02:00
ryanwr	3e96f33995	Sort favorite files first Issue #1802 ... Signed-off-by: Ryan Welch <ryantwr@gmail.com>	2016-10-24 17:55:47 +01:00
Lukas Reschke	38b3ac8213	Add ContentSecurityPolicyNonceManager ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-24 16:35:31 +02:00
Vincent Petry	44cf67accd	Storage 503 message improvements ... "Storage not available" is now "Storage temporarily not available". Exceptions are now logged in DEBUG level, not FATAL.	2016-10-24 15:43:15 +02:00
Roeland Jago Douma	a28528a254	Add ShareesAPI E-mail search ... * Allow to search for SHARE_TYPE_EMAIL (4) * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 14:59:32 +02:00
Joas Schilling	b130267e58	Import the used classes ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-24 14:33:54 +02:00
Roeland Jago Douma	b4ebf03bef	Fix tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 13:25:59 +02:00
Lukas Reschke	9e6634814e	Add support for CSP nonces ... CSP nonces are a feature available with CSP v2. Basically instead of saying "JS resources from the same domain are ok to be served" we now say "Ressources from everywhere are allowed as long as they add a `nonce` attribute to the script tag with the right nonce. At the moment the nonce is basically just a `<?php p(base64_encode($_['requesttoken'])) ?>`, we have to decode the requesttoken since `:` is not an allowed value in the nonce. So if somebody does on their own include JS files (instead of using the `addScript` public API, they now must also include that attribute.) IE does currently not implement CSP v2, thus there is a whitelist included that delivers the new CSP v2 policy to newer browsers. Check http://caniuse.com/#feat=contentsecuritypolicy2 for the current browser support list. An alternative approach would be to just add `'unsafe-inline'` as well as `'unsafe-inline'` is ignored by CSPv2 when a nonce is set. But this would make this security feature unusable at all in IE. Not worth it at the moment IMO. Implementing this offers the following advantages: 1. **Security:** As we host resources from the same domain by design we don't have to worry about 'self' anymore being in the whitelist 2. **Performance:** We can move oc.js again to inline JS. This makes the loading way quicker as we don't have to load on every load of a new web page a blocking dynamically non-cached JavaScript file. If you want to toy with CSP see also https://csp-evaluator.withgoogle.com/ Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-24 12:27:50 +02:00
Roeland Jago Douma	f589f1a1d6	Move files_sharing Controllers => Controller ... lib/Controller is the default location for controllers. So lets put them all in there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 11:46:25 +02:00
Roeland Jago Douma	6604e76e94	Fix middleware tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 09:52:34 +02:00
Roeland Jago Douma	ea07bbc562	Move Share20OCS to ShareAPIController ... It was already a controller just still residing in its old location. * Moved ShareAPIController to user plain userID instead of user object * Moved Share20OCS to ShareAPIController * Removed initisation of class from Application.php and leave it to the AppFramework * Fixed tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-24 09:52:34 +02:00
Lukas Reschke	598c145430	Merge pull request #1849 from nextcloud/oc_26368 ... Adding capability about new chunking - refs #25682 (#26368)	2016-10-22 15:11:49 +02:00
Lukas Reschke	1be6213ba4	Merge pull request #1832 from nextcloud/select2-into-core ... Select2 into core	2016-10-22 14:35:07 +02:00
Lukas Reschke	169e889890	Add unit test ... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>	2016-10-22 14:05:53 +02:00
Arthur Schiwon	ab3954745c	avoid that all avatars are copied to the author row when editing comments ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-21 22:57:06 +02:00
Roeland Jago Douma	7792902808	Fix tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-21 21:43:15 +02:00
Thomas Müller	e0d919bbfc	Adding Open Graph Support for public shares http://ogp.me/ ... In case no preview is available we display the ownCloud logo Fix unit test	2016-10-21 21:42:40 +02:00
John Molakvoæ	3e5e07aa64	Template css order ... Select2 systemtags removal Settings again Fix Script Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	2016-10-21 16:56:31 +02:00
Thomas Müller	bf85139f53	Adding capability about new chunking - refs #25682 (#26368) ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-21 16:33:37 +02:00
Joas Schilling	0d878f94e6	Add unit tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-21 09:59:34 +02:00
Morris Jobke	2b76d14330	Merge pull request #1834 from nextcloud/downstream-26186 ... Add more files plugins to new DAV endpoint	2016-10-21 09:44:15 +02:00
Joas Schilling	103bf6dd28	Switch to public API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-21 09:09:26 +02:00
Joas Schilling	0b1fb180a5	Make AppConfig part of the public API ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-21 09:09:23 +02:00
Roeland Jago Douma	50b6ee67cb	Merge pull request #1806 from nextcloud/karakayasemi_1767 ... Update file.php put function posthook calls	2016-10-21 08:45:51 +02:00
Morris Jobke	2799b0a821	Merge pull request #1835 from nextcloud/downstream-24948 ... Move OC\Files\Storage\Shared to the right namespace	2016-10-20 23:48:15 +02:00
Vincent Petry	73e216e0a7	Add more files plugins to new DAV endpoint (#26186) ... * Add more files plugins to new DAV endpoint Also fix report plugin to properly retrieve the path from the prolongated URL * In case the report is not for this plugin -> simply return to allow other plugins to get executed * Adjust onReport tests to match new behavior	2016-10-20 21:36:15 +02:00
Semih Serhat Karakaya	33cee3502a	Update file.php put function posthook calls ... Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-20 21:07:15 +02:00
Morris Jobke	d9aeee2aa1	Merge pull request #1826 from nextcloud/downstream-26391 ... Fix post_unshareFromSelf hook parameter format	2016-10-20 20:44:05 +02:00
Joas Schilling	246bb9f33d	Move OC\Files\Storage\Shared to the right namespace	2016-10-20 20:27:44 +02:00
Morris Jobke	98c8464564	Merge pull request #1821 from nextcloud/downstream-26366 ... Code style changes from downstream	2016-10-20 20:18:47 +02:00
Lukas Reschke	0864f53675	Merge pull request #1796 from nextcloud/oc_fav-report ... Make it possible to filter by tags with REPORT method	2016-10-20 18:32:51 +02:00
Vincent Petry	d4976e5554	Fix post_unshareFromSelf hook parameter format ... When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.	2016-10-20 16:09:08 +02:00
Thomas Müller	08d6884107	Sanitize length headers when validating quota	2016-10-20 15:15:48 +02:00
Jan-Christoph Borchardt	5d7e9bb8fc	Merge pull request #1768 from nextcloud/more-filepicker ... More filepicker improvements	2016-10-20 14:46:57 +02:00
Joas Schilling	cf2d1b2427	Move federated share notifications to ROS ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-20 12:14:59 +02:00
Morris Jobke	195c53b7a6	Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict ... Show the path, when the filename conflicts	2016-10-20 00:27:54 +02:00
Robin Appelman	67050fd463	fix file exist dialog styling ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-19 14:18:21 +02:00
Arthur Schiwon	763a99ec30	consolidate error handling ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 13:56:49 +02:00
Arthur Schiwon	bc18a2900e	fix avatar displaying after submit (either edit or new) ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 12:47:53 +02:00
Roeland Jago Douma	b5599a7673	Merge pull request #1795 from nextcloud/systemtags-activity-wording ... change wording of system tags from un/assigned to more human added/removed	2016-10-19 12:16:46 +02:00
Joas Schilling	6f2fe8c62a	Show the path, when the filename conflicts ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-19 11:33:25 +02:00
Vincent Petry	361f008c70	Make it possible to filter by tags with REPORT method ... Enhanced the REPORT method on the Webdav endpoint and added a "oc:favorite" filter rule. When set, it will return a flat list of results filtered with only favorite files. The web UI was also adjusted to use this REPORT method instead of the private API endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-19 11:06:29 +02:00
Morris Jobke	e072057dd8	Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits ... Make sure we only use numbers as length	2016-10-19 11:01:19 +02:00
Jan-Christoph Borchardt	89dd5103cf	change wording of system tags from un/assigned to more human added/removed ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-19 10:50:20 +02:00
Joas Schilling	5e48ce98c7	Merge pull request #1784 from nextcloud/fix-activity-filter-names ... Adjust wording to make the separation between sharing and files more clear	2016-10-19 09:45:30 +02:00
Joas Schilling	05223a39f9	Make sure we only use numbers as length ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-19 09:28:54 +02:00
Arthur Schiwon	185433967e	display avatar (if enabled) alongside displaynames ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:34:00 +02:00
Arthur Schiwon	70bd6cafd4	fix regex ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:34:00 +02:00
Arthur Schiwon	b21ce6ee5e	improve regex, fixes replacements of usernames with same trunk ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:34:00 +02:00
Arthur Schiwon	0e926efc9b	show displayname not uid in commit mentions ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:34:00 +02:00
Arthur Schiwon	5d98ab83e9	resolve displayname via manager and registerable resolvers ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:34:00 +02:00
Arthur Schiwon	fea3e20a80	move mention extraction to (I)Comment and report mentions via DAV ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-19 00:33:55 +02:00
Morris Jobke	0c8bd9fa49	Merge pull request #1788 from nextcloud/share-link-whitespace ... add whitespace above share link so it's visually distinguished more	2016-10-18 20:19:58 +02:00
Jan-Christoph Borchardt	9f2e370ed7	add whitespace above share link so it's visually distinguished more ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-18 19:43:18 +02:00
Lukas Reschke	b8eea5fcab	Merge pull request #1729 from nextcloud/downstream-ldap-3 ... [downstream] LDAP empty hardening	2016-10-18 17:20:15 +02:00
Lukas Reschke	9759f55e50	Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache ... Do not reset the list after adding cached entries	2016-10-18 17:18:33 +02:00
Joas Schilling	b112493d1a	Adjust wording to make the separation between sharing and files clearer ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-18 17:18:14 +02:00
Lukas Reschke	c55a737b26	Merge pull request #1734 from nextcloud/setvalue_opt ... AllConfig setUserValue opt	2016-10-18 17:16:25 +02:00
Lukas Reschke	0923d2665f	Merge pull request #1742 from nextcloud/us_sync-date-of-death ... [oc] Sync deathdate and anniversary to birthday calendar	2016-10-18 17:14:53 +02:00
Morris Jobke	d366b0eff0	Merge pull request #1774 from nextcloud/ellipsize-sharee ... ellipsize sharee name to not overlap with can edit option on mobile	2016-10-18 17:03:03 +02:00
Morris Jobke	2bb031ecc6	Merge pull request #1606 from nextcloud/search-detail ... search design details	2016-10-18 13:48:01 +02:00
Jan-Christoph Borchardt	22f76d96ad	ellipsize sharee name to not overlap with ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>	2016-10-18 11:18:25 +02:00
Jan-Christoph Borchardt	129fdf2e2e	Merge pull request #1754 from nextcloud/files-move ... Add file action to move files and folders	2016-10-18 10:32:46 +02:00
Nextcloud bot	943d9737e4	[tx-robot] updated from transifex	2016-10-18 00:06:51 +00:00
Jan-Christoph Borchardt	2b79490201	use more fitting icon for files move action	2016-10-17 18:52:25 +02:00
Joas Schilling	4d6ec43402	Do not reset the list after adding cached entries ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-17 15:43:21 +02:00
Joas Schilling	77a5491d9d	Make sure the UID is correctly cased ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-17 13:41:38 +02:00
Morris Jobke	96f8f209b9	Merge pull request #1449 from nextcloud/comments-user-mention ... Notifications for simple @-mentioning in comments	2016-10-17 09:30:47 +02:00
Nextcloud bot	5b74b3ceaf	[tx-robot] updated from transifex	2016-10-17 00:06:55 +00:00
Arthur Schiwon	dade28cadd	Merge branch 'master' into downstream-ldap-3 ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-16 14:42:16 +02:00
Nextcloud bot	245a8f8fbc	[tx-robot] updated from transifex	2016-10-16 00:06:56 +00:00
Nextcloud bot	00ed841559	[tx-robot] updated from transifex	2016-10-15 00:06:56 +00:00
Robin Appelman	fdc2e8ba56	Add file action to move files and folders ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-14 16:23:11 +02:00
Arthur Schiwon	70c7781aa8	apply some polish ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-14 15:36:05 +02:00
Lukas Reschke	62e19dfa80	Merge pull request #1441 from nextcloud/getby-id-less-queries ... optimize Folder::getById to use less queries	2016-10-14 15:18:23 +02:00
Thomas Citharel	3b055b160e	fix typo ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-10-14 11:48:18 +02:00
Thomas Müller	5cd90d4116	[9.2] Sync deathdate and anniversary to birthday calendar (#25655) ... * Sync deathdate and anniversary to birthday calendar (which should be renamed maybe) * Sync deathdate and anniversary to birthday calendar (which should be renamed maybe) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-14 10:12:43 +02:00
Nextcloud bot	92c24a91fa	[tx-robot] updated from transifex	2016-10-14 00:07:00 +00:00
Roeland Jago Douma	6c5f7d586e	Fix migration tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-13 19:40:44 +02:00
Arthur Schiwon	a49d571799	fix and tidy up tests after merge conflicts ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-13 15:34:40 +02:00
Morris Jobke	05869e4d22	Merge pull request #1726 from nextcloud/fix-symfony-table ... symfony replaced table helper by class, fixes two broken LDAP occ com…	2016-10-13 12:19:15 +02:00
Nextcloud bot	9aae4a0d02	[tx-robot] updated from transifex	2016-10-13 00:07:02 +00:00
Victor Dubiniuk	c4fcd1f282	Update tests for phunit 5.5 ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-13 01:06:45 +02:00
Victor Dubiniuk	011d5f554c	Harden empty ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-13 00:53:34 +02:00
Arthur Schiwon	9e817e9e0b	symfony replaced table helper by class, fixes two broken LDAP occ commands ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-12 23:47:07 +02:00
Arthur Schiwon	1bcd2ca8e3	emit pre-update event for comments ... * notifications can be cleaned up, no polluted DB * updating comments will re-notify users or remove notifications, depending on the message Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-12 18:06:22 +02:00
Robin Appelman	2de59d8a2a	remove unneeded unlock ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:40 +02:00
Robin Appelman	ab10a54836	remove duplicate trait ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:38 +02:00
Robin Appelman	f63f0aa1ae	get node by path as fallback ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:37 +02:00
Robin Appelman	9754724c8b	fix getting recipient share in ocs api ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:37 +02:00
Robin Appelman	7d1e800c15	fix share tests not passing path ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:36 +02:00
Robin Appelman	1b3b816a0a	re-use the share node while formating if we already have it ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:35 +02:00
Robin Appelman	3845d4ec9a	more robust test setup ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:34 +02:00
Robin Appelman	7ce68ce6ac	phpunit is weird ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:34 +02:00
Robin Appelman	37eded7e7c	Always unlock node after trying to create a share ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-12 16:12:29 +02:00
Roeland Jago Douma	b2d68c0009	Merge pull request #1713 from nextcloud/rebase_1493 ... fix issue #1482 - mail invites through v1 webdav	2016-10-12 10:24:44 +02:00
Claudemir Todo Bom	5b7f272fd4	fix issue #1482 - mail invites through v1 webdav ... Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-12 09:13:55 +02:00
Roeland Jago Douma	0c574569a4	Readd Notify command ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-12 08:04:49 +02:00
Thomas Müller	8628d57b2c	Move console command registration to info.xml for encryption as well as files_external ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-12 08:04:15 +02:00
Nextcloud bot	c2be9cb605	[tx-robot] updated from transifex	2016-10-12 00:08:16 +00:00
Thomas Müller	c5ca71ee82	[9.2] Register commands in info.xml (#26248) ... * Use DI to load console commands from the apps - class name to be defined in the info.xml * Load commands from info.xml * Fix unit test * Allow Di magic for IMountManager Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-11 19:48:26 +02:00
Morris Jobke	675230f86d	Merge pull request #1407 from nextcloud/multiline_comments ... Bring back multiline comments	2016-10-11 16:17:51 +02:00
skjnldsv	1930aa3102	Fix bold no results search text ... Fix wording	2016-10-11 15:06:25 +02:00
skjnldsv	dcddd4b9d5	fix textarea submit	2016-10-11 12:33:20 +02:00
Robin Appelman	85bd5589cb	Fix mtimes for share root ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2016-10-11 11:09:05 +02:00
Nextcloud bot	cc4b51490e	[tx-robot] updated from transifex	2016-10-11 00:06:54 +00:00
Roeland Jago Douma	ada4d6cafc	Merge pull request #1680 from nextcloud/downstream-26308 ... Remove PNG fallbacks from files app	2016-10-10 22:09:48 +02:00
Lukas Reschke	d99ab1b038	Merge pull request #1675 from nextcloud/remove-unneeded-variable ... remove unneeded variable & proper element creation	2016-10-10 20:28:30 +02:00
Morris Jobke	0497affc46	fix drag and drop icon for files app ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-10-10 15:09:15 +02:00
Vincent Petry	db472b20cc	Remove PNG fallbacks from files app (#26308)	2016-10-10 15:08:40 +02:00
Morris Jobke	5158328190	remove unneeded variable & proper element creation ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2016-10-10 14:06:43 +02:00
Roeland Jago Douma	7d2f70ef72	Use more IConfig and add unit tests ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-10 10:51:13 +02:00
Roeland Jago Douma	bdf4bf4669	DI IConfig into ldap helper ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-10 10:18:18 +02:00
Roeland Jago Douma	1ba2b7e5d4	Do not query data that is already in the appconfig ... This is already available. We better use a simple regex. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2016-10-10 09:39:20 +02:00
Nextcloud bot	3f40bb69f8	[tx-robot] updated from transifex	2016-10-10 00:06:58 +00:00
Nextcloud bot	9fc3209d2c	[tx-robot] updated from transifex	2016-10-09 00:06:49 +00:00
Nextcloud bot	0beecbf2c5	[tx-robot] updated from transifex	2016-10-08 00:06:50 +00:00
Arthur Schiwon	a9671a4dc2	adjust wording of the notification ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-08 01:17:51 +02:00
Arthur Schiwon	a35d4e7b44	remove notifications of deleted comments from the DB ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-08 01:10:49 +02:00
Arthur Schiwon	006da9afd7	use different files route/controller ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-07 17:27:33 +02:00
Arthur Schiwon	e1073cf442	Notificacations for simple @-mentioning in comments ... (WIP) notify user when mentioned in comments Fix doc, and create absolute URL for as notification link. PSR-4 compatibility changes also move notification creation to comments app Do not notify yourself unit test for controller and application smaller fixes - translatable app name - remove doubles in mention array - micro perf optimization - display name: special label for deleted users, keep user id for users that could not be fetched from userManager Comment Notification-Listener Unit Test fix email adresses remove notification when triggering comment was deleted add and adjust tests add missing @license tags simplify NotificationsController registration appinfo simplification, php docs make string easier to translate adjust test replace dispatcher-based listeners with a registration method and interface safer to not pass optional data parameter to setSubject for marking as processed. ID and mention suffices Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> update comment Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-07 17:11:19 +02:00
Morris Jobke	7264d20152	Merge pull request #1643 from nextcloud/ldap_more_caching ... cache loginName2UserName and cover the method with unit tests	2016-10-07 09:38:53 +02:00
Nextcloud bot	838e258b44	[tx-robot] updated from transifex	2016-10-07 00:07:04 +00:00
Arthur Schiwon	a30341823e	cache loginName2UserName and cover the method with unit tests ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-07 01:39:57 +02:00
Morris Jobke	6278d3bbfd	Merge pull request #1144 from nextcloud/translate-default-calendar ... translate default calendar & default address book displaynames & add …	2016-10-06 23:00:26 +02:00
Arthur Schiwon	979612fa08	get rid of test warnings ... Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>	2016-10-06 22:53:14 +02:00
Morris Jobke	55e72caf9b	Merge pull request #1616 from nextcloud/downstream_ldap_6 ... Prevent user with empty uid	2016-10-06 14:43:25 +02:00
Morris Jobke	70e0074e5c	Add transifex config	2016-10-06 14:20:02 +02:00
Joas Schilling	7dd952d5a2	Fix unit tests ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-06 14:20:02 +02:00
Joas Schilling	ce964f0a10	Translate the Contacts addressbook when it's default ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-06 14:20:01 +02:00
Joas Schilling	a4f82f13f3	Translate the personal calendar ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-06 14:19:58 +02:00
Morris Jobke	0a092e94c7	Merge pull request #1636 from nextcloud/downstream-26203-fix-synjob-class-name ... Fix SyncJob class name in info.xml	2016-10-06 12:45:54 +02:00
Joas Schilling	82c29e1204	Log the error with display name ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-06 11:21:43 +02:00
Joas Schilling	f6e8da186d	Merge pull request #1525 from nextcloud/newdav-tagsplugin ... Newdav tagsplugin	2016-10-06 11:13:48 +02:00
Joas Schilling	1a26e7a8e7	Fix SyncJob class name in info.xml ... Signed-off-by: Joas Schilling <coding@schilljs.com>	2016-10-06 10:55:28 +02:00
Morris Jobke	ff3e8c2139	Merge pull request #1518 from nextcloud/dav-fileshome-directory-properties ... FilesHome now also returns DAV properties	2016-10-06 00:21:44 +02:00
Morris Jobke	fe2116ecf7	Merge pull request #1519 from nextcloud/better-comments-in-activity-sidebar ... Better comments in activity sidebar	2016-10-05 23:56:10 +02:00