Michael
8ac9b37176
Merge remote-tracking branch 'upstream/2021.06-rc' into proxy2
2021-06-28 10:11:41 +00:00
Michael
6f350c1e59
Use signed requests for fetching private images
2021-06-28 10:08:51 +00:00
Michael
7e200174d6
Replace attachment links in the body
2021-06-28 04:53:20 +00:00
Michael Vogel
ce575a88fc
Merge pull request #10441 from MrPetovan/bug/10435-external-storage-di
...
Add ExternalStorage dependency to StorageManager
2021-06-28 05:21:11 +02:00
Hypolite Petovan
681c7c0187
Add ExternalStorage dependency to StorageManager
...
- Since ExternalStorage isn't instantiated automatically by Dice, we have to provide the dependency manually in StorageManager->getByName
- This requires StorageManager to take one one additional dependency
- Tests are updated with this additional dependency
2021-06-27 23:15:46 -04:00
Hypolite Petovan
faac5b71ce
Merge pull request #10437 from annando/reduce-proxy
...
Reduce the usage of the "proxifyUrl" function
2021-06-27 22:41:14 -04:00
Michael
dbf9132ea6
Fixed indendation
2021-06-28 01:34:29 +00:00
Hypolite Petovan
005ba8c388
Merge pull request #10435 from nupplaphil/feat/di_cleanup
...
Add constructor injection for ExternalResource Storage
2021-06-27 21:02:03 -04:00
Michael
c89547aead
Only proxify images
2021-06-27 19:06:05 +00:00
Michael Vogel
56812ce24b
Merge pull request #10438 from tobiasd/20210627-lang
...
DE, HU and JA translation updates
2021-06-27 16:43:37 +02:00
Tobias Diekershoff
cb7b5089aa
DE translation update
2021-06-27 14:22:36 +02:00
Tobias Diekershoff
02e69e9c7c
updated JA translation THX daingewuvzeevisiddfddd
2021-06-27 14:18:34 +02:00
Tobias Diekershoff
c0aa138da6
HU translation updated THX Balázs Úr
2021-06-27 14:17:51 +02:00
Michael
b46b7b08ba
Reduce the usage of the "proxifyUrl" function
2021-06-27 11:50:10 +00:00
Philipp
b5acc07eaf
Add todo for develop phase
2021-06-26 21:17:10 +02:00
Hypolite Petovan
3fe6789c9c
Merge pull request #10434 from annando/issue-10433
...
Issue 10433: Only notify when there had been changes
2021-06-26 09:21:35 -04:00
Michael
de2898988b
Inverted condition
2021-06-26 11:31:37 +00:00
Michael
258d5fa695
Issue 10433: Only notify when there had been changes
2021-06-26 11:29:58 +00:00
Hypolite Petovan
2399353d35
Merge pull request #10432 from annando/avatar-path
...
Function to return the avatar and header path for a given contact id
2021-06-25 14:37:24 -04:00
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
