22537 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	a7963fe18a	AP: Automatically send follow requests for reshared items	2019-01-30 21:33:23 +00:00
Michael	fc0acd7b1f	AP: Debug option to deliver via AP first	2019-01-30 19:33:08 +00:00
Tobias Diekershoff	5d43d521d3	Merge pull request #6565 from annando/ap-follow-note ... AP: Follow a note to receive all upcoming activities	2019-01-30 18:09:02 +01:00
Michael	fce46f5124	AP: Follow a note to receive all upcoming activities	2019-01-30 16:30:01 +00:00
Tobias Diekershoff	25aa3cff1b	Merge pull request #6563 from annando/ap-forum ... AP: Clarify message distribution for forum posts	2019-01-30 15:01:06 +01:00
Michael	2c0ee72064	Ap: Clarify message distribution for forum posts	2019-01-30 13:07:23 +00:00
Hypolite Petovan	8db9b0987e	Merge pull request #6559 from tobiasd/20190130-admininiwarning ... warn in admin panel when legacy config is used	2019-01-30 07:14:19 -05:00
Tobias Diekershoff	cb72a5fd3b	look in the config directory for the file	2019-01-30 10:40:28 +01:00
rebeka-catalina	302ef596d4	Merge pull request #6560 from tobiasd/20190130-doc ... Wrong constant used in docs	2019-01-30 08:28:55 +01:00
Tobias Diekershoff	79d933cec7	at two places	2019-01-30 07:23:47 +01:00
Tobias Diekershoff	87a814ee8d	Wrong constant used in docs	2019-01-30 07:21:25 +01:00
Tobias Diekershoff	b26d09d62b	warn in admin panel when legacy config is used	2019-01-30 07:09:47 +01:00
Tobias Diekershoff	15a5d689c6	Merge pull request #6557 from annando/auto-mention ... Don't auto mention yourself or forums, don't do it in the firstlevel	2019-01-30 06:32:31 +01:00
Michael	f226464acc	Don't auto mention yourself or forums, don't do it in the firstlevel post	2019-01-30 03:36:24 +00:00
Michael Vogel	3a27d66b8a	Merge pull request #6556 from MrPetovan/bug/6554-fix-hashtag-in-code ... Bug/fix hashtag in code	2019-01-30 03:49:47 +01:00
Hypolite Petovan	bd031d0b87	Add result window for item tags in mod/babel	2019-01-29 20:39:38 -05:00
Hypolite Petovan	30e97b4cc1	Ignore code blocks when extracting tags	2019-01-29 20:39:05 -05:00
Hypolite Petovan	9525e07971	Fix greedy regular expression and move code block escaping after tag extraction in Model\Item	2019-01-29 20:25:51 -05:00
Hypolite Petovan	2d6f658c33	Merge pull request #6555 from rabuzarus/20190129_-_jot_atachment_preview ... fix isssue if friendica is installed into a subdirectory	2019-01-29 20:00:11 -05:00
rabuzarus	0993f3e6ef	fix isssue if friendica is installed into a subdirectory	2019-01-30 01:00:40 +01:00
Hypolite Petovan	2bd62bfdea	Merge pull request #6554 from Ixiter/develop-bbcode-tags ... Fixed some bugs with weird tagging in [code] blocks and tagging of multiple ##	2019-01-29 17:11:54 -05:00
Peter Liebetrau	c3e5c77eb3	BBcode, Tags - changes for #pullrequestreview-197771905	2019-01-29 22:34:28 +01:00
Peter Liebetrau	5080778ea6	BBcode, Tags - moved [code] escaping before BBCode::getTags() call	2019-01-29 21:54:20 +01:00
Peter Liebetrau	87b1d0a4d7	BBcode, Tags - fixed doubbbllee trroubbllee	2019-01-29 21:35:11 +01:00
Peter Liebetrau	d8bd1921ee	BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags	2019-01-29 21:17:11 +01:00
Tobias Diekershoff	d0727e33d3	Merge pull request #6548 from MrPetovan/bug/frio-fix-help-toc ... [frio] Fix help TOC display	2019-01-29 16:50:09 +01:00
Hypolite Petovan	33b491f2a6	Merge pull request #6550 from tobiasd/20190129-lng ... CS, DE and PL translation updates	2019-01-29 10:48:42 -05:00
Tobias Diekershoff	a0c9a28f4b	DE translation update THX copis	2019-01-29 16:29:30 +01:00
Tobias Diekershoff	270cdaf648	PL translation update THX waldis	2019-01-29 16:29:15 +01:00
Tobias Diekershoff	9187799f14	CS translation update THX Aditoo	2019-01-29 16:29:07 +01:00
rabuzarus	2724219cef	Merge pull request #6549 from MrPetovan/task/improve-comment-mentions ... Put cursor at end of default mentions in comment box	2019-01-29 15:42:51 +01:00
Hypolite Petovan	bd03278ee9	Put cursor at end of default mentions in comment box	2019-01-29 09:25:22 -05:00
Hypolite Petovan	e6dccc42e4	[frio] Fix help TOC display	2019-01-29 08:51:02 -05:00
Hypolite Petovan	8d84f33f15	Merge pull request #6541 from annando/mentions ... Display mentioned users and in the comment box by default	2019-01-29 07:56:30 -05:00
Michael Vogel	383325f84b	Merge pull request #6546 from fabrixxm/fix/issue6545 ... Filesystem storage: handle basepath with trailing slash and set file/folders permission	2019-01-29 13:20:08 +01:00
fabrixxm	a7d45682e7	Filesystem storage: handle basepath with trailing slash	2019-01-29 12:36:23 +01:00
fabrixxm	ec94318a35	Filesystem storage: set permission on folders and files ... files are set 0660 and folders 0770. fix #6545	2019-01-29 12:35:30 +01:00
Tobias Diekershoff	8a5418ebee	Merge pull request #6542 from MrPetovan/bug/fix-additional-info-setting ... Rename conflicted variable $info in admin settings	2019-01-29 06:22:13 +01:00
Hypolite Petovan	0c12d8af5f	Rename conflicted variable $info in admin settings	2019-01-28 21:45:43 -05:00
Michael	e38eebe529	Standards	2019-01-28 22:06:28 +00:00
Michael	d259007f11	Removing the parameter	2019-01-28 21:53:13 +00:00
Michael	d40b2792b6	Display mentioned users and in the comment box by default	2019-01-28 21:22:03 +00:00
Michael Vogel	41b1c9b374	Merge pull request #6539 from nupplaphil/logger_uid ... Logger Unique ID	2019-01-28 19:32:01 +01:00
Philipp Holzer	d7e35b5802	Making the processor name more explicit	2019-01-28 18:41:29 +01:00
Philipp Holzer	26af96f31a	improving code	2019-01-28 18:26:35 +01:00
Hypolite Petovan	f7e95f65b1	Merge pull request #6536 from annando/ap-forum-2 ... Another preparation for forum posts via AP	2019-01-28 08:02:31 -05:00
Philipp Holzer	9fe1da5f94	Double backslash	2019-01-28 12:35:14 +01:00
Philipp Holzer	88e2cc9fa2	removing array prefix (compatibility)	2019-01-28 11:35:08 +01:00
Philipp Holzer	a5e12f53e8	Logger Unique ID	2019-01-28 11:21:48 +01:00
Michael	030c0b5dc6	Another preparation for forum posts via AP	2019-01-28 06:23:06 +00:00