Tobias Diekershoff [Wed, 6 Feb 2019 08:02:18 +0000 (09:02 +0100)]
Merge pull request #6594 from annando/delete-item
Partly Reverted #6583
Michael [Wed, 6 Feb 2019 07:31:29 +0000 (07:31 +0000)]
Partly Reverted #6583
Hypolite Petovan [Tue, 5 Feb 2019 17:13:44 +0000 (12:13 -0500)]
Merge pull request #6591 from tobiasd/
20190205-6533
Filestorage Backend and legacy label
Tobias Diekershoff [Tue, 5 Feb 2019 16:44:16 +0000 (17:44 +0100)]
DE documentation for the Filestorage backend and some typos
Tobias Diekershoff [Tue, 5 Feb 2019 15:30:46 +0000 (16:30 +0100)]
File storage options, naming of the default option and EN docs
Tobias Diekershoff [Tue, 5 Feb 2019 06:49:54 +0000 (07:49 +0100)]
Merge pull request #6590 from MrPetovan/bug/6585-diaspora-ignore-escaped-asterisks
Diaspora: Remove asterisk-meddling regular expression
Hypolite Petovan [Tue, 5 Feb 2019 02:49:55 +0000 (21:49 -0500)]
Remove asterisk provision altogether in Markdown::toBBCode
Hypolite Petovan [Tue, 5 Feb 2019 02:46:34 +0000 (21:46 -0500)]
Improve Markdown::convert panel display in mod/babel
Hypolite Petovan [Tue, 5 Feb 2019 00:02:43 +0000 (19:02 -0500)]
Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard
frio: add account type to the profile vcard
Hypolite Petovan [Tue, 5 Feb 2019 00:02:22 +0000 (19:02 -0500)]
Merge pull request #6587 from rabuzarus/20190204_-_magicLinks_for_profileAdvanced
use magic Links for forums listed in the advanced profile section
rabuzarus [Mon, 4 Feb 2019 23:18:07 +0000 (00:18 +0100)]
frio: add account type to the profile vcard
rabuzarus [Mon, 4 Feb 2019 22:18:51 +0000 (23:18 +0100)]
use magic Links for forums listed in the advanced profile section
Michael Vogel [Mon, 4 Feb 2019 07:30:36 +0000 (08:30 +0100)]
Merge pull request #6584 from tobiasd/
20190204-cs
CS translation update THX Aditoo
Tobias Diekershoff [Mon, 4 Feb 2019 06:18:24 +0000 (07:18 +0100)]
CS translation update THX Aditoo
Tobias Diekershoff [Mon, 4 Feb 2019 05:47:27 +0000 (06:47 +0100)]
Merge pull request #6582 from MrPetovan/bug/6570-fix-diaspora-hashtags
Only escape leading hash marks in Markdown::toBBCode
Hypolite Petovan [Mon, 4 Feb 2019 00:37:16 +0000 (19:37 -0500)]
Merge pull request #6583 from annando/priority
Lower priority for removing items
Michael [Sun, 3 Feb 2019 23:59:16 +0000 (23:59 +0000)]
Lower priority for removing item
Michael [Sun, 3 Feb 2019 23:55:46 +0000 (23:55 +0000)]
Lower priority for removing users
Hypolite Petovan [Sun, 3 Feb 2019 23:31:11 +0000 (18:31 -0500)]
Only escape leading hash marks in Markdown::toBBCode
- Remove useless line ending fiddling
Michael Vogel [Sun, 3 Feb 2019 21:52:30 +0000 (22:52 +0100)]
Merge pull request #6580 from MrPetovan/bug/6575-escaped-field-input-attributes
Add nofilter to field_input attribute parameter
Hypolite Petovan [Sun, 3 Feb 2019 20:33:59 +0000 (15:33 -0500)]
Normalize field_*.tpl formatting
Hypolite Petovan [Sun, 3 Feb 2019 20:32:52 +0000 (15:32 -0500)]
Add nofilter to field_input attribute parameter
Hypolite Petovan [Sun, 3 Feb 2019 12:53:36 +0000 (07:53 -0500)]
Merge pull request #6576 from nupplaphil/cache_lock_mock
Refactoring DBA-mocking tests
Hypolite Petovan [Sun, 3 Feb 2019 12:51:26 +0000 (07:51 -0500)]
Merge pull request #6578 from Ixiter/develop-markdown-anchors
Markdown - Fixed bug with local anchor links
peter [Sun, 3 Feb 2019 09:33:15 +0000 (10:33 +0100)]
Markdown - fixed bug in local anchor links, optimized replacer
peter [Sun, 3 Feb 2019 02:23:47 +0000 (03:23 +0100)]
Markdown - fixed bug in local anchor links
Philipp Holzer [Sat, 2 Feb 2019 18:21:48 +0000 (19:21 +0100)]
ConsoleTest is now a MockedTest
Philipp Holzer [Wed, 30 Jan 2019 19:26:17 +0000 (20:26 +0100)]
Refactoring DBA-mocking tests
- Reducing DB-dependencies
- Creating DB-cache mocks
- Creating DB-lock mocks
- Switching to mocked dependencies for Cache/Lock/App
Hypolite Petovan [Sat, 2 Feb 2019 12:34:49 +0000 (07:34 -0500)]
Merge pull request #6573 from tobiasd/
20190202-lng
translation updates
Tobias Diekershoff [Sat, 2 Feb 2019 07:25:24 +0000 (08:25 +0100)]
PL translation update THX waldis
Tobias Diekershoff [Sat, 2 Feb 2019 07:24:44 +0000 (08:24 +0100)]
DE translation update
Tobias Diekershoff [Sat, 2 Feb 2019 07:24:10 +0000 (08:24 +0100)]
CS translation update THX Aditoo
Tobias Diekershoff [Sat, 2 Feb 2019 07:23:23 +0000 (08:23 +0100)]
update to the zh-cn translation THX ZhuChentan
Hypolite Petovan [Fri, 1 Feb 2019 15:22:24 +0000 (10:22 -0500)]
Merge pull request #6572 from annando/hubzilla-ap
Hopefully fixes a communicaton problem with Hubzilla
Michael [Fri, 1 Feb 2019 14:26:45 +0000 (14:26 +0000)]
Hopefully fixes a communicaton problem with Hubzilla
Michael Vogel [Thu, 31 Jan 2019 06:02:05 +0000 (07:02 +0100)]
Merge pull request #6562 from MrPetovan/task/4090-move-profile-to-src
Move profile module to src/
Hypolite Petovan [Thu, 31 Jan 2019 00:05:00 +0000 (19:05 -0500)]
Merge pull request #6568 from annando/ap-mentions
Links of mentioned contacts hadn't looked great on Mastodon
Hypolite Petovan [Thu, 31 Jan 2019 00:03:54 +0000 (19:03 -0500)]
Merge pull request #6567 from annando/ap-auto-follow
Automatically follow every incoming reshared item
Hypolite Petovan [Thu, 31 Jan 2019 00:02:53 +0000 (19:02 -0500)]
Merge pull request #6566 from annando/ap-debug
AP: Debug option to deliver via AP first
Michael [Wed, 30 Jan 2019 21:57:26 +0000 (21:57 +0000)]
Links of mentioned contacts hadn't looked great on Mastodon
Michael [Wed, 30 Jan 2019 21:33:23 +0000 (21:33 +0000)]
AP: Automatically send follow requests for reshared items
Michael [Wed, 30 Jan 2019 19:33:08 +0000 (19:33 +0000)]
AP: Debug option to deliver via AP first
Tobias Diekershoff [Wed, 30 Jan 2019 17:09:02 +0000 (18:09 +0100)]
Merge pull request #6565 from annando/ap-follow-note
AP: Follow a note to receive all upcoming activities
Michael [Wed, 30 Jan 2019 16:30:01 +0000 (16:30 +0000)]
AP: Follow a note to receive all upcoming activities
Hypolite Petovan [Wed, 30 Jan 2019 16:11:23 +0000 (11:11 -0500)]
Add missing EOF newline in Module\Profile
Tobias Diekershoff [Wed, 30 Jan 2019 14:01:06 +0000 (15:01 +0100)]
Merge pull request #6563 from annando/ap-forum
AP: Clarify message distribution for forum posts
Hypolite Petovan [Wed, 30 Jan 2019 13:07:31 +0000 (08:07 -0500)]
Remove mod/profile.php
Michael [Wed, 30 Jan 2019 13:07:23 +0000 (13:07 +0000)]
Ap: Clarify message distribution for forum posts
Hypolite Petovan [Wed, 30 Jan 2019 13:07:20 +0000 (08:07 -0500)]
Add new Module\Profile class
- Update reference to legacy module function profile_content
Peter Liebetrau [Wed, 30 Jan 2019 12:21:28 +0000 (13:21 +0100)]
Merge pull request #2 from friendica/develop
sync with friendica
Hypolite Petovan [Wed, 30 Jan 2019 12:14:19 +0000 (07:14 -0500)]
Merge pull request #6559 from tobiasd/
20190130-admininiwarning
warn in admin panel when legacy config is used
Tobias Diekershoff [Wed, 30 Jan 2019 09:40:28 +0000 (10:40 +0100)]
look in the config directory for the file
rebeka-catalina [Wed, 30 Jan 2019 07:28:55 +0000 (08:28 +0100)]
Merge pull request #6560 from tobiasd/
20190130-doc
Wrong constant used in docs
Tobias Diekershoff [Wed, 30 Jan 2019 06:23:47 +0000 (07:23 +0100)]
at two places
Tobias Diekershoff [Wed, 30 Jan 2019 06:21:25 +0000 (07:21 +0100)]
Wrong constant used in docs
Tobias Diekershoff [Wed, 30 Jan 2019 06:09:47 +0000 (07:09 +0100)]
warn in admin panel when legacy config is used
Tobias Diekershoff [Wed, 30 Jan 2019 05:32:31 +0000 (06:32 +0100)]
Merge pull request #6557 from annando/auto-mention
Don't auto mention yourself or forums, don't do it in the firstlevel
Michael [Wed, 30 Jan 2019 03:36:24 +0000 (03:36 +0000)]
Don't auto mention yourself or forums, don't do it in the firstlevel post
Michael Vogel [Wed, 30 Jan 2019 02:49:47 +0000 (03:49 +0100)]
Merge pull request #6556 from MrPetovan/bug/6554-fix-hashtag-in-code
Bug/fix hashtag in code
Hypolite Petovan [Wed, 30 Jan 2019 01:39:38 +0000 (20:39 -0500)]
Add result window for item tags in mod/babel
Hypolite Petovan [Wed, 30 Jan 2019 01:39:05 +0000 (20:39 -0500)]
Ignore code blocks when extracting tags
Hypolite Petovan [Wed, 30 Jan 2019 01:25:51 +0000 (20:25 -0500)]
Fix greedy regular expression and move code block escaping after tag extraction in Model\Item
Hypolite Petovan [Wed, 30 Jan 2019 01:00:11 +0000 (20:00 -0500)]
Merge pull request #6555 from rabuzarus/20190129_-_jot_atachment_preview
fix isssue if friendica is installed into a subdirectory
rabuzarus [Wed, 30 Jan 2019 00:00:40 +0000 (01:00 +0100)]
fix isssue if friendica is installed into a subdirectory
Hypolite Petovan [Tue, 29 Jan 2019 22:11:54 +0000 (17:11 -0500)]
Merge pull request #6554 from Ixiter/develop-bbcode-tags
Fixed some bugs with weird tagging in [code] blocks and tagging of multiple ##
Peter Liebetrau [Tue, 29 Jan 2019 21:34:28 +0000 (22:34 +0100)]
BBcode, Tags - changes for #pullrequestreview-
197771905
Peter Liebetrau [Tue, 29 Jan 2019 20:54:20 +0000 (21:54 +0100)]
BBcode, Tags - moved [code] escaping before BBCode::getTags() call
Peter Liebetrau [Tue, 29 Jan 2019 20:35:11 +0000 (21:35 +0100)]
BBcode, Tags - fixed doubbbllee trroubbllee
Peter Liebetrau [Tue, 29 Jan 2019 20:17:11 +0000 (21:17 +0100)]
BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags
Tobias Diekershoff [Tue, 29 Jan 2019 15:50:09 +0000 (16:50 +0100)]
Merge pull request #6548 from MrPetovan/bug/frio-fix-help-toc
[frio] Fix help TOC display
Hypolite Petovan [Tue, 29 Jan 2019 15:48:42 +0000 (10:48 -0500)]
Merge pull request #6550 from tobiasd/
20190129-lng
CS, DE and PL translation updates
Tobias Diekershoff [Tue, 29 Jan 2019 15:29:30 +0000 (16:29 +0100)]
DE translation update THX copis
Tobias Diekershoff [Tue, 29 Jan 2019 15:29:15 +0000 (16:29 +0100)]
PL translation update THX waldis
Tobias Diekershoff [Tue, 29 Jan 2019 15:29:07 +0000 (16:29 +0100)]
CS translation update THX Aditoo
rabuzarus [Tue, 29 Jan 2019 14:42:51 +0000 (15:42 +0100)]
Merge pull request #6549 from MrPetovan/task/improve-comment-mentions
Put cursor at end of default mentions in comment box
Hypolite Petovan [Tue, 29 Jan 2019 14:25:22 +0000 (09:25 -0500)]
Put cursor at end of default mentions in comment box
Hypolite Petovan [Tue, 29 Jan 2019 13:51:02 +0000 (08:51 -0500)]
[frio] Fix help TOC display
Hypolite Petovan [Tue, 29 Jan 2019 12:56:30 +0000 (07:56 -0500)]
Merge pull request #6541 from annando/mentions
Display mentioned users and in the comment box by default
Michael Vogel [Tue, 29 Jan 2019 12:20:08 +0000 (13:20 +0100)]
Merge pull request #6546 from fabrixxm/fix/issue6545
Filesystem storage: handle basepath with trailing slash and set file/folders permission
fabrixxm [Tue, 29 Jan 2019 11:36:23 +0000 (12:36 +0100)]
Filesystem storage: handle basepath with trailing slash
fabrixxm [Tue, 29 Jan 2019 11:35:30 +0000 (12:35 +0100)]
Filesystem storage: set permission on folders and files
files are set 0660 and folders 0770.
fix #6545
Tobias Diekershoff [Tue, 29 Jan 2019 05:22:13 +0000 (06:22 +0100)]
Merge pull request #6542 from MrPetovan/bug/fix-additional-info-setting
Rename conflicted variable $info in admin settings
Hypolite Petovan [Tue, 29 Jan 2019 02:39:51 +0000 (21:39 -0500)]
Rename conflicted variable $info in admin settings
Michael [Mon, 28 Jan 2019 22:06:28 +0000 (22:06 +0000)]
Standards
Michael [Mon, 28 Jan 2019 21:53:13 +0000 (21:53 +0000)]
Removing the parameter
Michael [Mon, 28 Jan 2019 21:22:03 +0000 (21:22 +0000)]
Display mentioned users and in the comment box by default
Michael Vogel [Mon, 28 Jan 2019 18:32:01 +0000 (19:32 +0100)]
Merge pull request #6539 from nupplaphil/logger_uid
Logger Unique ID
Philipp Holzer [Mon, 28 Jan 2019 17:41:29 +0000 (18:41 +0100)]
Making the processor name more explicit
Philipp Holzer [Mon, 28 Jan 2019 17:26:35 +0000 (18:26 +0100)]
improving code
Hypolite Petovan [Mon, 28 Jan 2019 13:02:31 +0000 (08:02 -0500)]
Merge pull request #6536 from annando/ap-forum-2
Another preparation for forum posts via AP
Philipp Holzer [Mon, 28 Jan 2019 11:35:14 +0000 (12:35 +0100)]
Double backslash
Philipp Holzer [Mon, 28 Jan 2019 10:35:08 +0000 (11:35 +0100)]
removing array prefix (compatibility)
Philipp Holzer [Mon, 28 Jan 2019 10:21:48 +0000 (11:21 +0100)]
Logger Unique ID
Michael [Mon, 28 Jan 2019 06:23:06 +0000 (06:23 +0000)]
Another preparation for forum posts via AP
Hypolite Petovan [Sun, 27 Jan 2019 22:29:13 +0000 (17:29 -0500)]
Merge pull request #6534 from annando/dba-error
Fix database error
Michael [Sun, 27 Jan 2019 19:54:08 +0000 (19:54 +0000)]
Fix database error
Hypolite Petovan [Sun, 27 Jan 2019 13:01:08 +0000 (08:01 -0500)]
Merge pull request #6531 from Ixiter/develop-theme-frio
frio - fix PHP Notices reported in #6338
Peter Liebetrau [Sun, 27 Jan 2019 12:21:18 +0000 (13:21 +0100)]
frio - fix PHP Notices reported in #6338
Tobias Diekershoff [Sun, 27 Jan 2019 06:28:24 +0000 (07:28 +0100)]
Merge pull request #6528 from MrPetovan/bug/html-bull-bullet
Switch to supported HTML entity for bullet in delivery indicator
Hypolite Petovan [Sun, 27 Jan 2019 03:55:21 +0000 (22:55 -0500)]
Merge pull request #6530 from Ixiter/develop-theme-frio
frio - fixed bug in admin users with table sorting #6529
https://reisub.nsupdate.info/git / friendica.git / .git / log