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

35703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marek Bachmann 7e58052994 Merge branch 'develop' into new_image_presentation 2022-12-02 00:22:45 +01: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
Hypolite Petovan 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
Hypolite Petovan 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
Hypolite Petovan 2baa56d478
Merge pull request #12298 from annando/api-suggestions 
Contact suggestions are now cached
 2022-12-01 05:25:44 -05:00
Hypolite Petovan 1bc72f5b55
Merge pull request #12306 from annando/api-doc 
API: The "reports" endpoint is partially supported
 2022-12-01 05:24:07 -05:00
Michael 1d00947bcd Don't fetch sugestions for the system user / catch error on contact timeline 2022-12-01 07:07:59 +00:00
Michael 146f874c2e Avoid 'Undefined array key "last-activity"' 2022-12-01 06:12:13 +00:00
Michael 8e0196fec3 Update the last activity in OAuth 2022-12-01 06:02:51 +00:00
Michael 431eb34a1c Deactivate setting last activity 2022-12-01 05:57:29 +00:00
Michael 5201d87b3f Reenable last acttivity update 2022-12-01 05:54:42 +00:00
Michael 910a76812a Reenable worker call 2022-12-01 05:53:18 +00:00
Michael 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
Michael 226e857387 API: The "reports" endpoint is partially supported 2022-12-01 05:40:32 +00:00
Hypolite Petovan 8012968506 Check post existence before accessing its properties in Model\Post\UserNotification 2022-11-30 19:30:36 -05:00
Michael ed1a879b7b Use "utcNow" 2022-11-30 22:36:58 +00:00
Michael f905220923 New field to show the day of the last activity 2022-11-30 22:34:50 +00:00
Hypolite Petovan 1b0f7e5add
Merge pull request #12304 from HankG/add-dismissed-field-to-mastodon-notifications 
Add dismissed field to mastodon notifications
 2022-11-30 14:55:09 -05:00
Hank G f61dbf76a7
Update src/Module/Api/Mastodon/Notifications.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:39:00 -05:00
Hank G b51b537711
Update src/Factory/Api/Mastodon/Notification.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:38:53 -05:00
Hypolite Petovan 6b2a936f16
Merge pull request #12303 from HankG/fix-mastodon-api-dismiss-endpoint 
Fix broken dismiss endpoint on Mastodon notifications API
 2022-11-30 14:31:40 -05:00
Hank Grabowski a2559d6241 Add 'include_all' parameter on Mastodon API endpoint 
Maintains old functionality of only returning non-dismissed notifications while adding ability to get list of dismissed and non-dismissed notifications
 2022-11-30 14:24:46 -05:00
Hank Grabowski a27ffda59f Add dismissed field to Mastodon API Notification types 2022-11-30 14:23:20 -05:00
Hank Grabowski 5b5c38f9ab Fix broken dismiss endpoint on Mastodon notifications API 2022-11-30 14:11:39 -05:00
Hypolite Petovan 35ca4961d2
Merge pull request #12267 from MarekBenjamin/show_image_upload_limit 
Show image size limit in Frio as "usagemessage" for photo_upload
 2022-11-30 12:24:51 -05:00
MarekBenjamin 8f5d6fdf72
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-30 18:19:18 +01:00
MarekBenjamin e4fd9d425f
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:55 +01:00
MarekBenjamin f9c0d5a14b
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:42 +01:00
Michael fbcc56d42d Changes after code review 2022-11-30 14:33:55 +00:00
Michael 1ced4673fe Indention 2022-11-30 13:35:57 +00:00
Hypolite Petovan 7402bc9f50
Merge pull request #12299 from annando/auto-reshare-fix 
Check that an auto reshare is only done on the expected contact
 2022-11-30 08:34:10 -05:00
Michael Vogel 4a94078091
Merge pull request #12300 from matthiasmoritz/bug-noLocalPosts 
Fix #12262 - shared friendica posts are filtered on status page
 2022-11-30 13:37:40 +01:00
Matthias Moritz 2035a7a178 Merge branch 'bug-noLocalPosts' of https://github.com/matthiasmoritz/friendica into bug-noLocalPosts 2022-11-30 13:20:50 +01:00
Matthias Moritz 71f4dd0d20 Update Status.php 
Instead of removing AP, added Protocol::DFRN to the list of networks.
 2022-11-30 13:19:31 +01:00
Matthias Moritz 7676aa7908
Merge branch 'friendica:develop' into bug-noLocalPosts 2022-11-30 12:18:48 +01:00
Matthias Moritz da93373e8d Fix #12262 - shared friendica posts are filtered on status page 
Native shares from the same Instance (or maybe all Friendica instances) were filtered out from the users home. With this commit they now appear on the users Profile/Status
 2022-11-30 12:15:58 +01:00