keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22586 commits 4 branches 0 tags 179 MiB
Commit graph

2765 commits

Author SHA1 Message Date
Michael
16bf9c771d The automatic follow request is currently deactivated, due to false notifications 2019-02-06 21:34:44 +00:00
Tobias Diekershoff
e484678187
Merge pull request #6596 from annando/worker-jpm 
Separate config options to display the worker jobs per minute
 2019-02-06 09:04:24 +01:00
Tobias Diekershoff
cbe2d1745b
Merge pull request #6595 from annando/notice 
Some small notice prevented
 2019-02-06 09:02:49 +01:00
Tobias Diekershoff
4a501e4e46
Merge pull request #6594 from annando/delete-item 
Partly Reverted #6583
 2019-02-06 09:02:18 +01:00
Michael
b0411b46c4 Separate config options to display the worker jobs per minute 2019-02-06 07:37:45 +00:00
Michael
b4fc1d6810 Partly Reverted #6583 2019-02-06 07:31:29 +00:00
Michael
71fe689aae Some small notice prevented 2019-02-06 07:30:31 +00:00
Hypolite Petovan
a96e9f248e Remove asterisk provision altogether in Markdown::toBBCode 2019-02-04 21:50:27 -05:00
Hypolite Petovan
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
Tobias Diekershoff
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
Michael
97fb2202cb Lower priority for removing item 2019-02-03 23:59:16 +00:00
Michael
633d04049b Lower priority for removing users 2019-02-03 23:55:46 +00:00
Hypolite Petovan
e5647be30f Only escape leading hash marks in Markdown::toBBCode 
- Remove useless line ending fiddling
 2019-02-03 18:31:11 -05:00
Hypolite Petovan
82f713cb7f
Merge pull request #6576 from nupplaphil/cache_lock_mock 
Refactoring DBA-mocking tests
 2019-02-03 07:53:36 -05:00
Hypolite Petovan
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
Philipp Holzer
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
Hypolite Petovan
51e669616a
Merge pull request #6572 from annando/hubzilla-ap 
Hopefully fixes a communicaton problem with Hubzilla
 2019-02-01 10:22:24 -05:00
Michael
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
Hypolite Petovan
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
Michael
de566cd888 Links of mentioned contacts hadn't looked great on Mastodon 2019-01-30 21:57:26 +00:00
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
Michael
fce46f5124 AP: Follow a note to receive all upcoming activities 2019-01-30 16:30:01 +00:00
Hypolite Petovan
23171296b2 Add missing EOF newline in Module\Profile 2019-01-30 11:11:23 -05:00
Michael
2c0ee72064 Ap: Clarify message distribution for forum posts 2019-01-30 13:07:23 +00:00
Hypolite Petovan
0615c8438a Add new Module\Profile class 
- Update reference to legacy module function profile_content
 2019-01-30 08:07:20 -05: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
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
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
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
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
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
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