Michael Vogel
26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace
...
Limit smilies replacement to BBCode::convert
2019-06-24 22:05:37 +02:00
Philipp Holzer
91c295b55f
Rebase type-hint based on af9ce6b92a
2019-06-24 09:36:07 +02:00
Philipp Holzer
082634adbc
Moving from DBA to Database
2019-06-24 09:36:07 +02:00
2fb70bd5f2
Use Unicode to convert multiple hearts in Content\Smilies
2019-06-23 17:53:25 -04:00
9545ff614b
Limit smilies replacement to BBCode::convert
2019-06-23 17:53:25 -04:00
b9ab613777
Merge branch 'master' into develop
2019-06-23 17:40:52 -04:00
fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix
...
Make authentication work for local private images
2019-06-23 15:18:15 -04:00
Michael Vogel
9559266075
todo added
2019-06-23 12:01:14 +02:00
Michael Vogel
f84e2e9d93
Fix for distribution of event deletions
2019-06-23 08:41:49 +02:00
Philipp
5306622225
Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks
...
Escape HTML pre-formatted blocks before converting smilies
2019-06-23 03:00:22 +02:00
Dean Townsley
0c6a0942cc
Clarify comment and log message
2019-06-22 19:08:34 -05:00
Dean Townsley
9dff3d2b6d
Use User:: API insteadd of direct database read
2019-06-22 18:56:33 -05:00
dc25355412
Merge pull request #7306 from annando/perform-activity
...
Fix the processing of event activities
2019-06-22 19:23:09 -04:00
Michael Vogel
449305e527
Fix the processing of event activities
2019-06-23 00:38:52 +02:00
cf11f57a5b
Escape HTML pre-formatted blocks before converting smilies
2019-06-22 18:22:37 -04:00
Michael Vogel
1883cfba24
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
2019-06-22 22:06:43 +02:00
Dean Townsley
042fcfeb50
Enable multi-auth in dfrn autoRedir
...
Update checks to account for a user being authenticated to multiple
contacts on the local server at the same time.
It was also necessary to remove a looping procection to make this work
correcly with browsers that open multiple connections because the
information about what contacts are authenticated is stored in the PHP
session.
2019-06-22 12:34:54 -05:00
Dean Townsley
b5e195b415
Add auth to load sequence for photos
...
This allows private photos to load on any page. Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
2019-06-22 12:24:30 -05:00
Michael Vogel
85772f02ca
Merge pull request #7286 from MrPetovan/bug/invading-smilies
...
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
2019-06-22 12:51:49 +02:00
cdd23e5b6d
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
2019-06-22 04:16:02 -04:00
b5de71c390
Fix a notice when the author is missing
2019-06-21 17:57:26 +00:00
b07490266c
Merge pull request #7288 from annando/fix-search
...
Fix searching for contacts
2019-06-20 19:33:00 -04:00
7c87e83dcf
Fix searching for contacts
2019-06-20 21:56:18 +00:00
14c28868eb
Issue 6477: Use the correct content-type to resize the images
2019-06-20 20:09:33 +00:00
f0849b0a93
Merge pull request #7284 from annando/fix-fatal
...
Don't send activities to "null" endpoints
2019-06-19 23:42:21 -04:00
2e4e8bdf0a
Don't send activities to "null" endpoints
2019-06-20 03:06:34 +00:00
2ba4116118
Merge pull request #7282 from annando/issue-6477
...
Issue 6477: Automatically repair self contact avatar
2019-06-19 16:12:56 -04:00
f878cc2623
Fix for PR 7280
2019-06-19 18:38:22 +00:00
d8ed2ed76d
it is poll, not notify
2019-06-19 18:32:38 +00:00
b55546b726
Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477
2019-06-19 18:26:59 +00:00
6bd5be281e
Normalise it
2019-06-19 17:21:35 +00:00
4ab772ed67
Issue 6477: Automatically repair self contact avatar
2019-06-19 17:05:29 +00:00
b48a49b0f5
Added timeout
2019-06-18 08:05:45 +00:00
ea90554e7f
Fix the base url detection of AP profiles
2019-06-18 07:47:21 +00:00
2c19b8c8e6
Merge pull request #7277 from annando/ignore-resharer
...
Issue #5983 : Ignore reshares from blocked and ignored contacts
2019-06-17 09:01:31 -04:00
496910e750
Issue #5983 : Ignore reshares from blocked and ignored contacts
2019-06-17 11:55:19 +00:00
d54e778f30
Move share conversion at the end of Text\BBCode::convert
2019-06-16 23:13:26 -04:00
da56e0a541
Add tests folder to typo console coverage
...
- Use correct config object in Console\Typo
2019-06-15 22:27:20 -04:00
84ccaf50fa
Allow brackets in URLs
...
- Remove obsolete $URLSearchString variable
- Add related tests
2019-06-15 22:26:29 -04:00
38311a4a02
Move link conversion to the end of BBCode::convert
...
- Addresses https://github.com/friendica/friendica/issues/7271
- Add related tests
2019-06-15 22:24:51 -04:00
14725bbd6a
Fix undefined index addr notices in Model\Contact::getIdForURL
...
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502393030
2019-06-15 17:16:10 -04:00
aa5a61baef
Fix variable by reference notice in Module\Admin\Federation
...
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347979
2019-06-15 17:12:36 -04:00
75894fa275
Use item created date if edited doesn't exist in Protocol\Diaspora::buildStatus
...
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347886
2019-06-15 17:11:01 -04:00
da114445c9
Merge pull request #7268 from annando/issue-5983
...
Issue 5983: Central check for blocked and ignored contacts added
2019-06-15 16:53:41 -04:00
394159d41e
Use correct entry list in Module\Directory
2019-06-15 08:44:55 -04:00
68c65af046
Remove unused Module\Directory::init method
2019-06-15 08:44:36 -04:00
f6f22378f1
Ignored stuff must be stored.
2019-06-14 18:34:17 +00:00
Michael Vogel
097ecdd106
Merge pull request #7266 from MrPetovan/bug/notices
...
Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion
2019-06-14 15:03:30 +02:00
Michael Vogel
dc3bbb749b
Merge pull request #7270 from MrPetovan/bug/7269-fetch-routes
...
Define expected /fetch module routes
2019-06-14 13:24:43 +02:00
95094aa53d
Check for existing protocols.inbound value in Protocol\PortableContact
2019-06-14 06:25:44 -04:00
