lain
|
13aa98d689
|
Merge branch 'mergeback/2.3.0' into 'develop'
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
|
4 years ago |
|
lain
|
10f402af6d
|
Changelog: Re-add application support
|
4 years ago |
|
lain
|
2e296c079f
|
Revert "StatusController: Deactivate application support for now."
This reverts commit 024c11c18d.
|
4 years ago |
|
lain
|
c5352e90be
|
Changelog, mix: merge in stable
|
4 years ago |
|
Haelwenn
|
49afbcda5f
|
Merge branch 'fix-migration' into 'develop'
Fix migration in cases where database name has a hyphen
See merge request pleroma/pleroma!3359
|
4 years ago |
|
Mark Felder
|
5b8cceba09
|
Fix migration in cases where database name has a hyphen
|
4 years ago |
|
Haelwenn
|
37c37090fa
|
Merge branch 'fix/inconsistent-reference' into 'develop'
MastoAPI Status View: make consistently named object references
See merge request pleroma/pleroma!3358
|
4 years ago |
|
Haelwenn
|
81e9c5196f
|
Merge branch 'fix/useless-header' into 'develop'
Test: remove useless header on the get request
See merge request pleroma/pleroma!3357
|
4 years ago |
|
Mark Felder
|
8d601d3b23
|
Make the object reference in both render("show.json", _) functions consistently named
|
4 years ago |
|
Mark Felder
|
913d53b7d7
|
Remove useless header on the get request
|
4 years ago |
|
lain
|
b221d77a6d
|
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
|
4 years ago |
|
feld
|
210aa42f74
|
Merge branch 'application-to-generator' into 'develop'
Status application field: test improvements
See merge request pleroma/pleroma!3356
|
4 years ago |
|
Mark Felder
|
ccbf162088
|
Actually test viewing status after ingestion
|
4 years ago |
|
Mark Felder
|
f0208980e4
|
Test both ingestion of post in the status controller and the correct response during the view
|
4 years ago |
|
Mark Felder
|
85b2387f66
|
Fix build_application/1 match
|
4 years ago |
|
lain
|
0a589c887b
|
Mix: Update linkify.
|
4 years ago |
|
lain
|
7dac83eb6e
|
Linting.
|
4 years ago |
|
lain
|
7d790bb27b
|
Changelog: Remove application support line.
|
4 years ago |
|
lain
|
024c11c18d
|
StatusController: Deactivate application support for now.
Some more things to discuss about, so we'll remove it from 2.3.0
|
4 years ago |
|
lain
|
cd6aa9bcae
|
Mix: Update version number
|
4 years ago |
|
lain
|
9f71b63c2d
|
Update changelog
|
4 years ago |
|
Mark Felder
|
808e15b264
|
Document user agent leak fix
|
4 years ago |
|
Alex Gleason
|
7ebbe11e75
|
user_agent_mock --> request_mock
|
4 years ago |
|
Alex Gleason
|
1dc5794e29
|
Never forward the client's user-agent through the media proxy
|
4 years ago |
|
lain
|
4cb166e979
|
Merge branch 'update-frontend-2021-03-01' into 'develop'
Update frontend
See merge request pleroma/pleroma!3353
|
4 years ago |
|
lain
|
5058de328e
|
Update frontend
|
4 years ago |
|
Haelwenn
|
d03ee11b72
|
Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"
See merge request pleroma/pleroma!3352
|
4 years ago |
|
Mark Felder
|
b1e1db82bc
|
Store application details in the object under the generator key, not application key
|
4 years ago |
|
feld
|
9fb8da4293
|
Merge branch 'feld-develop-patch-26755' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3351
|
4 years ago |
|
feld
|
8a563efdd8
|
Update CHANGELOG.md
|
4 years ago |
|
lain
|
e8d88a72cf
|
Merge branch 'fix/warning-in-test' into 'develop'
warning fix
See merge request pleroma/pleroma!3350
|
4 years ago |
|
lain
|
4a9d3a1f28
|
Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
|
4 years ago |
|
Alexander Strizhakov
|
f85ed1c521
|
warning fix
|
4 years ago |
|
lain
|
6a71aa535b
|
Merge branch 'admin-api-versioning' into 'develop'
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
|
4 years ago |
|
lain
|
050c4b1f14
|
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
|
4 years ago |
|
lain
|
e6a14e1cd1
|
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
|
4 years ago |
|
Mark Felder
|
0faf8dbef8
|
Simplify migration
|
4 years ago |
|
lain
|
d0823d7f1e
|
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
|
4 years ago |
|
lain
|
dd937ae625
|
Merge branch 'fix/repo-terminate' into 'develop'
don't use continue in Stats init for test env
See merge request pleroma/pleroma!3349
|
4 years ago |
|
Alexander Strizhakov
|
da5d21a1cf
|
don't use continue in Stats init for test env
|
4 years ago |
|
Mark Felder
|
d35b6254b4
|
Store the client application data in ActivityStreams format
|
4 years ago |
|
feld
|
840686ecd5
|
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
|
4 years ago |
|
feld
|
2217b35bd4
|
Merge branch 'ecto-rollback-in-test-env' into 'develop'
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
|
4 years ago |
|
rinpatch
|
74bd9980ad
|
Merge branch 'PestToast-develop-patch-66930' into 'develop'
Removed a command that references "pleroma.env". This file does not seem to be...
See merge request pleroma/pleroma!3347
|
4 years ago |
|
PestToast
|
a30126271f
|
Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.
|
4 years ago |
|
Mark Felder
|
76b166f040
|
Note our upgrade path for this functionality
|
4 years ago |
|
Mark Felder
|
902d4e4a4a
|
Leave a note for future explorers
|
4 years ago |
|
Mark Felder
|
2da71a526f
|
No need to filter out Mix.env() from the API routes.
|
4 years ago |
|
Mark Felder
|
1552179792
|
Improved recursion through the api route list
|
4 years ago |
|
Mark Felder
|
6b87dfad5d
|
Filter out MIX_ENV from route list and add a test
|
4 years ago |
