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

30816 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Hypolite Petovan
26d3f5433b
Merge pull request #10280 from very-ape/fix-message-button 
Fix Message button.
 2021-05-21 14:57:28 -04:00
very-ape
97a9ec4e40 Bug fix: last commit results in logged-in user's contacts being displayed on contact profile sidebar. 2021-05-21 11:38:50 -07:00
Hypolite Petovan
c4018ebf02
Merge pull request #10282 from annando/notice 
Wrong class path
 2021-05-21 14:35:15 -04:00
Michael
9330fe1440 Updated messages.po 2021-05-21 18:18:39 +00:00
Michael
081652e09a Wrong class path 2021-05-21 18:00:03 +00:00
Michael
52c62f8d1d New section for dummy endpoints 2021-05-21 17:49:25 +00:00
Michael
bcb2073c9a New class to process HTTP input data 2021-05-21 17:36:51 +00:00
very-ape
93926e99b8 Use getByNickname as suggested in code review. 2021-05-21 10:15:32 -07:00
Tobias Diekershoff
8bf80c92bd version 2021.06-rc 2021-05-21 18:38:54 +02:00
very-ape
fe52719d37 Fix Message button. 2021-05-20 23:30:42 -07:00
Hypolite Petovan
315dddbcb9
Merge pull request #10277 from very-ape/authenticate-hook 
Bug fix: allow authentication addons to create users again.
 2021-05-20 15:05:55 -04:00
very-ape
e2d93b57da
Update src/Model/User.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-20 11:54:30 -07:00
very-ape
d66f1e30ae Apply suggestions from code review 
Also clean up some code, make it less needlessly verbose.

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-20 11:35:33 -07:00
Tobias Diekershoff
35444a0e2b
Merge pull request #10278 from MrPetovan/task/8262-add-rtl-support-2 
Add RTL support to many input fields
 2021-05-20 16:40:24 +02:00