jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24861 commits 10 branches 58 tags 216 MiB
Commit graph

24861 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
d41399496e Merge remote-tracking branch 'upstream/develop' into manage 2019-09-30 06:30:13 +00:00
Tobias Diekershoff
b51dedd7e7 this is the 2019.12-dev branch now 2019-09-29 10:05:30 +02:00
Tobias Diekershoff
2995c39ba5 welcome Friendica 2019.09 2019-09-29 07:23:23 +02:00
Tobias Diekershoff
4a14b01a60 fixing some typos 2019-09-29 07:13:34 +02:00
Tobias Diekershoff
d9daf45930 some last changes for the CHANGELOG 2019-09-29 07:08:50 +02:00
Tobias Diekershoff
4d8ca5c9c2
Merge pull request #7674 from annando/fix-magic-again 
Fix magic auth for redirects with non profile paths
 2019-09-29 06:51:43 +02:00
Tobias Diekershoff
9b12d23a9c
Merge pull request #7637 from tobiasd/20190917-CHANGELOG 
updated CHANGELOG
 2019-09-29 06:50:17 +02:00
Hypolite Petovan
cbeceb35b2
Merge pull request #7673 from nupplaphil/bug/dbunit 
Remove DBUnit dependencies
 2019-09-28 20:35:54 -04:00
Michael Vogel
4e9a810206 Fix magic auth for redirects with non profile paths 2019-09-29 02:16:09 +02:00
Philipp Holzer
04cf13e022
Remove DBUnit dependencies 2019-09-29 01:57:45 +02:00
Tobias Diekershoff
c03658a5dd added tumblr addon changes 2019-09-28 21:05:35 +02:00
Hypolite Petovan
f00afe574b [composer] Update dependencies before release 
- Updating fxp/composer-asset-plugin (v1.4.4) to fxp/composer-asset-plugin (v1.4.6)
- Updating divineomega/do-file-cache (v2.0.2) to divineomega/do-file-cache (v2.0.6)
- Updating paragonie/sodium_compat (v1.7.0) to paragonie/sodium_compat (v1.11.1)
- Installing ralouphie/getallheaders (3.0.3)
- Updating guzzlehttp/psr7 (1.4.2) to guzzlehttp/psr7 (1.6.1)
- Updating paragonie/certainty (v1.0.4) to paragonie/certainty (v2.5.0)
- Updating divineomega/password_exposed (v2.5.3) to divineomega/password_exposed (v2.8.0)
- Updating league/html-to-markdown (4.8.0) to league/html-to-markdown (4.8.2)
- Updating mobiledetect/mobiledetectlib (2.8.33) to mobiledetect/mobiledetectlib (2.8.34)
- Updating monolog/monolog (1.24.0) to monolog/monolog (1.25.1)
- Updating bower-asset/base64 (1.0.1) to bower-asset/base64 (1.0.2)
- Updating bower-asset/Chart-js (v2.7.2) to bower-asset/Chart-js (v2.8.0)
- Updating bower-asset/dompurify (1.0.10) to bower-asset/dompurify (1.0.11)
- Updating bower-asset/vue (v2.5.17) to bower-asset/vue (v2.6.10)
- Updating npm-asset/jquery-datetimepicker (2.5.20) to npm-asset/jquery-datetimepicker (2.5.21)
- Updating npm-asset/moment (2.22.2) to npm-asset/moment (2.24.0)
- Updating npm-asset/fullcalendar (3.10.0) to npm-asset/fullcalendar (3.10.1)
- Updating symfony/polyfill-util (v1.11.0) to symfony/polyfill-util (v1.12.0)
- Updating symfony/polyfill-php56 (v1.11.0) to symfony/polyfill-php56 (v1.12.0)
 2019-09-28 04:49:41 -04:00
Philipp
e8bbdc9bed
Merge pull request #7669 from tobiasd/20190927-en 
EN GB and US translation update THX AndyH3
 2019-09-27 09:13:59 +02:00
Tobias Diekershoff
22c97c88b7 EN translations added to the CHANGELOG 2019-09-27 08:46:43 +02:00
Tobias Diekershoff
28e533451c EN GB translation update THX AndyH3 2019-09-27 08:44:48 +02:00
Tobias Diekershoff
d0223c3555 EN US translation update THX AndyH3 2019-09-27 08:44:31 +02:00
Tobias Diekershoff
1ce7ea4398 missing closed issue 2019-09-26 08:05:29 +02:00
Tobias Diekershoff
9ce34cb8c6 some additions to the CHANGELOG 2019-09-26 07:55:10 +02:00
Philipp
f480406dbc
Merge pull request #7666 from MrPetovan/bug/7665-audio-tag 
Fix <audio> tag conversion to/from BBCode
 2019-09-26 04:12:12 +02:00
Hypolite Petovan
1f20a9330c Add new ignoreChildren behavior to HTML::tagToBBCode 
- Allow discarding HTML tag children for single-value BBCode
- Add test for it
 2019-09-25 20:44:09 -04:00
Hypolite Petovan
d8484e65bd Move autolinker execution earlier in BBCode::convert 
- Prevents already replaced HTML links (like in [audio] tag) to be doubled
- Add test for it
 2019-09-25 20:39:04 -04:00
Philipp
3ac6961da5
Merge pull request #7662 from annando/session-memory 
Fix session size problems
 2019-09-25 12:46:15 +02:00
Michael
d5c37001cd Empty the "remote" variable, avoid being remote to yourself 2019-09-25 07:02:07 +00:00
Michael
1a1745c9fa Security improvements 2019-09-25 06:46:28 +00:00
Michael
6a376c29d8 Fix session size problems 2019-09-25 05:57:32 +00:00
Philipp
fe53533cf6
Merge pull request #7661 from annando/contact-redir 
Don't use the "url" parameter on redir if it points to the same contact
 2019-09-25 02:51:25 +02:00
Michael
08f30e1769 Fix notice 2019-09-24 21:51:08 +00:00
Michael
87462ec67f Don't use the "url" parameter on redir if it points to the same contact 2019-09-24 21:44:37 +00:00
Hypolite Petovan
8a5eb689f7
Merge pull request #7656 from annando/redir-loop 
Fix "redir" loop
 2019-09-23 18:56:50 -04:00
Michael
5254147ccc Fix "redir" loop 2019-09-23 22:13:20 +00:00
Michael Vogel
0dfd6a523d
Merge pull request #7654 from nupplaphil/bug/auto-installer 
Fix Auto-Installer
 2019-09-23 15:13:09 +02:00
Philipp Holzer
ca36ea17f9
Fix Auto-Installer 2019-09-23 12:51:07 +02:00
Philipp
c0afa761ac
Merge pull request #7650 from annando/zombie-intros 
Get rid of zombie introductions that reappear automatically
 2019-09-22 20:10:03 +02:00
Michael
aba23daeca Get rid of zombie introductions that reappear automatically 2019-09-22 10:51:34 +00:00
Michael Vogel
8fa2d67f87
Merge pull request #7648 from tobiasd/20190922-bbcode-abstract 
Added info about the usage of the [abstract] in AP and especially in Mastodon to the documentation
 2019-09-22 09:14:12 +02:00
Tobias Diekershoff
6c3a42eb9f
Merge pull request #7649 from annando/remove-de 
German documentation about account removal had been clarified
 2019-09-22 08:36:36 +02:00
Michael
aef9c448eb German documentation about account removal had been clarified 2019-09-22 05:53:54 +00:00
Tobias Diekershoff
c76d0cc481 updated CHANGELOG file with the stuff of the last days 2019-09-22 07:35:21 +02:00
Tobias Diekershoff
5d5933386f Added info about the usage of the [abstract] in AP and especially in Mastodon to the documentation 2019-09-22 07:24:06 +02:00
Philipp
482cf1bbfe
Merge pull request #7646 from MrPetovan/bug/warnings 
Remove setting obsolete App->data['user'] in Module\Profile\Contacts
 2019-09-21 18:20:57 +02:00
Hypolite Petovan
f51b275b17 Add parameter type hints in Temporal::getDateofBirthField 2019-09-21 10:52:55 -04:00
Hypolite Petovan
775324bd07
Merge pull request #7647 from annando/inter-transport 
Always use direct DFRN transport on local contacts
 2019-09-21 10:23:29 -04:00
Michael
a2105c5dfe Changed documentation 2019-09-21 13:19:00 +00:00
Michael
b24ef7247d Don't update the basepath on local check 2019-09-21 13:17:33 +00:00
Michael
cf569425c6 Avoid a notice 2019-09-21 13:00:53 +00:00
Michael
c364a77d63 Always use direct DFRN transport on local contacts 2019-09-21 12:39:07 +00:00
Hypolite Petovan
118e737a49 Remove dependency to App object in Temporal::getDateofBirthField 2019-09-21 05:15:52 -04:00
Hypolite Petovan
f19136905f Remove setting obsolete App->data['user'] in Module\Profile\Contacts 2019-09-21 05:14:49 -04:00
Hypolite Petovan
7e600df9a6
Merge pull request #7645 from annando/fix-probe 
Fix: updateFromProbe failed when updating non-federated networks
 2019-09-20 19:50:10 -04:00
Michael
64f30d3627 Fix: updateFromProbe failed when updating non-federated networks 2019-09-20 21:01:52 +00:00