clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,960 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

29960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp 4b38b6aa16
Adapt tests for PhpUnit 7.5 2021-04-04 19:13:40 +02:00
Hypolite Petovan 5947698dc1
Merge pull request #10111 from nupplaphil/bug/Logger_Object 
Fix Object parsing for Logging
 2021-04-01 16:27:23 -04:00
Philipp b983559980
Fix Object parsing for Logging 2021-04-01 20:55:25 +02:00
Tobias Diekershoff 8285a3a280
Merge pull request #10109 from annando/post-type 
Use post-type for the item container
 2021-04-01 07:49:00 +02:00
Tobias Diekershoff 33eac7c420
Merge pull request #10108 from annando/issue-10105 
Issue 10105: Use legacy photo data field if used
 2021-04-01 07:35:10 +02:00
Michael 9072107b83 Use post-type for the item container 2021-04-01 04:58:53 +00:00
Michael 087a17b43d Issue 10105: Use legacy photo data field if used 2021-04-01 04:51:55 +00:00
Hypolite Petovan 38a5358bfa
Merge pull request #10093 from urbalazs/copyright-2021 
Update copyright
 2021-03-29 13:11:40 -04:00
Balázs Úr befc2af504
Merge branch '2021.03-rc' into copyright-2021 2021-03-29 08:45:21 +02:00
Balázs Úr 054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Hypolite Petovan 1e71398c72
Merge pull request #10104 from nupplaphil/fix/jit_caching 
Fix JIT Config Adapter caching
 2021-03-28 20:11:16 -04:00
Hypolite Petovan 1c0f49461f
Merge pull request #10102 from tobiasd/202103-lng 
HU, IT, RU translations
 2021-03-28 20:07:35 -04:00
Hypolite Petovan dffd07fb74
Merge pull request #10101 from nupplaphil/fix/log_toString 
Fix object handling inside log arrays
 2021-03-28 20:06:58 -04:00
Philipp b2a7c5ff6c
Fix JIT Config Adapter caching 2021-03-28 23:28:47 +02:00
Philipp b61b3cb182
Fix object handling inside log arrays 2021-03-28 21:50:32 +02:00
Tobias Diekershoff 8fc6a5858f RU translations THX SpcCw 2021-03-28 19:14:17 +02:00
Tobias Diekershoff eaf5647217 HU translation updated THX Balázs Úr 2021-03-28 19:14:09 +02:00
Tobias Diekershoff 6426519cf6 IT translation update THX Sylke Vicious 2021-03-28 19:11:59 +02:00
Hypolite Petovan cefeb02517
Merge pull request #10098 from annando/parseurl-html 
ParseUrl: Avoid HTML in returned content
 2021-03-28 09:51:00 -04:00
Michael 70d5802793 Avoid HTML in ParseUrl desriptions 2021-03-28 11:32:26 +00:00
Hypolite Petovan f1b60414b3
Merge pull request #10096 from annando/parseurl-photos 
ParseUrl: Remove image when it doesn't fit the requirements
 2021-03-28 03:37:56 -04:00
Michael bb0f3552e2 ParseUrl: Remove image when it doesn't fit the requirements 2021-03-28 06:47:58 +00:00
Hypolite Petovan 5b13de8e7f
Merge pull request #10095 from annando/parseurl-photos 
Fix: ParseUrl now fetches images again
 2021-03-28 02:29:02 -04:00
Hypolite Petovan 38196aec67
Merge pull request #10094 from urbalazs/license-20210328 
Fix license text
 2021-03-28 02:28:17 -04:00
Hypolite Petovan 3af12004fe
Merge pull request #10090 from nupplaphil/feat/install_testrewrite 
FollowUp #10086
 2021-03-28 02:24:49 -04:00
Hypolite Petovan 992ffcc720
Merge pull request #10092 from annando/fix-pleroma-mention 
Fix the display of mentions on Pleroma
 2021-03-28 02:21:02 -04:00
Michael 4a19348900 Fix: ParseUrl now fetches images again 2021-03-28 06:20:11 +00:00
Balázs Úr 488a888f9a
Fix license text 2021-03-28 01:18:34 +01:00
Hypolite Petovan ed639045fb
Merge pull request #10089 from annando/issue-4755 
Issue 4755: Use the system mail address as sender
 2021-03-27 19:28:08 -04:00
Michael cefc2c9a93 Fix mentions on Pleroma 2021-03-27 22:49:55 +00:00
Philipp 95a7645cba
Update messages.po 2021-03-27 22:46:47 +01:00
Philipp 26bd1bb26d
FollowUp #10086 2021-03-27 22:42:11 +01:00
Michael f4649b9f0e Issue 4755: Use the system mail address as sender 2021-03-27 21:23:31 +00:00
Hypolite Petovan d936cc5a5c
Merge pull request #10086 from nupplaphil/feat/install_testrewrite 
Workaround for cURL troubles in container environments
 2021-03-27 09:20:55 -04:00
Philipp 3327e6d979
Add EOL to help string 2021-03-27 13:59:32 +01:00
Philipp a831242095
Workaround for cURL troubles in container environments 
Addresses https://github.com/friendica/docker/issues/134
 2021-03-27 13:52:05 +01:00
Hypolite Petovan 4b52da84c3
Merge pull request #10084 from annando/warning 
Fix Warning "key() expects parameter 1 to be array, string given"
 2021-03-27 01:31:08 -04:00
Michael c77f039f7a Fix Warning "key() expects parameter 1 to be array, string given" 2021-03-27 05:20:55 +00:00
Hypolite Petovan 8adb0825a6
Merge pull request #10083 from annando/post-user 
Use the "post-user" table instead of the "post" table for deletion checks
 2021-03-26 17:03:24 -04:00
Michael d80f1644f0 Use "post-user" for "uri-id" deletion 2021-03-26 20:36:22 +00:00
Hypolite Petovan 4b973de8cd
Merge pull request #10082 from annando/deletions 
Deletions are now done via DFRN as well
 2021-03-26 16:33:58 -04:00
Michael 24099c3439 Comment deletions are always send via DFRN 2021-03-26 20:09:23 +00:00
Hypolite Petovan e5b276f58b
Merge pull request #10081 from annando/avatar-size 
Limit the size of contact avatars
 2021-03-26 11:01:10 -04:00
Michael Vogel 0539c788ef
Update src/Model/Photo.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-03-26 15:51:26 +01:00
Michael Vogel 814eace0bb
Merge pull request #10080 from MrPetovan/task/composer 
[Composer] Update dependencies before release
 2021-03-26 08:01:57 +01:00
Michael e98d11a9ae Limit the size of contact avatars 2021-03-26 06:56:08 +00:00
Hypolite Petovan 2958da1731 [Composer] Update dependencies before release 
- Removing symfony/polyfill-mbstring (v1.17.0)
  - Updating league/html-to-markdown (4.9.1 => 4.10.0)
  - Updating mobiledetect/mobiledetectlib (2.8.34 => 2.8.37)
  - Updating monolog/monolog (1.25.4 => 1.26.0)
  - Updating paragonie/random_compat (v9.99.99 => v9.99.100)
  - Updating paragonie/sodium_compat (v1.13.0 => v1.14.0)
  - Updating paragonie/constant_time_encoding (v2.3.0 => v2.4.0)
  - Updating paragonie/hidden-string (v1.0.0 => v1.1.0)
  - Updating phpseclib/phpseclib (2.0.29 => 2.0.30)
  - Updating seld/cli-prompt (1.0.3 => 1.0.4)
  - Updating smarty/smarty (v3.1.36 => v3.1.39)
  - Updating bower-asset/chart-js (v2.9.3 => v2.9.4)
  - Updating bower-asset/vue (v2.6.11 => v2.6.12)
  - Updating npm-asset/moment (2.26.0 => 2.29.1)
  - Updating hamcrest/hamcrest-php (v2.0.0 => v2.0.1)
  - Updating mockery/mockery (1.3.1 => 1.3.4)
  - Updating symfony/polyfill-php72 (v1.17.0 => v1.19.0)
  - Installing symfony/polyfill-intl-normalizer (v1.19.0)
  - Installing symfony/polyfill-php70 (v1.19.0)
  - Updating symfony/polyfill-intl-idn (v1.17.0 => v1.19.0)
  - Updating guzzlehttp/psr7 (1.6.1 => 1.8.1)
  - Updating guzzlehttp/promises (v1.3.1 => 1.4.1)
  - Updating paragonie/certainty (v2.6.1 => v2.8.0)
  - Updating sebastian/code-unit-reverse-lookup (1.0.1 => 1.0.2)
  - Updating symfony/polyfill-ctype (v1.17.0 => v1.19.0)
  - Updating webmozart/assert (1.9.0 => 1.9.1)
  - Updating symfony/polyfill-util (v1.17.0 => v1.19.0)
  - Updating symfony/polyfill-php56 (v1.17.0 => v1.19.0)
  - Updating composer/ca-bundle (1.2.8 => 1.2.9)
 2021-03-25 19:53:26 -04:00
Hypolite Petovan 7e283dcdf4
Merge pull request #10079 from annando/mobilizon 
Added support for Mobilizon on the federation page
 2021-03-25 15:13:56 -04:00
Michael 45c80ab52f Added support for Mobilizon on the federation page 2021-03-25 18:52:50 +00:00
Hypolite Petovan 1ece34459f
Merge pull request #10078 from annando/addcontact 
Improved checks when adding contacts
 2021-03-25 08:56:50 -04:00