Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 22:23:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
31395 commits 3 branches 64 tags 248 MiB
Commit graph

31395 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
3b296400f4 Merge branch 'subscription' of github.com:annando/friendica into subscription 2021-08-15 16:18:30 +00:00
Michael
19f3cad56c Preparation for creating push notification 2021-08-15 16:18:25 +00:00
Michael Vogel
a3584c0bd3
Update src/Model/Subscription.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-08-15 17:27:45 +02:00
Michael
5056376902 We need to create a vapid public and private key 2021-08-15 12:57:29 +00:00
Michael
74f3cbc383 Improved error check, added "put" 2021-08-15 07:28:26 +00:00
Michael
8b6ace6629 Don't continue when key couldn't be created 2021-08-15 06:45:48 +00:00
Michael
167a12ef54 Styling 2021-08-15 00:43:07 +00:00
Michael
e28a4265c5 API: First steps to support subscriptions 2021-08-15 00:30:41 +00:00
Hypolite Petovan
1e305e748d
Merge pull request #10596 from annando/mark-file-star-for-all 
Follow, file and star does now work for all items
 2021-08-12 12:20:55 -04:00
Michael Vogel
fa65c436f4
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-08-12 18:04:01 +02:00
Hypolite Petovan
a364436623
Merge pull request #10597 from annando/warning 
Fixes "PHP Warning:  key() expects parameter 1 to be array, string given"
 2021-08-12 11:48:35 -04:00
Michael Vogel
f7f79a240a Are the tests happy? 2021-08-12 15:12:41 +02:00
Michael Vogel
e6ab4d9be9 Fixes "PHP Warning: key() expects parameter 1 to be array, string given" 2021-08-12 14:00:54 +02:00
Michael
81d9fc677f Updated messages.po 2021-08-12 06:33:08 +00:00
Michael
473adaf463 Mark, file and starring does now work for all items 2021-08-12 05:28:47 +00:00
Michael Vogel
25d221a78b
Merge pull request #10594 from tobiasd/20210811-irc 
docs, remove freenode from the IRC list
 2021-08-11 17:59:31 +02:00
Tobias Diekershoff
a25fc2f07c docs, remove freenode from the IRC list 2021-08-11 17:31:33 +02:00
Michael Vogel
b855646097
Merge pull request #10580 from MrPetovan/bug/10019-peertube-embed 
Simplify attachment processing in Protocol\ActivityPub\Receiver
 2021-08-11 13:56:33 +02:00
Hypolite Petovan
e146a5983c
Merge pull request #10593 from annando/matrix2 
The Matrix and XMPP address is now transported via AP as well
 2021-08-10 20:08:20 -04:00
Michael
ce46ab2573 The Matrix and XMPP address is now transported via AP as well 2021-08-10 23:49:09 +00:00
Hypolite Petovan
56ee1a211f
Merge pull request #10592 from annando/event 
Simplify event storing
 2021-08-10 09:00:41 -04:00
Hypolite Petovan
435c8d2892
Merge pull request #10591 from annando/notice 
Handles PHP Notice:  Undefined index: addr in src/Protocol/Diaspora.php on line 3091
 2021-08-10 08:30:44 -04:00
Michael
8e074a5fe4 Simplify event storing 2021-08-10 10:24:14 +00:00
Michael
56c00ea42d Handles PHP Notice: Undefined index: addr in src/Protocol/Diaspora.php on line 3091 2021-08-10 03:50:43 +00:00
Hypolite Petovan
d7e5814b12 Simplify attachment processing in Protocol\ActivityPub\Receiver 
- Remove indexing attachments by mediatype for later sorting
 2021-08-09 19:29:12 -04:00
Hypolite Petovan
536fbe5af1
Merge pull request #10586 from annando/app-user2 
Get rid of app->user completely
 2021-08-09 16:59:46 -04:00
Michael
28cfdec7c4 Some more renamed functions 2021-08-09 20:56:15 +00:00
Michael
c81e81dc8d "getUserId" is now "getLoggedInUserId" 2021-08-09 20:33:46 +00:00
Michael
15b93b4459 "getUserNickname" is now "getLoggedInUserNickname" 2021-08-09 19:48:39 +00:00
Hypolite Petovan
3267b50d22
Merge pull request #10590 from tobiasd/20210809-de 
DE translation update
 2021-08-09 12:45:40 -04:00
Tobias Diekershoff
90910bb4a5 DE translation update 2021-08-09 18:18:20 +02:00
Michael
27177f19c9 Updated messages.po 2021-08-09 15:40:37 +00:00
Michael
f5e84c1ff0 Use owner not profile 2021-08-09 15:38:22 +00:00
Michael
4495e83eca Merge remote-tracking branch 'upstream/develop' into app-user2 2021-08-09 15:32:32 +00:00
Michael
b8fa75b2dd Changed function name 2021-08-09 15:29:07 +00:00
Hypolite Petovan
3e1e3c8b3e
Merge pull request #10588 from annando/matrix 
Matrix addresses can be entered in the profile
 2021-08-09 10:56:12 -04:00
Hypolite Petovan
8671439069
Merge pull request #10589 from annando/pleroma 
Fix profile probing via Pleroma
 2021-08-09 10:55:19 -04:00
Michael
51d549639d Fix profile probing via Pleroma 2021-08-09 06:56:41 +00:00
Michael
bee04f86ee Matrix addresses can be entered in the profile 2021-08-09 01:39:09 +00:00
Michael
9f01052dd2 Removed some more unused "use" 2021-08-08 20:03:28 +00:00
Michael
a9d7e5b29e Removed unused use 2021-08-08 19:43:15 +00:00
Michael
28090bd793 Get rid of App->user completely 2021-08-08 19:30:21 +00:00
Hypolite Petovan
bfbfd94f2e
Merge pull request #10581 from annando/postopts 
Respect the postopts values for scheduled posts
 2021-08-08 09:48:19 -04:00
Michael
fc283ab928 Remove direct calls to App->user 2021-08-08 10:14:56 +00:00
Michael
9664efd66b Added some description 2021-08-07 20:09:25 +00:00
Michael
6a23b17c95 Respect the postopts values for scheduled posts 2021-08-06 18:49:17 +00:00
Tobias Diekershoff
266ee26240
Merge pull request #10579 from annando/http-errors 
Avoid some HTTP errors
 2021-08-06 08:11:35 +02:00
Michael
4db86a108e Updated messages.po 2021-08-06 05:59:16 +00:00
Michael
a8442e41ab Improved error message for external resources 2021-08-06 04:02:42 +00:00
Michael
4bc3e8c141 Don't send "accept" when we accept anything 2021-08-06 04:02:22 +00:00