Commit graph

35588 commits

Author SHA1 Message Date
Hypolite Petovan
10154e532e
Merge pull request #12326 from nupplaphil/feat/route_about
Add /about route
2022-12-04 09:43:19 -05:00
Philipp
b3ca1e2bfb
Merge pull request #12325 from annando/blurhash
API: Support Blurhash
2022-12-04 15:25:33 +01:00
Philipp
10e423237e
Force phpunit execution at the opensocial node 2022-12-04 15:06:10 +01:00
Philipp
f79c810236
Try PHP8.1 again 2022-12-04 14:53:14 +01:00
Philipp
1a8722c1f6
Add /about route 2022-12-04 14:47:31 +01:00
Michael
a5be5b27e3 Support Blurhash 2022-12-04 13:29:21 +00:00
Philipp
3d73c452df
Merge pull request #12313 from MrPetovan/bug/12312-calendar-JS
Escape HTML in event mapping callback
2022-12-04 12:53:00 +01:00
Hypolite Petovan
82c2e686d7 Updating main translation file after updating a few strings 2022-12-04 06:42:12 -05:00
Hypolite Petovan
a0752b1161 Escape HTML in event mapping callback
- This prevents arbitrary Javascript from being executed from the calendar view
2022-12-04 06:37:37 -05:00
Hypolite Petovan
2f42606c43 Add information about BBCode availability in event fields 2022-12-04 06:37:37 -05:00
Hypolite Petovan
349436a77a Fix event start time not being properly converted to UTC
- This was triggering unexpected time comparison errors
2022-12-04 06:37:36 -05:00
Hypolite Petovan
1b71b963d7 Fix description not being populated in event form when there's a validation error 2022-12-04 06:37:36 -05:00
Philipp
04450bbbd4
Merge pull request #12324 from annando/issue-10518
Issue 10518: "last-activity" instead of "login_date"
2022-12-04 11:21:35 +01:00
Michael
e5a531d3b5 Simplify "last-activity" handling 2022-12-04 07:17:26 +00:00
Michael
1d8c9276f3 Issue 10518: "last-activity" instead of "login_date" 2022-12-04 07:03:11 +00:00
Hypolite Petovan
22e2578b23
Merge pull request #12322 from annando/api-rules
API: Central way to fetch the system rules
2022-12-03 17:24:52 -05:00
Hypolite Petovan
9f03622841
Merge pull request #12321 from annando/getload
Only fetch the processes if needed
2022-12-03 17:22:35 -05:00
Michael
16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
Michael
b6f7d31036 API: Central way to fetch the system rules 2022-12-03 20:18:19 +00:00
Michael
fa80c69d94 Only fetch the processes if needed 2022-12-03 19:44:50 +00:00
Hypolite Petovan
8cb7d4a9bd
Merge pull request #12320 from annando/issue-11553a
Issue 11553: Reliably return the user's contacts
2022-12-03 12:20:34 -05:00
Michael
36c7aea214 Debug code removed 2022-12-03 15:37:40 +00:00
Michael Vogel
3b01d12bb5
Merge pull request #12317 from MrPetovan/bug/notices
Fix last reference of replaced variable $owner_nick in Protocol\Feed::atom()
2022-12-03 16:36:13 +01:00
Hypolite Petovan
303d556ab0 Fix last reference of replaced variable $owner_nick in Protocol\Feed::atom()
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1336146405
2022-12-03 10:19:04 -05:00
Michael
e4dda7d2ca Issue 11553: Reliably return the user's contacts 2022-12-03 14:19:48 +00:00
Hypolite Petovan
82972744a9
Merge pull request #12316 from VVelox/load_fix
get the load average in a portable manner
2022-12-03 05:38:55 -05:00
Zane C. Bowers-Hadley
8f82fb9a22 now with g 2022-12-03 04:34:17 -06:00
Zane C. Bowers-Hadley
edaff99307 derp, minor fix 2022-12-03 04:31:04 -06:00
Michael Vogel
6c59987418
Merge pull request #12315 from MrPetovan/bug/12163-frio-group-display
Ward against empty template variable in frio:contact/entry.tpl
2022-12-03 11:28:54 +01:00
Michael Vogel
684fceada9
Merge pull request #12310 from MrPetovan/bug/deprecated
Address a couple PHP 8.1 deprecation notices
2022-12-03 11:26:10 +01:00
Zane C. Bowers-Hadley
f664208157 get the load average in a portable manner 2022-12-03 04:24:49 -06:00
Hypolite Petovan
e6f8b8c6e0 Ward against preg_replace_callback null return value in Strings::performWithEscapedBlocks
- Add logging to troubleshoot potential issue with regex
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
2022-12-03 04:20:27 -05:00
Hypolite Petovan
3b3192933d Ensure null values aren't processed in Content\Text\Markdown::toBBCode
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
2022-12-03 04:20:27 -05:00
Hypolite Petovan
e389fe945f Ward against empty template variable in frio:contact/entry.tpl 2022-12-03 04:19:33 -05:00
Hypolite Petovan
dbbbef368f
Merge pull request #12314 from annando/issue-12302
Issue 12302: Remote self is working again
2022-12-03 02:55:34 -05:00
Michael
edc6851f0e Issue 12302: Remote self is working again 2022-12-03 07:15:29 +00:00
Hypolite Petovan
a649d117e2
Merge pull request #12311 from matthiasmoritz/event-details-do-not-render-correctly-#12308
Event details do not render correctly
2022-12-02 15:43:19 -05:00
Matthias Moritz
7a39dfe23b Merge branch 'event-details-do-not-render-correctly-#12308' of https://github.com/matthiasmoritz/friendica into event-details-do-not-render-correctly-#12308 2022-12-02 21:01:20 +01:00
Matthias Moritz
f27d9cb73e Update Event.php 2022-12-02 20:59:24 +01:00
Matthias Moritz
942d1e15f6
Merge branch 'friendica:develop' into event-details-do-not-render-correctly-#12308 2022-12-02 20:42:58 +01:00
Matthias Moritz
8b2a3805b6 Update Event.php
fixing double encoding issue in event view.

fixes #12308
2022-12-02 20:42:16 +01:00
Philipp
eda197070d
Merge pull request #12309 from MrPetovan/bug/warnings
Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML
2022-12-02 14:35:13 +01:00
Hypolite Petovan
98f4a68890 Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
- Add logging to troubleshoot unexpected case
2022-12-02 08:17:06 -05:00
Philipp
e32654381b
Merge pull request #12250 from MrPetovan/task/4090-move-mod-photos
Move missing POST part of Profile\Photos\Index from mod/photos
2022-12-02 00:06:36 +01:00
Hypolite Petovan
60f18f6f56 Updated main translation file after moving strings 2022-12-01 18:01:33 -05:00
Hypolite Petovan
34f21b40f4 Move missing POST part of Profile\Photos from mod/photos 2022-12-01 17:57:29 -05:00
Philipp
5ea22197ac
Merge pull request #12227 from matthiasmoritz/public_calendar
Public calendar
2022-12-01 17:27:36 +01:00
Hypolite Petovan
8d37828c70 Update main translation file after changing strings 2022-12-01 08:06:09 -05:00
Hypolite Petovan
84b2a35e05 Add new public_calendar additional feature
- This gives anonymous access to public events
2022-12-01 08:06:07 -05:00
Hypolite Petovan
ae76fa1174 Remove unused first parameter from BaseProfile::getTabsHTML
- Add expected Profile::load call to Profile\Photos module
2022-12-01 08:03:35 -05:00