friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity
22,580 Commits
3 Branches
64 Tags
682 MiB
Commit Graph

22580 Commits (9f7fdb1bfffd58b56d0687892e193f6ef3366be8)

Author SHA1 Message Date
Tobias Diekershoff 9f7fdb1bff Storage Backend: wording of admin panel help 2019-02-06 07:35:57 +01:00
Hypolite Petovan 0939529450
Merge pull request #6591 from tobiasd/20190205-6533 
Filestorage Backend and legacy label
 2019-02-05 12:13:44 -05:00
Tobias Diekershoff 4ffc97af76 DE documentation for the Filestorage backend and some typos 2019-02-05 17:44:16 +01:00
Tobias Diekershoff b654784396 File storage options, naming of the default option and EN docs 2019-02-05 16:30:46 +01:00
Tobias Diekershoff 2ed66cb03b
Merge pull request #6590 from MrPetovan/bug/6585-diaspora-ignore-escaped-asterisks 
Diaspora: Remove asterisk-meddling regular expression
 2019-02-05 07:49:54 +01:00
Hypolite Petovan a96e9f248e Remove asterisk provision altogether in Markdown::toBBCode 2019-02-04 21:50:27 -05:00
Hypolite Petovan 3c62a7206e Improve Markdown::convert panel display in mod/babel 2019-02-04 21:46:34 -05:00
Hypolite Petovan cf9a65cded
Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard 
frio: add account type to the profile vcard
 2019-02-04 19:02:43 -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 56495e03c6 frio: add account type to the profile vcard 2019-02-05 00:18:07 +01: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
Tobias Diekershoff 2357a7b0f5 CS translation update THX Aditoo 2019-02-04 07:18:24 +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
Hypolite Petovan 5d2fce789a
Merge pull request #6583 from annando/priority 
Lower priority for removing items
 2019-02-03 19:37:16 -05: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
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
Hypolite Petovan 8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
Hypolite Petovan ba7ffab3c2 Add nofilter to field_input attribute parameter 2019-02-03 15:32:52 -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 835b5c00ee
ConsoleTest is now a MockedTest 2019-02-02 19:21:48 +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 441d953098
Merge pull request #6573 from tobiasd/20190202-lng 
translation updates
 2019-02-02 07:34:49 -05:00
Tobias Diekershoff 55de1c66f3 PL translation update THX waldis 2019-02-02 08:25:24 +01:00
Tobias Diekershoff 33304d4b0b DE translation update 2019-02-02 08:24:44 +01:00
Tobias Diekershoff 9342e97bac CS translation update THX Aditoo 2019-02-02 08:24:10 +01:00
Tobias Diekershoff 92b1400506 update to the zh-cn translation THX ZhuChentan 2019-02-02 08:23:23 +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
Hypolite Petovan bc5646092e
Merge pull request #6567 from annando/ap-auto-follow 
Automatically follow every incoming reshared item
 2019-01-30 19:03:54 -05:00
Hypolite Petovan 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
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
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
Hypolite Petovan 23171296b2 Add missing EOF newline in Module\Profile 2019-01-30 11:11:23 -05: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
Hypolite Petovan f0ec729466 Remove mod/profile.php 2019-01-30 08:07:31 -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
Peter Liebetrau 9a5f9829c1
Merge pull request #2 from friendica/develop 
sync with friendica
 2019-01-30 13:21:28 +01: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