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

1096 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE 2020-08-24 23:14:07 +02: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
Farhan Khan
07376bd21a Adding installation documentation for FreeBSD + rc.d script 2020-08-13 18:59:13 -04:00
feld
14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop' 
Fix activity expirations again

See merge request pleroma/pleroma!2866
 2020-08-13 17:38:19 +00:00
Maksim Pechnikov
56470647de Merge branch 'develop' into issue/1936 2020-08-13 09:00:25 +03:00
feld
a94210c70b Merge branch 'docs_improve_static_dir_documentation' into 'develop' 
Improve static_dir documentation

See merge request pleroma/pleroma!2864
 2020-08-12 16:39:19 +00:00
feld
3aa7969ff9 Update robots_txt.md 2020-08-12 16:19:34 +00:00
Mark Felder
091da10832 Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria. 2020-08-12 11:00:01 -05:00
Maksim Pechnikov
644effc63b update docs 2020-08-12 08:51:09 +03:00
lain
93fbf39954 Merge branch 'revert-a6d3bb5f' into 'develop' 
Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868
 2020-08-10 13:59:38 +00:00
lain
73af60d02f Merge branch 'develop' into 'develop' 
docs: add cmake to other installation guides

Closes #2039

See merge request pleroma/pleroma!2870
 2020-08-10 13:47:02 +00:00
Alibek Omarov
a2f2ba3fbb docs: add cmake to other installation guides 2020-08-10 16:24:45 +03:00
lain
4d76c0ec8b Docs: Add cmake dependency 2020-08-10 15:12:45 +02:00
lain
5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'" 
This reverts merge request !2763
 2020-08-10 13:05:13 +00:00
Ilja
bd7bf6cd19 Apply 1 suggestion(s) to 1 file(s) 2020-08-10 11:29:54 +00:00
Ilja
a4a2d38640 Apply 1 suggestion(s) to 1 file(s) 2020-08-10 11:29:40 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses 2020-08-08 16:29:40 +04:00
Ilja
e0dee833f2 Improve static_dir documentation 
* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
    * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
 2020-08-08 12:21:44 +02:00
Mark Felder
54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues 2020-08-07 14:55:22 -05:00
lain
60fe0a08f0 Docs: Remove wrong / confusing auth docs. 2020-08-07 17:59:55 +02:00
Mark Felder
6ddea8ebe8 Add a note about the proper value for uid 2020-08-07 09:42:10 -05:00
lain
28584bb224 Merge branch 'email-blacklist' into 'develop' 
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
 2020-08-04 11:00:30 +00:00
lain
e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' 
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
 2020-08-03 21:01:56 +00:00
lain
56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop' 
Follower mrf again

See merge request pleroma/pleroma!2833
 2020-08-03 14:22:11 +00:00
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
swentel
0012894d4e Add indigenous to clients 2020-08-02 19:33:22 +02:00
Ilja
f671d7e68c Add welcome chatmessages 
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
 2020-08-02 15:54:59 +02:00
lain
4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'" 
This reverts merge request !2825
 2020-07-31 15:18:04 +00:00
lain
010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'" 
This reverts merge request !2820
 2020-07-31 15:17:09 +00:00
lain
1ac0969c72 Merge branch 'mrf-silence-2' into 'develop' 
MRF silencing alternative solution

See merge request pleroma/pleroma!2820
 2020-07-31 14:43:33 +00:00
lain
37b9e5e138 Apply 1 suggestion(s) to 1 file(s) 2020-07-31 10:29:16 +00:00
Mark Felder
052833f8ee Fix example json response 2020-07-30 15:57:41 -05:00