squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,693 Commits 154 Branches 42 Tags 503 MiB
2ec0dcf001
Commit Graph

1132 Commits

Author SHA1 Message Date
Maksim Pechnikov
2ec0dcf001 Merge branch 'develop' into issue/2099 2020-09-18 07:08:37 +03:00
eugenijm
c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
lain
7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation 2020-09-17 13:26:04 +02:00
Maksim Pechnikov
b867f9d7ae Merge branch 'develop' into issue/2099 2020-09-17 08:41:35 +03:00
rinpatch
0b5e72ecf0 Remove :managed_config option. 
In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.

The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.

Closes #2086
 2020-09-14 18:04:16 +03:00
Mark Felder
40c847dc2a Spelling 
Reported by:	trevoke
 2020-09-11 17:42:39 -05:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation 2020-09-11 14:13:38 -05:00
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access 2020-09-11 14:11:07 -05:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -05:00
Alex Gleason
c361df11b4
Docs: AdminAPI chat moderation 2020-09-11 14:10:45 -05:00
rinpatch
a098e10fd6 Document ephemeral activity changes better 
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
 2020-09-10 21:52:30 +03:00
Alexander Strizhakov
2c2094d4b2 configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban 2020-09-10 16:01:19 +03:00
Mark Felder
96697db3bc RelMe and Feed no longer configurable 2020-09-08 20:21:34 +03:00
Mark Felder
21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted 2020-09-08 09:31:26 -05:00
Alibek Omarov
efff2caccc docs: cheatsheet: add ForceBotUnlistedPolicy 2020-09-08 11:34:04 +00:00
lain
4306050da9 Merge branch 'develop' into 'develop' 
Added cmake

See merge request pleroma/pleroma!2953
 2020-09-08 13:56:29 +03:00
rinpatch
ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop' 
Rich media improvements

See merge request pleroma/pleroma!2944
 2020-09-08 13:00:49 +03:00
rinpatch
13e606941c Merge branch 'fix/2087-metadata' into 'develop' 
Fix/2087 metadata

See merge request pleroma/secteam/pleroma!11
 2020-09-08 12:55:30 +03:00
Alexander Strizhakov
a83916fdac
adapter options unification 
not needed options deletion
 2020-09-07 19:59:17 +03:00
Maksim Pechnikov
917d325972 added api spec 2020-09-07 07:17:30 +03:00
Maksim Pechnikov
5ae56aafb2 added import mutes 2020-09-06 21:42:51 +03:00
Farhan Khan
173b04df48 Added cmake 2020-09-04 18:03:58 +00:00
rinpatch
19691389b9 Rich media: Add failure tracking 2020-09-02 14:59:52 +03:00
Shpuld Shpludson
35da3be9dd Add mention of sudo -Hu pleroma to docs 2020-08-28 13:50:21 +00:00
lain
b76839e008 Cheatsheet: Remove misleading example 2020-08-26 13:53:16 +02:00
lain
c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-25 11:44:51 +02:00
lain
5722b0e2e5 Merge branch 'docs/update-clients' into 'develop' 
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE

See merge request pleroma/pleroma!2914
 2020-08-25 07:41:25 +00:00
Haelwenn (lanodan) Monnier
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE 2020-08-24 23:14:07 +02:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe 2020-08-19 08:41:39 +03:00
Haelwenn
3d5d8c05c9 Merge branch '2064-image-blanking' into 'develop' 
Resolve "Make default image description blank"

Closes #2064

See merge request pleroma/pleroma!2899
 2020-08-18 19:02:33 +00:00
lain
8d70692abf Merge branch 'freebsd-docs' into 'develop' 
FreeBSD installation process

See merge request pleroma/pleroma!2887
 2020-08-18 12:56:28 +00:00
lain
368fd04b47 Cheatsheet: Add information about filename descriptions 2020-08-18 13:22:00 +02:00
lain
34b099fffa Merge branch 'issue/1936' into 'develop' 
[#1936] Ability to search for banned MediaProxy URLs 

See merge request pleroma/pleroma!2873
 2020-08-17 13:05:20 +00:00
lain
e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop' 
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy

Closes #2046

See merge request pleroma/pleroma!2890
 2020-08-17 12:26:53 +00:00
Ivan Tashkinov
60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog. 2020-08-15 18:30:20 +03:00
rinpatch
4fcf272717 Docs: Fix the way tabs are declared 
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.

Closes #2045
 2020-08-15 09:55:59 +03:00
Farhan Khan
e8c20c42cd minor changes 2020-08-14 00:21:42 -04:00
Farhan Khan
a5144f05c2 Removed a trailing comment 2020-08-13 22:49:50 -04:00
Farhan Khan
816c04abdc Updates 2020-08-13 22:38:23 -04:00
Farhan Khan
b0c456d18d more acme.sh updates 2020-08-13 22:18:33 -04:00
Farhan Khan
f2665547f5 acme updates 2020-08-13 21:24:08 -04:00
Farhan Khan
24eb917dbc Rearranging acme 2020-08-13 20:58:46 -04:00
Farhan Khan
cba9f368af Added comment 2020-08-13 19:34:04 -04:00
Farhan Khan
b5f48275c5 Minor patch update 2020-08-13 19:08:13 -04:00
Farhan Khan
33ea430f3b acme.sh and netbsd to freebsd updates 2020-08-13 18:59:14 -04:00
Farhan Khan
53c4215ef1 Updated some more instruction specifics. 2020-08-13 18:59:14 -04:00
Farhan Khan
f6686a64af Updated ssl and domain name updates 
Removed the reference to niaa
 2020-08-13 18:59:14 -04:00
Farhan Khan
da5aca27a8 Minor reorganization 2020-08-13 18:59:13 -04:00