summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-04added stream fetch objectsissue/1969Maksim Pechnikov
2020-08-04added indexMaksim Pechnikov
2020-08-03Merge 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-03Improved WelcomeChatMessageTestIlja
* Checks if message is the same using ==/2 instead of =~/2
2020-08-03Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-03Merge branch 'config/default_ok_oldage' into 'develop'lain
config: :mrf, :policies default to ObjectAgePolicy Closes #2000 See merge request pleroma/pleroma!2814
2020-08-03Merge branch 'object-age-fix' into 'develop'lain
MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840
2020-08-03MRF Object Age Policy: Don't break on messages without cc/tolain
2020-08-03Merge branch 'indigenous-client' into 'develop'lain
Add indigenous to clients See merge request pleroma/pleroma!2835
2020-08-03Merge branch 'reportnote-test' into 'develop'lain
ReportNote test Closes #2014 See merge request pleroma/pleroma!2839
2020-08-02Add ReportNote testAlex Gleason
2020-08-02Factory: Add report_activity_factoryAlex Gleason
2020-08-02Add indigenous to clientsswentel
2020-08-02Add welcome chatmessagesIlja
* 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-01SimpleMRF: Add missing :followers_only to config.exsAlex Gleason
2020-08-01Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain
[#1985] Prevented force login on registration if account approval and/or email confirmation needed Closes #1985 See merge request pleroma/pleroma!2823
2020-08-01Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'rinpatch
ConnectionPool: fix gun open errors being returned without an error tuple Closes #2008 See merge request pleroma/pleroma!2832
2020-08-01ConnectionPool: fix gun open errors being returned without an error tuplerinpatch
When gun shuts down due to the host being unreachable, the worker process shuts down with the same shutdown reason since they are linked. Gun doesn't have error tuples in it's shutdown reason though, so we need to handle it in get_conn. Closes #2008
2020-08-01Merge branch 'fix/gun-limiter' into 'develop'rinpatch
Fix ConnecitonPool deadlocking after reaching the connection limit Closes #1977 See merge request pleroma/pleroma!2830
2020-08-01Fix ConnecitonPool deadlocking after reaching the connection limitrinpatch
The issue was with ConcurrentLimiter not decrementing counters on overload. It was fixed in the latest commit, but concurrentlimiter version wasn't updated in Pleroma for some reason. Closes #1977
2020-08-01Merge branch 'fix/user-agent-overriding' into 'develop'rinpatch
Don't override user-agent header if it's been set Closes #1923 See merge request pleroma/pleroma!2829
2020-08-01Don't override user-agent header if it's been setRoman Chvanikov
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
This reverts merge request !2825
2020-07-31Merge branch 'revert-1ac0969c' into 'develop'lain
Revert "Merge branch 'mrf-silence-2' into 'develop'" See merge request pleroma/pleroma!2825
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
This reverts merge request !2820
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
MRF silencing alternative solution See merge request pleroma/pleroma!2820
2020-07-31[#1985] Prevented force login on registration if account approval and/or ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31Apply 1 suggestion(s) to 1 file(s)lain
2020-07-31Default MRF to ObjectAgePolicy, 7 days thresholdHaelwenn (lanodan) Monnier
2020-07-31Merge branch 'deactivate-gun-again' into 'develop'lain
Config: Default to Hackney again See merge request pleroma/pleroma!2821
2020-07-31Config: Default to Hackney againlain
Gun is still acting up.
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'chore/fix-docs-typo' into 'develop'feld
Fix example json response See merge request pleroma/pleroma!2819
2020-07-30Fix example json responseMark Felder
2020-07-30Merge branch 'fix/configdb-otp-instructions' into 'develop'feld
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. See merge request pleroma/pleroma!2817
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
Render preview cards in chats See merge request pleroma/pleroma!2816
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809
2020-07-30Merge branch 'develop' into fix/configdb-otp-instructionsMark Felder
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-30OTP users need Pleroma running to execute pleroma_ctl, so reorganize ↵Mark Felder
instructions.
2020-07-30Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'feld
Attempt to fix markdown formatting See merge request pleroma/pleroma!2815
2020-07-30Attempt to fix markdown formattingMark Felder
2020-07-30Merge branch 'hide-reactions' into 'develop'lain
Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804
2020-07-30SimplePolicyTest: Add test for leaking DMs.lain
2020-07-30Merge branch 'feature/captcha-expose-timeout' into 'develop'lain
Expose seconds_valid in Pleroma Captcha API endpoint Closes #1954 See merge request pleroma/pleroma!2812
2020-07-30Apply 1 suggestion(s) to 1 file(s)lain
2020-07-30Merge branch 'issue/1933-update-dependency' into 'develop'lain
[#1933] update dependency See merge request pleroma/pleroma!2813
2020-07-30set versionsMaksim Pechnikov
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-02 03:56:45 +0000