Commit graph

22571 commits

Author SHA1 Message Date
eb6ca77289
Merge pull request #6587 from rabuzarus/20190204_-_magicLinks_for_profileAdvanced
use magic Links for forums listed in the advanced profile section
2019-02-04 19:02:22 -05:00
rabuzarus
f190aa2140 use magic Links for forums listed in the advanced profile section 2019-02-04 23:18:51 +01:00
Michael Vogel
6436145909
Merge pull request #6584 from tobiasd/20190204-cs
CS translation update THX Aditoo
2019-02-04 08:30:36 +01:00
2357a7b0f5 CS translation update THX Aditoo 2019-02-04 07:18:24 +01:00
deaecfaf79
Merge pull request #6582 from MrPetovan/bug/6570-fix-diaspora-hashtags
Only escape leading hash marks in Markdown::toBBCode
2019-02-04 06:47:27 +01:00
5d2fce789a
Merge pull request #6583 from annando/priority
Lower priority for removing items
2019-02-03 19:37:16 -05:00
97fb2202cb Lower priority for removing item 2019-02-03 23:59:16 +00:00
633d04049b Lower priority for removing users 2019-02-03 23:55:46 +00:00
e5647be30f Only escape leading hash marks in Markdown::toBBCode
- Remove useless line ending fiddling
2019-02-03 18:31:11 -05:00
Michael Vogel
5e2cbce9b6
Merge pull request #6580 from MrPetovan/bug/6575-escaped-field-input-attributes
Add nofilter to field_input attribute parameter
2019-02-03 22:52:30 +01:00
8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
ba7ffab3c2 Add nofilter to field_input attribute parameter 2019-02-03 15:32:52 -05:00
82f713cb7f
Merge pull request #6576 from nupplaphil/cache_lock_mock
Refactoring DBA-mocking tests
2019-02-03 07:53:36 -05:00
e9b7b81232
Merge pull request #6578 from Ixiter/develop-markdown-anchors
Markdown - Fixed bug with local anchor links
2019-02-03 07:51:26 -05:00
peter
0ca762001b Markdown - fixed bug in local anchor links, optimized replacer 2019-02-03 10:33:15 +01:00
peter
990cc45a26 Markdown - fixed bug in local anchor links 2019-02-03 03:23:47 +01:00
835b5c00ee
ConsoleTest is now a MockedTest 2019-02-02 19:21:48 +01:00
433d6abe8c
Refactoring DBA-mocking tests
- Reducing DB-dependencies
- Creating DB-cache mocks
- Creating DB-lock mocks
- Switching to mocked dependencies for Cache/Lock/App
2019-02-02 19:03:15 +01:00
441d953098
Merge pull request #6573 from tobiasd/20190202-lng
translation updates
2019-02-02 07:34:49 -05:00
55de1c66f3 PL translation update THX waldis 2019-02-02 08:25:24 +01:00
33304d4b0b DE translation update 2019-02-02 08:24:44 +01:00
9342e97bac CS translation update THX Aditoo 2019-02-02 08:24:10 +01:00
92b1400506 update to the zh-cn translation THX ZhuChentan 2019-02-02 08:23:23 +01:00
51e669616a
Merge pull request #6572 from annando/hubzilla-ap
Hopefully fixes a communicaton problem with Hubzilla
2019-02-01 10:22:24 -05:00
35e3700c8a Hopefully fixes a communicaton problem with Hubzilla 2019-02-01 14:26:45 +00:00
Michael Vogel
811589c81b
Merge pull request #6562 from MrPetovan/task/4090-move-profile-to-src
Move profile module to src/
2019-01-31 07:02:05 +01:00
811bafa246
Merge pull request #6568 from annando/ap-mentions
Links of mentioned contacts hadn't looked great on Mastodon
2019-01-30 19:05:00 -05:00
bc5646092e
Merge pull request #6567 from annando/ap-auto-follow
Automatically follow every incoming reshared item
2019-01-30 19:03:54 -05:00
55150c97ce
Merge pull request #6566 from annando/ap-debug
AP: Debug option to deliver via AP first
2019-01-30 19:02:53 -05:00
de566cd888 Links of mentioned contacts hadn't looked great on Mastodon 2019-01-30 21:57:26 +00:00
a7963fe18a AP: Automatically send follow requests for reshared items 2019-01-30 21:33:23 +00:00
fc0acd7b1f AP: Debug option to deliver via AP first 2019-01-30 19:33:08 +00:00
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
fce46f5124 AP: Follow a note to receive all upcoming activities 2019-01-30 16:30:01 +00:00
23171296b2 Add missing EOF newline in Module\Profile 2019-01-30 11:11:23 -05:00
25aa3cff1b
Merge pull request #6563 from annando/ap-forum
AP: Clarify message distribution for forum posts
2019-01-30 15:01:06 +01:00
f0ec729466 Remove mod/profile.php 2019-01-30 08:07:31 -05:00
2c0ee72064 Ap: Clarify message distribution for forum posts 2019-01-30 13:07:23 +00:00
0615c8438a Add new Module\Profile class
- Update reference to legacy module function profile_content
2019-01-30 08:07:20 -05:00
Peter Liebetrau
9a5f9829c1
Merge pull request #2 from friendica/develop
sync with friendica
2019-01-30 13:21:28 +01:00
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
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
79d933cec7 at two places 2019-01-30 07:23:47 +01:00
87a814ee8d Wrong constant used in docs 2019-01-30 07:21:25 +01:00
b26d09d62b warn in admin panel when legacy config is used 2019-01-30 07:09:47 +01:00
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
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
bd031d0b87 Add result window for item tags in mod/babel 2019-01-29 20:39:38 -05:00