Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,307 Commits 1 Branch 0 Tags 222 MiB
6774ff15db
Commit Graph

16307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ivan Tashkinov
882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-03-02 08:26:30 +03: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
Haelwenn (lanodan) Monnier
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy 2021-02-27 21:26:17 +01: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
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
 2021-02-27 19:37:08 +00:00
Alexander Strizhakov
da5d21a1cf
don't use continue in Stats init for test env 2021-02-27 09:39:15 +03:00
Mark Felder
d35b6254b4 Store the client application data in ActivityStreams format 2021-02-26 18:14:57 -06:00
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
 2021-02-26 16:49:11 +00:00
feld
2217b35bd4 Merge branch 'ecto-rollback-in-test-env' into 'develop' 
Possibility to run rollback in test env

See merge request pleroma/pleroma!3212
 2021-02-26 16:47:53 +00:00
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
 2021-02-26 09:21:15 +00:00
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. 2021-02-26 01:01:29 +00:00
Mark Felder
76b166f040 Note our upgrade path for this functionality 2021-02-25 13:08:36 -06:00
Mark Felder
902d4e4a4a Leave a note for future explorers 2021-02-25 13:06:43 -06:00
Mark Felder
2da71a526f No need to filter out Mix.env() from the API routes. 2021-02-25 13:04:08 -06:00
Mark Felder
1552179792 Improved recursion through the api route list 2021-02-25 10:07:29 -06:00
Mark Felder
6b87dfad5d Filter out MIX_ENV from route list and add a test 2021-02-25 09:23:10 -06:00
Mark Felder
8ad1613717 Enum instead of Stream 2021-02-25 09:06:56 -06:00
Mark Felder
cea31df6a6 Attempt to filter out API calls from FrontendStatic plug 2021-02-24 15:27:53 -06:00
Haelwenn
6b6791f911 Merge branch 'gitignore' into 'develop' 
gitignore: Vi and emacs temp files

See merge request pleroma/pleroma!3345
 2021-02-24 18:32:55 +00:00
Mark Felder
978627c5e1 Vi and emacs temp files 2021-02-24 12:11:50 -06:00
Haelwenn
870f9cb80c Merge branch 'docfix/chat-token' into 'develop' 
Update terminology in differences_in_mastoapi_responses.md

See merge request pleroma/pleroma!3344
 2021-02-24 17:26:26 +00:00