| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-09-08 | Merge branch 'feat/rich-media-improvements' into 'develop' | rinpatch | |
| Rich media improvements See merge request pleroma/pleroma!2944 | |||
| 2020-09-08 | Merge branch 'fix/2087-metadata' into 'develop' | rinpatch | |
| Fix/2087 metadata See merge request pleroma/secteam/pleroma!11 | |||
| 2020-08-26 | Cheatsheet: Remove misleading example | lain | |
| 2020-08-25 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | lain | |
| frontend-bundles-downloads | |||
| 2020-08-18 | Cheatsheet: Add information about filename descriptions | lain | |
| 2020-08-17 | Merge branch ↵ | lain | |
| '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-15 | [#2046] Added test for pleroma/restrict_unauthenticated defaults on private ↵ | Ivan Tashkinov | |
| instance. Updated docs and changelog. | |||
| 2020-08-15 | Docs: Fix the way tabs are declared | rinpatch | |
| 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-13 | Merge branch 'fix/activity-expirations-again' into 'develop' | feld | |
| Fix activity expirations again See merge request pleroma/pleroma!2866 | |||
| 2020-08-12 | Add the ActivityExpirationPolicy MRF to docs and clarify post expiration ↵ | Mark Felder | |
| criteria. | |||
| 2020-08-10 | Apply 1 suggestion(s) to 1 file(s) | Ilja | |
| 2020-08-10 | Apply 1 suggestion(s) to 1 file(s) | Ilja | |
| 2020-08-08 | Improve static_dir documentation | Ilja | |
| * 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-07 | Merge branch 'develop' into fix/ldap-auth-issues | Mark Felder | |
| 2020-08-07 | Docs: Remove wrong / confusing auth docs. | lain | |
| 2020-08-07 | Add a note about the proper value for uid | Mark Felder | |
| 2020-08-04 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | lain | |
| frontend-bundles-downloads | |||
| 2020-08-04 | Merge branch 'email-blacklist' into 'develop' | lain | |
| Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837 | |||
| 2020-08-03 | Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' ↵ | lain | |
| into 'develop' fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782 | |||
| 2020-08-02 | Add email blacklist, fixes #1404 | Alex Gleason | |
| 2020-08-02 | Add welcome chatmessages | Ilja | |
| * 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-07-31 | Revert "Merge branch 'revert-1ac0969c' into 'develop'" | lain | |
| This reverts merge request !2825 | |||
| 2020-07-31 | Revert "Merge branch 'mrf-silence-2' into 'develop'" | lain | |
| This reverts merge request !2820 | |||
| 2020-07-31 | Merge branch 'mrf-silence-2' into 'develop' | lain | |
| MRF silencing alternative solution See merge request pleroma/pleroma!2820 | |||
| 2020-07-31 | Apply 1 suggestion(s) to 1 file(s) | lain | |
| 2020-07-30 | Merge branch 'develop' into fix/configdb-otp-instructions | Mark Felder | |
| 2020-07-30 | OTP users need Pleroma running to execute pleroma_ctl, so reorganize ↵ | Mark Felder | |
| instructions. | |||
| 2020-07-30 | Attempt to fix markdown formatting | Mark Felder | |
| 2020-07-29 | Merge remote-tracking branch 'upstream/develop' into mrf-silence | Alex Gleason | |
| 2020-07-29 | SimpleMRF: :silence --> :followers_only | Alex Gleason | |
| 2020-07-29 | Merge remote-tracking branch 'upstream/develop' into hide-reactions | Alex Gleason | |
| 2020-07-29 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | lain | |
| frontend-bundles-admin | |||
| 2020-07-29 | Merge branch 'by-approval' into 'develop' | lain | |
| Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757 | |||
| 2020-07-29 | Cheatsheet: Update frontends information. | lain | |
| 2020-07-28 | SimpleMRF: Let instances be silenced | Alex Gleason | |
| 2020-07-28 | Let favourites and emoji reactions optionally be hidden | Alex Gleason | |
| 2020-07-28 | Cheatsheet: Add even more info. | lain | |
| 2020-07-28 | Cheatsheet: Add more info. | lain | |
| 2020-07-28 | Docs: Add frontend info to cheat sheet. | lain | |
| 2020-07-27 | Add :registration_reason_length to description.exs | Alex Gleason | |
| 2020-07-27 | Merge remote-tracking branch 'upstream/develop' into by-approval | Alex Gleason | |
| 2020-07-26 | Merge remote-tracking branch 'upstream/develop' into by-approval | Alex Gleason | |
| 2020-07-23 | Merge branch 'develop' into issue/1934-welcome-email | Maksim Pechnikov | |
| 2020-07-22 | fix sender for welcome email | Maksim Pechnikov | |
| 2020-07-21 | Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" | lain | |
| This reverts merge request !2784 | |||
| 2020-07-21 | Revert "Merge branch 'linkify' into 'develop'" | lain | |
| This reverts merge request !2677 | |||
| 2020-07-21 | added welcome email | Maksim Pechnikov | |
| 2020-07-16 | Merge remote-tracking branch 'upstream/develop' into linkify | Alex Gleason | |
| 2020-07-15 | Add documentation for new connection pool settings and remove some | rinpatch | |
| `:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable. | |||
| 2020-07-14 | Merge remote-tracking branch 'upstream/develop' into by-approval | Alex Gleason | |
 |
index : pleroma.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |