1
0
Fork 0
Commit graph

35473 commits

Author SHA1 Message Date
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
9f03622841
Merge pull request #12321 from annando/getload
Only fetch the processes if needed
2022-12-03 17:22:35 -05:00
16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
b6f7d31036 API: Central way to fetch the system rules 2022-12-03 20:18:19 +00:00
fa80c69d94 Only fetch the processes if needed 2022-12-03 19:44:50 +00:00
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
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
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
e4dda7d2ca Issue 11553: Reliably return the user's contacts 2022-12-03 14:19:48 +00:00
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
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
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
e389fe945f Ward against empty template variable in frio:contact/entry.tpl 2022-12-03 04:19:33 -05:00
dbbbef368f
Merge pull request #12314 from annando/issue-12302
Issue 12302: Remote self is working again
2022-12-03 02:55:34 -05:00
edc6851f0e Issue 12302: Remote self is working again 2022-12-03 07:15:29 +00:00
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
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
60f18f6f56 Updated main translation file after moving strings 2022-12-01 18:01:33 -05:00
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
8d37828c70 Update main translation file after changing strings 2022-12-01 08:06:09 -05:00
84b2a35e05 Add new public_calendar additional feature
- This gives anonymous access to public events
2022-12-01 08:06:07 -05:00
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
b83526ad0b Tighten profile restriction feature
- Prevent feed access to restricted profiles
- Rework display of restricted profiles with a redirect to the profile/restricted route
- Normalize permission checking with IHandleUserSession->isAuthenticated
- Remove unusable "nocache" parameter in feed module because session isn't initialized
- Reword setting name and description
2022-12-01 08:03:35 -05:00
0d53c69610 Remove unused theme info value "events_in_profile"
All public events (event if they are ownded by other users) are visible
2022-12-01 08:03:34 -05:00
2baa56d478
Merge pull request #12298 from annando/api-suggestions
Contact suggestions are now cached
2022-12-01 05:25:44 -05:00
1bc72f5b55
Merge pull request #12306 from annando/api-doc
API: The "reports" endpoint is partially supported
2022-12-01 05:24:07 -05:00
1d00947bcd Don't fetch sugestions for the system user / catch error on contact timeline 2022-12-01 07:07:59 +00:00
146f874c2e Avoid 'Undefined array key "last-activity"' 2022-12-01 06:12:13 +00:00
8e0196fec3 Update the last activity in OAuth 2022-12-01 06:02:51 +00:00
431eb34a1c Deactivate setting last activity 2022-12-01 05:57:29 +00:00
5201d87b3f Reenable last acttivity update 2022-12-01 05:54:42 +00:00
910a76812a Reenable worker call 2022-12-01 05:53:18 +00:00
c56e4222dc Debug the failing test 2022-12-01 05:50:34 +00:00
Michael Vogel
13cc638062
Merge pull request #12305 from MrPetovan/bug/notices
Check post existence before accessing its properties in Model\Post\UserNotification
2022-12-01 06:45:50 +01:00
226e857387 API: The "reports" endpoint is partially supported 2022-12-01 05:40:32 +00:00
8012968506 Check post existence before accessing its properties in Model\Post\UserNotification 2022-11-30 19:30:36 -05:00
ed1a879b7b Use "utcNow" 2022-11-30 22:36:58 +00:00