Haelwenn (lanodan) Monnier
|
7eecc3b61d
|
OpenAPI: MastodonAPI Timeline Controller
|
2021-03-15 06:47:06 +01:00 |
Haelwenn
|
19fbe5b860
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3370
|
2021-03-14 08:09:22 +00:00 |
Ben Is
|
2408363e2a
|
Translated using Weblate (Italian)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
|
2021-03-13 09:40:56 +00:00 |
rinpatch
|
9de2a5024e
|
Merge branch 'improve-gitlab-ci' into 'develop'
Execute mix deps.get earlier and avoid duplicate invocations if possible
See merge request pleroma/pleroma!3369
|
2021-03-11 19:14:59 +00:00 |
Mark Felder
|
884584772b
|
Execute mix deps.get earlier and avoid duplicate invocations if possible
|
2021-03-11 09:42:04 -06:00 |
feld
|
8e09a3cfa0
|
Merge branch 'fix/spec-build' into 'develop'
Ensure we fetch deps during spec-build stage
See merge request pleroma/pleroma!3368
|
2021-03-10 23:14:46 +00:00 |
Mark Felder
|
fa75f11ca1
|
Revert "See if switching to same image as releases fixes the build"
This reverts commit 502d166b7e .
|
2021-03-10 16:37:24 -06:00 |
Mark Felder
|
502d166b7e
|
See if switching to same image as releases fixes the build
|
2021-03-10 16:19:18 -06:00 |
Mark Felder
|
8feeb672c8
|
Ensure we fetch deps during spec-build stage
|
2021-03-10 13:03:14 -06:00 |
Haelwenn
|
7f413139fb
|
Merge branch 'openapi/admin/user' into 'develop'
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
|
2021-03-10 03:24:40 +00:00 |
Egor Kislitsyn
|
9876fa8e90
|
Add UserOperation to Redoc
|
2021-03-04 21:13:53 +04:00 |
lain
|
13aa98d689
|
Merge branch 'mergeback/2.3.0' into 'develop'
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
|
2021-03-03 15:07:50 +00:00 |
lain
|
10f402af6d
|
Changelog: Re-add application support
|
2021-03-03 15:35:25 +01:00 |
lain
|
2e296c079f
|
Revert "StatusController: Deactivate application support for now."
This reverts commit 024c11c18d .
|
2021-03-03 15:33:06 +01:00 |
lain
|
c5352e90be
|
Changelog, mix: merge in stable
|
2021-03-03 13:56:40 +01:00 |
Haelwenn
|
49afbcda5f
|
Merge branch 'fix-migration' into 'develop'
Fix migration in cases where database name has a hyphen
See merge request pleroma/pleroma!3359
|
2021-03-03 00:57:39 +00:00 |
Mark Felder
|
5b8cceba09
|
Fix migration in cases where database name has a hyphen
|
2021-03-02 18:17:32 -06:00 |
Haelwenn
|
37c37090fa
|
Merge branch 'fix/inconsistent-reference' into 'develop'
MastoAPI Status View: make consistently named object references
See merge request pleroma/pleroma!3358
|
2021-03-02 20:48:40 +00:00 |
Haelwenn
|
81e9c5196f
|
Merge branch 'fix/useless-header' into 'develop'
Test: remove useless header on the get request
See merge request pleroma/pleroma!3357
|
2021-03-02 20:47:21 +00:00 |
Mark Felder
|
8d601d3b23
|
Make the object reference in both render("show.json", _) functions consistently named
|
2021-03-02 14:14:38 -06:00 |
Mark Felder
|
913d53b7d7
|
Remove useless header on the get request
|
2021-03-02 14:04:50 -06:00 |
lain
|
b221d77a6d
|
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
|
2021-03-02 19:54:30 +00:00 |
feld
|
210aa42f74
|
Merge branch 'application-to-generator' into 'develop'
Status application field: test improvements
See merge request pleroma/pleroma!3356
|
2021-03-02 18:40:35 +00:00 |
Mark Felder
|
ccbf162088
|
Actually test viewing status after ingestion
|
2021-03-02 12:33:32 -06:00 |
Mark Felder
|
f0208980e4
|
Test both ingestion of post in the status controller and the correct response during the view
|
2021-03-02 12:29:16 -06:00 |
Mark Felder
|
85b2387f66
|
Fix build_application/1 match
|
2021-03-02 11:37:37 -06:00 |
Egor Kislitsyn
|
3aae5231b2
|
Add OpenAPI spec for AdminAPI.UserController
|
2021-03-02 20:49:17 +04:00 |
lain
|
0a589c887b
|
Mix: Update linkify.
|
2021-03-02 17:03:14 +01:00 |
lain
|
7dac83eb6e
|
Linting.
|
2021-03-02 15:03:16 +01:00 |
lain
|
7d790bb27b
|
Changelog: Remove application support line.
|
2021-03-02 14:42:11 +01:00 |
lain
|
024c11c18d
|
StatusController: Deactivate application support for now.
Some more things to discuss about, so we'll remove it from 2.3.0
|
2021-03-02 14:40:47 +01:00 |
lain
|
cd6aa9bcae
|
Mix: Update version number
|
2021-03-01 21:13:43 +01:00 |
lain
|
9f71b63c2d
|
Update changelog
|
2021-03-01 21:12:26 +01:00 |
Mark Felder
|
808e15b264
|
Document user agent leak fix
|
2021-03-01 21:05:58 +01:00 |
Alex Gleason
|
7ebbe11e75
|
user_agent_mock --> request_mock
|
2021-03-01 21:05:52 +01:00 |
Alex Gleason
|
1dc5794e29
|
Never forward the client's user-agent through the media proxy
|
2021-03-01 21:05:46 +01:00 |
lain
|
4cb166e979
|
Merge branch 'update-frontend-2021-03-01' into 'develop'
Update frontend
See merge request pleroma/pleroma!3353
|
2021-03-01 19:21:52 +00:00 |
lain
|
5058de328e
|
Update frontend
|
2021-03-01 20:04:53 +01:00 |
Haelwenn
|
d03ee11b72
|
Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"
See merge request pleroma/pleroma!3352
|
2021-03-01 17:51:15 +00:00 |
Mark Felder
|
b1e1db82bc
|
Store application details in the object under the generator key, not application key
|
2021-03-01 11:29:10 -06:00 |
feld
|
9fb8da4293
|
Merge branch 'feld-develop-patch-26755' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3351
|
2021-02-28 19:01:01 +00:00 |
feld
|
8a563efdd8
|
Update CHANGELOG.md
|
2021-02-28 18:46:03 +00:00 |
lain
|
e8d88a72cf
|
Merge branch 'fix/warning-in-test' into 'develop'
warning fix
See merge request pleroma/pleroma!3350
|
2021-02-28 16:53:05 +00:00 |
lain
|
4a9d3a1f28
|
Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
|
2021-02-28 16:45:15 +00:00 |
Alexander Strizhakov
|
f85ed1c521
|
warning fix
|
2021-02-28 19:41:25 +03:00 |
lain
|
6a71aa535b
|
Merge branch 'admin-api-versioning' into 'develop'
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
|
2021-02-28 16:22:22 +00:00 |
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
|
2021-02-28 16:18:23 +00:00 |
lain
|
e6a14e1cd1
|
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
|
2021-02-28 16:17:34 +00:00 |
Mark Felder
|
0faf8dbef8
|
Simplify migration
|
2021-02-28 09:22:44 -06:00 |
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
|
2021-02-27 19:40:38 +00:00 |