keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
37689 commits 4 branches 0 tags 179 MiB
Commit graph

37689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
d84866cf8c Merge remote-tracking branch 'upstream/develop' into develop 2023-07-18 05:06:28 +00:00
Hypolite Petovan
54033b5e5a
Merge pull request #13285 from annando/more-privacy 
Unified BBCode conversion, improved proxy functionality
 2023-07-17 08:00:53 -04:00
Michael
7e322c21b3 Removed unneeded parameter 2023-07-16 16:48:24 +00:00
Michael
7315048474 Revert change 2023-07-16 09:48:37 +00:00
Michael
0ea93bfba1 Merge remote-tracking branch 'upstream/develop' into more-privacy 2023-07-16 09:41:55 +00:00
Michael
b4d2d0dd31 Merge remote-tracking branch 'upstream/develop' into develop 2023-07-16 09:33:57 +00:00
Michael
fd055193ac Removed unused variable 2023-07-16 09:33:52 +00:00
Michael
01bbf40418 Simplify plaintext creation 2023-07-16 09:32:17 +00:00
Michael
08dafd6d70 Use plaintext for names and titles 2023-07-16 07:26:20 +00:00
Michael
8bb33dccd1 Unified BBCode conversion, improved proxy functionality 2023-07-15 20:12:08 +00:00
Hypolite Petovan
ff092833ae
Merge pull request #13283 from AlfredSK/AlfredSK-fix-wsod-creating-report 
Fix WSOD when creating a report using PHP8.x
 2023-07-15 09:20:45 -04:00
Steffen K9
8b5a49fb5c
Fix WSOD when creating a report using PHP8.x 
Fixes https://github.com/friendica/friendica/issues/13277
 2023-07-15 14:41:29 +02:00
Tobias Diekershoff
4a645bec27
Merge pull request #13280 from MrPetovan/bug/warnings 
Remove unused variable trheadids from Content\Conversation
 2023-07-14 06:37:12 +02:00
Hypolite Petovan
f87c105518 Remove unused variable trheadids from Content\Conversation 
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1635208668
 2023-07-13 23:51:03 -04:00
Hypolite Petovan
81d2d4b70e
Merge pull request #13278 from AlfredSK/AlfredSK-fix-column-name 
Fix db error: missing column name 'line-text'
 2023-07-11 16:57:39 -04:00
Steffen K9
3624792bd6
Fix db error: missing column name 'line-text' 
See https://github.com/friendica/friendica/issues/13277#issuecomment-1631359293
 2023-07-11 22:37:45 +02:00
Tobias Diekershoff
b3f8c0e0c3
Merge pull request #13275 from MrPetovan/bug/warnings 
Address a couple warnings
 2023-07-11 15:27:21 +02:00
Hypolite Petovan
248148af99 Return early if no items are provided in Content\Conversation->getThreadList 
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1628437859
 2023-07-11 09:03:52 -04:00
Hypolite Petovan
91d63213ae Reintroduce is_string modifier in addons/connector templates 
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1606003698
 2023-07-11 09:00:41 -04:00
Hypolite Petovan
451ba407d7
Merge pull request #13274 from annando/report-gsid 
Fix "Cannot add or update a child row: a foreign key constraint fails"
 2023-07-11 07:54:54 -04:00
Michael
52c062adb6 Fix "Cannot add or update a child row: a foreign key constraint fails" 2023-07-11 07:43:53 +00:00
Hypolite Petovan
f604185b10
Merge pull request #13272 from annando/last-editor-uid 
Fix "Cannot drop index 'last-editor-uid': needed in a foreign key constraint"
 2023-07-10 17:45:52 -04:00
Michael
c822d5fa94 Fix "Cannot drop index 'last-editor-uid': needed in a foreign key constraint" 2023-07-10 20:50:16 +00:00
Tobias Diekershoff
1359b171af
Merge pull request #13268 from MrPetovan/task/normalize-item-action-label 
Normalize item action label key name
 2023-07-10 10:01:50 +02:00
Tobias Diekershoff
2f7789e397
Merge pull request #13269 from MrPetovan/bug/fix-exception-return-code 
Fix exception module not setting the HTTP response code
 2023-07-10 09:59:04 +02:00
Michael Vogel
6fd76829b0
Merge pull request #13245 from MrPetovan/task/moderation-reports 
Create moderation reports
 2023-07-10 07:50:11 +02:00
Hypolite Petovan
3748adf2fd Fix exception module not setting the HTTP response code 
- Page->run now returns an updated response for use with Page->exit
- Remove now duplicated header setting in Page->run
- Remove now obsolete (and ineffective) HTTP return code setting from Module\Special\HTTPException->content
- Add HTTP response code and reason setting in BaseModule->run
 2023-07-09 22:45:46 -04:00
Hypolite Petovan
37131a6785 Normalize item action label key name 
- Remove unused $item.return reference in asynchronous item action URLs
 2023-07-09 21:00:36 -04:00
Hypolite Petovan
969becfc15 Update main transation file after updating strings 2023-07-09 18:37:19 -04:00
Hypolite Petovan
c312d11dab Add Report Create module 
WIP
 2023-07-09 18:32:43 -04:00
Hypolite Petovan
76de49a25c Add fields to Report entity 
- Add clock dependency to Moderation\Factory\Report
- Change DateTime field to DateTimeImmutable to satisfy Clock return type
- Add category, status and resolution constants
 2023-07-09 18:32:42 -04:00
Hypolite Petovan
d29a84ae46 Add Posts and Rules sub-entities and collections for Moderation\Report 2023-07-09 18:32:42 -04:00
Michael Vogel
a39029f953
Merge pull request #13267 from MrPetovan/task/13265-json-ld 
[Composer] Bump friendica/json-ld to version 1.1.4
 2023-07-09 23:11:44 +02:00
Hypolite Petovan
767629ed2c [Composer] Bump friendica/json-ld to version 1.1.4 2023-07-09 16:18:29 -04:00
Hypolite Petovan
55ff23c6c3
Merge pull request #13266 from annando/quoted 
Improve display of quoted posts
 2023-07-09 15:59:13 -04:00
Michael Vogel
66353e6117
Merge pull request #13264 from MrPetovan/task/hide-blocklist 
Hide blocklist from anonymous users on closed registration nodes
 2023-07-09 21:26:59 +02:00
Michael Vogel
f991b553ce
Update src/Content/Item.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-07-09 21:18:36 +02:00
Michael Vogel
4f62ab6168
Update src/Content/Item.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-07-09 21:18:27 +02:00
Michael
300825dcac Updated messages.po 2023-07-09 17:42:32 +00:00
Michael
b9bb525fe9 New parameter to create a share block for display reasons 2023-07-09 14:31:47 +00:00
Michael
e95c678141 Improve display of quoted posts 2023-07-09 14:15:01 +00:00
Michael Vogel
fba4a70dc2
Merge pull request #13262 from MrPetovan/task/decouple-conversations 
Decouple conversation creation from rendering
 2023-07-09 15:59:35 +02:00
Hypolite Petovan
9f943650a9 Hide blocklist from anonymous users on closed registration nodes 2023-07-09 08:23:35 -04:00
Hypolite Petovan
f20caf4c3a Refactor DI out from Module\Friendica 2023-07-08 22:24:03 -04:00
Hypolite Petovan
31a3c7cf50 [frio] Add link to About page in user menu 2023-07-08 22:24:03 -04:00
Hypolite Petovan
6e2ab6c3af Centralize Vary header declaration in ActivityPub::isRequest 
- Vary header should be set every time we vary the display based on an HTTP header value
 2023-07-08 22:24:01 -04:00
Hypolite Petovan
9678618dd4
Merge pull request #13227 from BirdboyBolu/develop 
Update Circles-and-Privacy.md
 2023-07-08 22:20:57 -04:00
Hypolite Petovan
6ac734d39d
Apply suggestions from code review 
- Remove superfluous plural
- Remove condescending language
 2023-07-08 22:20:47 -04:00
Hypolite Petovan
706444bdb2 Decouple conversation creation from rendering 
- This allows to separately obtain a list of threads for rendering without having to deal with an already-formed HTML output
 2023-07-08 16:57:52 -04:00
Hypolite Petovan
31fbe70ec7
Merge pull request #13261 from annando/id-uri-id-chaos 
Fix id/uri-id chaos in API calls
 2023-07-08 09:15:23 -04:00