Commit graph

30899 commits

Author SHA1 Message Date
Philipp
f1f3fa7216
Add constructor injection for ExternalResource 2021-06-25 20:13:50 +02:00
Michael Vogel
d9d30d9555
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-25 20:00:59 +02:00
Michael
ed4a18f079 Function to return the avatar and header path for a given contact id 2021-06-25 17:03:35 +00:00
Hypolite Petovan
3ece803816
Merge pull request #10430 from annando/api-trends
API: Send "history" section for trends
2021-06-24 20:31:28 -04:00
Hypolite Petovan
af6fe4fef5
Merge pull request #10429 from annando/cors
Adjusted documentation
2021-06-24 20:30:02 -04:00
Michael
e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael
c06c515e02 Desktop is Web 2021-06-24 20:21:06 +00:00
Michael
4f35e954a4 Halcyon is Halcyon 2021-06-24 20:19:28 +00:00
Michael
62fffce1e8 Adjusted documentation 2021-06-24 18:16:48 +00:00
Hypolite Petovan
9cd642abbc
Merge pull request #10428 from annando/cors
Set CORS header fields to support Halcyon
2021-06-24 14:08:49 -04:00
Michael
89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Hypolite Petovan
d798d0bcd4
Merge pull request #10425 from annando/api-avatar
API: Improved avatar handling
2021-06-24 13:42:33 -04:00
Michael
ee25246e41 Standards 2021-06-24 17:37:50 +00:00
Michael
9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael
96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Hypolite Petovan
a02426c08c
Merge pull request #10423 from tobiasd/20210623-autoinstallparameter
console autoinstall used parameter U twice
2021-06-23 12:23:57 -04:00
Tobias Diekershoff
cfc08cbc11 console autoinstall used parameter U twice
The parameter "-U" was used twice for the database user and for the URL.
As all other database parameters are using the lowercase letter for the
parameter, this was adopted for the dbuser as well.
2021-06-23 18:05:39 +02:00
Hypolite Petovan
e6238990d7
Merge pull request #10422 from annando/forum-delivery
Ensure public forum posts are public
2021-06-23 08:18:43 -04:00
Michael
11063dc6fd Ensure public forum posts are public 2021-06-22 22:33:56 +00:00
Hypolite Petovan
b7bbb32739
Merge pull request #10421 from annando/ap-photo
Transmit mediaType, preparation for header image
2021-06-22 10:10:39 -04:00
Michael
df05d6b52a Transmit mediaType for headers as well / use blank image for empty header 2021-06-22 13:58:29 +00:00
Michael
dd39b3203b Transmit mediaType, preparation for header image 2021-06-22 03:17:41 +00:00
Hypolite Petovan
47cb89967f
Merge pull request #10420 from annando/usercount
Don't count the system user as user
2021-06-21 08:46:56 -04:00
Hypolite Petovan
1f69797a9a
Merge pull request #10419 from annando/fatal
Fix fatal error:  Uncaught TypeError: Argument 1 passed to Friendica\Model\Post\Media::existsByURIId() must be of the type int, null given
2021-06-21 08:46:03 -04:00
Michael
6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Michael
d5e5a6ea23 Fix fatal error: Uncaught TypeError: Argument 1 passed to Friendica\Model\Post\Media::existsByURIId() must be of the type int, null given 2021-06-21 03:53:53 +00:00
Hypolite Petovan
87a405e0c2
Merge pull request #10418 from nupplaphil/bug/attachement_url
Fix wrong attachement index
2021-06-20 19:58:42 -04:00
Philipp
5a6c5e9a17
Fix wrong attachement index 2021-06-20 22:33:05 +02:00
Hypolite Petovan
2cc522cdbe
Merge pull request #10373 from nupplaphil/feat/cleanup_factory_behaviour
Cleanup Mastodon Factories
2021-06-20 13:35:30 -04:00
Philipp
d4387d45ee
Cleanup Code 2021-06-20 13:25:45 +02:00
Philipp
263774eb46
Satisfy PHP-CS 2021-06-20 13:25:45 +02:00
Philipp
322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Hypolite Petovan
88b50313c8
Merge pull request #10417 from annando/context-select
Context: use the correct "select functionality
2021-06-19 23:02:21 -04:00
Michael
97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Hypolite Petovan
099b4caef2
Merge pull request #10416 from annando/empty-parents
An empty user id does not have children
2021-06-19 06:26:20 -04:00
Michael
7dd5ea42e9 An empty user id does not have children 2021-06-19 06:27:25 +00:00
Hypolite Petovan
08c4d7eedc
Merge pull request #10414 from annando/oauth
API: "created_at" is timestamp
2021-06-18 09:50:14 -04:00
Michael
f344d56316 TwidereX added 2021-06-18 09:04:11 +00:00
Michael
09609c40a4 Classname fixed 2021-06-18 05:50:52 +00:00
Michael
7d835ad790 Unused "use" removed 2021-06-18 03:32:20 +00:00
Michael
0a5904a001 API: "created_at" is timestamp 2021-06-18 03:21:38 +00:00
Hypolite Petovan
bd9fa88c66
Merge pull request #10413 from annando/notice
Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611"
2021-06-17 14:55:39 -04:00
Michael
a2b1819721 Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611" 2021-06-17 18:48:23 +00:00
Hypolite Petovan
47b64c8735
Merge pull request #10412 from annando/local-photo
Photos should point to the local system
2021-06-17 13:31:57 -04:00
Michael Vogel
b184df1108
Update src/Object/Api/Mastodon/Account.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-17 19:14:35 +02:00
Michael
bd016dc680 Photos should point to the local system 2021-06-17 16:55:54 +00:00
Hypolite Petovan
83d3ce0802
Merge pull request #10411 from annando/header-noscrape
Fix noscrape publishing and pulling, added header
2021-06-17 11:49:19 -04:00
Michael
fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Hypolite Petovan
5419d1d426
Merge pull request #10396 from annando/public-timeline
API: improved speed of the public timeline
2021-06-16 17:42:24 -04:00
Michael
ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00