mexon/friendica
1
0
Fork 0
Code Pull requests Activity
37309 commits 5 branches 60 tags 188 MiB
Commit graph

37309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael 69e4254dcc Merge remote-tracking branch 'upstream/develop' into audience 2023-04-23 21:20:01 +00:00
Michael Vogel 7295b2c40c
Merge pull request #13028 from MrPetovan/bug/13026-message_recipient.tpl 
Separate JSON output of contact lists in message_recipient template
 2023-04-23 23:05:06 +02:00
Hypolite Petovan ce9939b4c0 Separate JSON output of contact lists in message_recipient template 2023-04-23 16:31:29 -04:00
Tobias Diekershoff 58737ba70f extend date in security.txt file 2023-04-23 15:26:19 +02:00
Tobias Diekershoff 26e8180e8d bump development version 2023-04-23 15:25:19 +02:00
Tobias Diekershoff 1a0c415fa2 bump Friendica version to 2023.04 2023-04-23 15:15:07 +02:00
Tobias Diekershoff 4eec2804de Merge branch '2023.03-rc' into stable 2023-04-23 15:12:51 +02:00
Tobias Diekershoff 13b184e2b4 setting current date to the CHANGELOG 
and some fixed typos
 2023-04-23 15:12:22 +02:00
Tobias Diekershoff 5e8451c1a7
Merge pull request #12985 from tobiasd/2023.04-CHANGELOG 
2023.04 CHANGELOG file
 2023-04-23 15:07:53 +02:00
Tobias Diekershoff 8b1887fc66
Merge pull request #13019 from MrPetovan/bug/deprecated 
Move calls to json_encode from Smarty templates to variable lists
 2023-04-23 08:07:38 +02:00
Hypolite Petovan 9788984b06 Move calls to json_encode from Smarty templates to variable lists 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1518577079
 2023-04-23 00:29:08 -04:00
Hypolite Petovan 9dc5557fb7
Merge pull request #13018 from annando/share-federated 
Only share from federated posts
 2023-04-22 08:34:53 -04:00
Michael d1d1685e24 Only share from federated posts 2023-04-22 10:40:58 +00:00
Michael Vogel bd00287190
Merge pull request #12954 from MrPetovan/bug/12555-domain-block-contact-search 
Filter contact search by blocked remote domains
 2023-04-21 21:55:14 +02:00
Philipp 5b1cc1f859
Merge pull request #13017 from tobiasd/20230421-lng 
FR, HU and RU translation updates
 2023-04-21 21:11:19 +02:00
Tobias Diekershoff 91c08b1385 FR, HU and RU translation updates 2023-04-21 20:11:00 +02:00
Tobias Diekershoff d3b41717a2 Update CHANGELOG 2023-04-21 07:02:48 +02:00
Hypolite Petovan b22ddde1b1 Updated main translation file after adding a string 2023-04-20 07:48:55 -04:00
Hypolite Petovan 03b7fcd09c Filter contact search by blocked remote domains 
- Add filter explanation
 2023-04-20 07:43:17 -04:00
Hypolite Petovan 261ba161a2 Convert ContactResult->url parameter to UriInterface 2023-04-20 07:43:17 -04:00
Michael Vogel f95c17b065
Merge pull request #13014 from MrPetovan/task/composer 
[Composer] Update dependencies ahead of release
 2023-04-20 07:20:37 +02:00
Hypolite Petovan 06e337c5fa [Composer] Update dependencies ahead of release 
- Updated dasprid/enum (1.0.3 => 1.0.4)
- Updated bacon/bacon-qr-code (2.0.7 => 2.0.8)
- Updated ezyang/htmlpurifier (v4.14.0 => v4.16.0)
- Updated mobiledetect/mobiledetectlib (2.8.39 => 2.8.41)
- Updated phpseclib/phpseclib (3.0.17 => 3.0.19)
- Updated smarty/smarty (v4.2.1 => v4.3.1)
- Updated bower-asset/base64 (1.1.0 => 1.2.0)
- Updated npm-asset/jgrowl (1.4.8 => 1.4.9)
- Updated psr/http-message (1.0.1 => 1.1)
- Updated guzzlehttp/psr7 (1.9.0 => 1.9.1)
- Updated symfony/polyfill-php72 (v1.26.0 => v1.27.0)
- Updated symfony/polyfill-intl-normalizer (v1.26.0 => v1.27.0)
- Updated symfony/polyfill-intl-idn (v1.26.0 => v1.27.0)
- Updated paragonie/sodium_compat (v1.18.0 => v1.19.0)
- Updated psr/http-client (1.0.1 => 1.0.2)
- Updated psr/http-factory (1.0.1 => 1.0.2)
- Updated fgrosse/phpasn1 (v2.4.0 => v2.5.0)
- Updated composer/ca-bundle (1.3.3 => 1.3.5)
 2023-04-20 00:14:05 -04:00
Hypolite Petovan e4ab857d9d
Merge pull request #13013 from annando/tumblr 
Preparation for Tumblr
 2023-04-18 15:59:04 -04:00
Michael f0d8b109fe Preparation for Tumblr 2023-04-18 19:30:28 +00:00
Hypolite Petovan 7a55052ad2
Merge pull request #13012 from annando/html-media-only-selected 
Fix: Only add link preview for selected networks
 2023-04-18 14:18:25 -04:00
Michael 2ad8bd901a Fix: Only add link preview for selected networks 2023-04-18 17:56:30 +00:00
Hypolite Petovan 815c1f4e33
Merge pull request #13010 from annando/video-links 
Harmonize Youtube/Vimeo-Link behaviour
 2023-04-18 07:42:03 -04:00
Michael Vogel 98595b6a2a
Merge pull request #13009 from MrPetovan/bug/13006-frio-admin-settings 
[frio] Fix jS error that was preventing further script execution in theme settings
 2023-04-18 08:32:58 +02:00
Michael bb3ec3807c Harmonize Youtube/Vimeo-Link behaviour 2023-04-18 06:02:58 +00:00
Hypolite Petovan 1caea496c4 [frio] Fix jS error that was preventing further script execution in theme settings 
- $("#id_frio_background_image").val() was undefined when showing accents
 2023-04-17 21:26:12 -04:00
Hypolite Petovan 7f6d6c9521
Merge pull request #13008 from xundeenergie/optical-improvements-dropzone 
remove scrollbar from dropzone in jot too fixes #13002
 2023-04-17 16:19:01 -04:00
Jakobus Schürz 0e9eeec3c7 remove scrollbar from dropzone in jot too 
fixes #13002
 2023-04-17 22:11:52 +02:00
Hypolite Petovan 4cb1a2de2c
Merge pull request #13004 from annando/warning 
Fixes warning: Undefined array key "pending"
 2023-04-15 19:21:46 -04:00
Michael b8dd6c0b25 Fixes warning: Undefined array key "pending" 2023-04-15 23:08:42 +00:00
Hypolite Petovan 67792bbc0b
Merge pull request #13003 from annando/baseurl-string 
Fix: Force baseUrl being a string
 2023-04-15 10:25:21 -04:00
Michael b0f880d0eb Fix: Force baseUrl being a string 2023-04-15 14:17:30 +00:00
Michael Vogel 68d9e1f33c
Merge pull request #13001 from MrPetovan/bug/12993-vier-updateInterval 
[vier] Remove duplicate variable declaration
 2023-04-15 10:51:22 +02:00
Hypolite Petovan c65cb66160 [vier] Remove duplicate variable declaration 
- They were meant to be removed when the const declarations were introduced
 2023-04-15 00:40:50 -04:00
Michael Vogel c81a9d1ddd
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-04-14 20:56:43 +02:00
Michael 78b969cb19 Store "audience" and "attributedTo" data 2023-04-14 17:21:20 +00:00
Philipp ebfdd6a1e0
Merge pull request #12996 from annando/lemmy-attachments 
Fix: Attached images from Lemmy can now be processed
 2023-04-13 08:29:44 +02:00
Michael a36e53af3c Fix: Attached images from Lemmy can now be processed 2023-04-13 05:05:20 +00:00
Tobias Diekershoff a4a22e2dee
Merge pull request #12987 from tobiasd/20230411-creadits 
regen CREDITS for the next release
 2023-04-12 14:59:38 +02:00
Hypolite Petovan 1a36118e7a
Merge pull request #12992 from annando/diaspora-signature 
Replace the Diaspora signature upon update
 2023-04-12 04:42:46 -04:00
Michael a4ef546433 Merge remote-tracking branch 'upstream/2023.03-rc' into diaspora-signature 2023-04-12 05:53:18 +00:00
Michael cd3f2f63d6 Replace the Diaspora signature upon update 2023-04-12 05:48:38 +00:00
Tobias Diekershoff 00d6e97860
Merge pull request #12988 from annando/diaspora-signature 
Fix Diaspora signature creation for comments on comments
 2023-04-12 07:37:35 +02:00
Tobias Diekershoff ce52764886
Merge pull request #12989 from annando/warning 
Fixes "Trying to access array offset on value of type bool"
 2023-04-12 07:36:45 +02:00
Tobias Diekershoff 2486383ef0
Merge pull request #12991 from annando/like-notification 
Fixed check for likes in notification mail
 2023-04-12 07:34:03 +02:00
Michael 504433581a Fixed check for likes in notification mail 2023-04-12 03:30:59 +00:00