Hypolite Petovan
|
cf11f57a5b
|
Escape HTML pre-formatted blocks before converting smilies
|
2019-06-22 18:22:37 -04:00 |
|
Michael Vogel
|
daaf30e502
|
Merge pull request #7302 from friendica/revert-7286-bug/invading-smilies
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
|
2019-06-22 22:09:09 +02:00 |
|
Michael Vogel
|
1883cfba24
|
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
|
2019-06-22 22:06:43 +02:00 |
|
Michael Vogel
|
cd2f390df6
|
Merge pull request #7291 from MrPetovan/bug/2209-update-default-log-location
Update default log location
|
2019-06-22 12:56:25 +02: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 |
|
Hypolite Petovan
|
cdd23e5b6d
|
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
|
2019-06-22 04:16:02 -04:00 |
|
Hypolite Petovan
|
3cc9920aff
|
Add log folder to project gitignore
|
2019-06-22 03:50:14 -04:00 |
|
Hypolite Petovan
|
c86c43db31
|
Merge pull request #7294 from annando/public-dfrn
Fix receiving of DFRN posts with public envelope
|
2019-06-22 03:28:51 -04:00 |
|
Michael Vogel
|
a906446985
|
Merge pull request #7295 from tobiasd/20190622-lang
core translation update
|
2019-06-22 08:56:36 +02:00 |
|
Tobias Diekershoff
|
72fdbbe790
|
EN US translation update THX AndyH3
|
2019-06-22 08:04:46 +02:00 |
|
Tobias Diekershoff
|
4b4f121b72
|
EN GB translation update THX AndyH3
|
2019-06-22 07:43:24 +02:00 |
|
Tobias Diekershoff
|
ed1f96bf76
|
update FR translations THX Valvin A.
|
2019-06-22 07:40:10 +02:00 |
|
Tobias Diekershoff
|
680e2eb9e5
|
DE translation update THX Copis
|
2019-06-22 07:29:52 +02:00 |
|
Tobias Diekershoff
|
b2f5ccc689
|
PL translation update THX waldis
|
2019-06-22 07:29:03 +02:00 |
|
Tobias Diekershoff
|
acee9c1c91
|
CS translation update THX Aditoo
|
2019-06-22 07:23:39 +02:00 |
|
Michael
|
289bcfa121
|
Fix receiving of DFRN posts with public envelope
|
2019-06-22 04:17:38 +00:00 |
|
Hypolite Petovan
|
9ed262ced6
|
Merge pull request #7292 from annando/notice
Fix a notice when the author is missing
|
2019-06-21 15:42:27 -04:00 |
|
Michael
|
b5de71c390
|
Fix a notice when the author is missing
|
2019-06-21 17:57:26 +00:00 |
|
Hypolite Petovan
|
470dd6079e
|
Update default log location
- Prevents conflict with /friendica module
|
2019-06-21 08:52:22 -04:00 |
|
Philipp
|
cb5a30218d
|
Merge pull request #7289 from tobiasd/20190621-credits
updated the credits for 2019.06
|
2019-06-21 08:56:03 +02:00 |
|
Tobias Diekershoff
|
2deda829c9
|
updated the credits for 2019.06
|
2019-06-21 06:45:20 +02:00 |
|
Hypolite Petovan
|
b07490266c
|
Merge pull request #7288 from annando/fix-search
Fix searching for contacts
|
2019-06-20 19:33:00 -04:00 |
|
Hypolite Petovan
|
1644648447
|
Merge pull request #7287 from annando/issue-6477
Issue 6477: Use the correct content-type to resize the images
|
2019-06-20 19:32:02 -04:00 |
|
Michael
|
7c87e83dcf
|
Fix searching for contacts
|
2019-06-20 21:56:18 +00:00 |
|
Michael
|
14c28868eb
|
Issue 6477: Use the correct content-type to resize the images
|
2019-06-20 20:09:33 +00:00 |
|
Hypolite Petovan
|
f0849b0a93
|
Merge pull request #7284 from annando/fix-fatal
Don't send activities to "null" endpoints
|
2019-06-19 23:42:21 -04:00 |
|
Michael
|
2e4e8bdf0a
|
Don't send activities to "null" endpoints
|
2019-06-20 03:06:34 +00:00 |
|
Hypolite Petovan
|
2ba4116118
|
Merge pull request #7282 from annando/issue-6477
Issue 6477: Automatically repair self contact avatar
|
2019-06-19 16:12:56 -04:00 |
|
Michael Vogel
|
e0b936e334
|
Merge pull request #7283 from annando/7280-fix
Self merging due to critical bug fixes
|
2019-06-19 20:40:19 +02:00 |
|
Michael
|
f878cc2623
|
Fix for PR 7280
|
2019-06-19 18:38:22 +00:00 |
|
Michael
|
d8ed2ed76d
|
it is poll, not notify
|
2019-06-19 18:32:38 +00:00 |
|
Michael
|
b55546b726
|
Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477
|
2019-06-19 18:26:59 +00:00 |
|
Hypolite Petovan
|
105c126756
|
Merge pull request #7280 from annando/contact-baseurl
Fix the base url detection of AP profiles
|
2019-06-19 14:12:47 -04:00 |
|
Michael
|
6bd5be281e
|
Normalise it
|
2019-06-19 17:21:35 +00:00 |
|
Michael
|
4ab772ed67
|
Issue 6477: Automatically repair self contact avatar
|
2019-06-19 17:05:29 +00:00 |
|
Michael
|
b48a49b0f5
|
Added timeout
|
2019-06-18 08:05:45 +00:00 |
|
Michael
|
ea90554e7f
|
Fix the base url detection of AP profiles
|
2019-06-18 07:47:21 +00:00 |
|
Hypolite Petovan
|
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 |
|
Michael
|
496910e750
|
Issue #5983: Ignore reshares from blocked and ignored contacts
|
2019-06-17 11:55:19 +00:00 |
|
Michael Vogel
|
80dce42aab
|
Merge pull request #7276 from MrPetovan/bug/7275-share-new-lines
Fix reshare new lines display
|
2019-06-17 08:13:59 +02:00 |
|
Hypolite Petovan
|
d54e778f30
|
Move share conversion at the end of Text\BBCode::convert
|
2019-06-16 23:13:26 -04:00 |
|
Philipp
|
43ba24fb29
|
Merge pull request #7274 from MrPetovan/bug/7271-allow-brackets-in-urls
Perform link replacement at the end of BBCode::convert
|
2019-06-16 15:27:17 +02:00 |
|
Hypolite Petovan
|
da56e0a541
|
Add tests folder to typo console coverage
- Use correct config object in Console\Typo
|
2019-06-15 22:27:20 -04:00 |
|
Hypolite Petovan
|
84ccaf50fa
|
Allow brackets in URLs
- Remove obsolete $URLSearchString variable
- Add related tests
|
2019-06-15 22:26:29 -04:00 |
|
Hypolite Petovan
|
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 |
|
Philipp
|
dc95d7c4f0
|
Merge pull request #7273 from MrPetovan/bug/notices
Fix various notices 2019.06
|
2019-06-16 00:58:22 +02:00 |
|
Hypolite Petovan
|
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 |
|
Hypolite Petovan
|
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 |
|
Hypolite Petovan
|
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 |
|
Hypolite Petovan
|
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 |
|