Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-29 16:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
30930 commits 3 branches 64 tags 241 MiB
Commit graph

30930 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
a0c52a8253 Added real test data 2021-05-23 19:34:28 +00:00
Philipp
c064a39341
Adapt tests using a content file 2021-05-23 20:30:27 +02:00
Philipp
a0da84b6b0
Enable testability for HTTPInputData and create a failing test for it :-) 2021-05-23 19:58:09 +02:00
Tobias Diekershoff
280d0ee961
Merge pull request #10305 from annando/warnings 
Fix warning "reset() expects parameter 1 to be array, null given"
 2021-05-23 18:43:18 +02:00
Michael
4ac68394c3 Fix warning "reset() expects parameter 1 to be array, null given" 2021-05-23 16:37:34 +00:00
Hypolite Petovan
48a783c91a
Merge pull request #10300 from annando/issue-10264 
Issue 10264: Remote comments for visitors
 2021-05-23 12:00:53 -04:00
Tobias Diekershoff
0ca929dccd
Merge pull request #10304 from annando/fix-emptymissing-photos 
Fix missing media on posts to Mastodon
 2021-05-23 15:34:34 +02:00
Tobias Diekershoff
e2ad000273
Merge pull request #10303 from annando/issue-10232 
Issue 10232: Improved search for embedded media links
 2021-05-23 15:30:53 +02:00
Michael
36c5e360f6 Fix missing media on posts to Mastodon 2021-05-23 13:29:25 +00:00
Michael
b7a7ae58e9 Issue 10232: Improved search for embedded media links 2021-05-23 12:35:05 +00:00
Hypolite Petovan
4d214bd9cb
Merge pull request #10292 from annando/fix-mail 
Fix inserting mails
 2021-05-23 07:39:00 -04:00
Hypolite Petovan
0238a15809
Merge pull request #10295 from nupplaphil/bug/php7_cs 
Fix PHP 7.0 Coding Standards
 2021-05-23 07:38:38 -04:00
Michael
050bc673aa Issue 10264: Remote comments for visitors 2021-05-23 10:39:11 +00:00
Tobias Diekershoff
edbbaaadea
Merge pull request #10299 from annando/issue-10287 
Issue 10287: Make block and ignore work for the API as well
 2021-05-23 12:03:01 +02:00
Michael
8f9033633c Issue 10287: Make block and ignore work for the API as well 2021-05-23 08:56:24 +00:00
Michael Vogel
37898776bd
Merge pull request #10297 from tobiasd/20210523-followuptest 
fix failing test for the installer wizard
 2021-05-23 09:55:00 +02:00
Tobias Diekershoff
6ea52cfbf8 now... 2021-05-23 09:47:25 +02:00
Tobias Diekershoff
390fa23bce fix failing test for the installer wizard 2021-05-23 09:43:02 +02:00
Michael Vogel
03edb94447
Merge pull request #10296 from tobiasd/20210522-issue10293 
mention the required function in the install wizard (issue10293)
 2021-05-23 08:52:51 +02:00
Tobias Diekershoff
918f869aef regen messages.po 2021-05-23 07:50:37 +02:00
Tobias Diekershoff
55dda47f39 Issue 10293: mention the required function in the error message 2021-05-23 07:50:32 +02:00
Michael Vogel
d00a4eacdc
Update src/Model/Mail.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-23 07:37:17 +02:00
very-ape
b2bc911eb2 Merge branch 'fix-message-button' of https://github.com/very-ape/friendica into fix-message-button 2021-05-22 15:32:08 -07:00
very-ape
ceb409dae8 Replace $contact with $profile_contact in sidebar function. 2021-05-22 15:30:46 -07:00
Philipp
965cd8b096
Fix PHP 7.0 Coding Standards 2021-05-22 23:47:35 +02:00
Michael
fd3706b72e Coding standards again 2021-05-22 20:33:26 +00:00
Michael
684f9cdb96 Coding standards 2021-05-22 20:31:50 +00:00
Michael
2c6db3ccac Coding standards 2021-05-22 20:29:15 +00:00
Michael
6f44476c56 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-22 20:26:32 +00:00
Michael
c18cbe95a6 Fix inserting mails 2021-05-22 18:20:11 +00:00
Tobias Diekershoff
83cb4edc36
Merge pull request #10291 from annando/no-summary 
Don't create automated summaries
 2021-05-22 18:17:43 +02:00
Tobias Diekershoff
978b33fcd2
Merge pull request #10290 from annando/notice 
Fixes notice
 2021-05-22 18:14:17 +02:00
Tobias Diekershoff
707d8dc687 duplicates 2021-05-22 18:12:46 +02:00
Michael
77092157fe Don't create automated summaries 2021-05-22 16:11:10 +00:00
Michael
ede808f449 Fixes "Undefined index: upubkey" by replacing the profile load mechanism 2021-05-22 15:50:05 +00:00
Michael
a5c8c4d8b7 Fixes notice 2021-05-22 15:41:25 +00:00
Tobias Diekershoff
2a9e4407ba update the CREDITS.txt for the 2021.06 release 2021-05-22 17:22:43 +02:00
Tobias Diekershoff
3893c6210f
Merge pull request #10288 from annando/mail-uri-id 
API: improved mail handling
 2021-05-22 16:38:42 +02:00
Michael
6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Hypolite Petovan
3c8a08840b
Merge pull request #10286 from annando/local-contacts-tombstone 
Don't delete local tombstone contacts
 2021-05-22 06:50:07 -04:00
Hypolite Petovan
93546ce93d
Merge pull request #10284 from very-ape/vier-notifications-fix 
[vier] Keep the introductions notification badge from claiming its own line!
 2021-05-22 06:47:20 -04:00
Michael
0c21588ab9 Don't delete local tombstone contacts 2021-05-22 08:25:30 +00:00
very-ape
bd9a469392
Merge branch '2021.06-rc' into fix-message-button 2021-05-21 23:40:49 -07:00
very-ape
34eb81a187 Don't retrieve a contact record we've already been given. 2021-05-21 22:49:35 -07:00
Tobias Diekershoff
aa32abbdb4
Merge pull request #10285 from annando/revert-10280 
Fix for empty profile pages
 2021-05-22 07:47:06 +02:00
Michael
9d4b29d9c0 Fix for empty profile pages 2021-05-22 05:34:10 +00:00
very-ape
857e14636f Bug fix: Keep the introductions notification badge from claiming its own line! 2021-05-21 15:58:35 -07:00
Hypolite Petovan
dccf241702
Merge pull request #10281 from annando/api-documentation 
New section for dummy endpoints
 2021-05-21 18:38:51 -04:00
very-ape
c22ef3e79e Fix message button using a more targeted approach. 2021-05-21 14:28:01 -07:00
Michael
46301b7951 Changed description 2021-05-21 20:45:01 +00:00