aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-02Streamer: Align announce streaming with polling.lain
2020-07-02SideEffects: Refactor.lain
2020-07-01Merge branch '1716-handle-nickname-clashes' into 'develop'rinpatch
ActivityPub: Handle clashing nicknames for the same ap id Closes #1716 See merge request pleroma/pleroma!2712
2020-07-01ActivityPub: Handle clashing nicknames for the same ap idlain
If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.
2020-07-01Fetcher: Work when we can't get the OP.lain
2020-07-01Fixtures: Pretty print.lain
2020-07-01Merge branch 'revert-651f2695' into 'develop'lain
Revert "Merge branch 'avatar-removing' into 'develop'" See merge request pleroma/pleroma!2710
2020-07-01Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
This reverts merge request !2701
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
2020-06-30AutoLinker --> Linkify, update to latest versionAlex Gleason
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30Merge developRoman Chvanikov
2020-06-30Merge branch 'chore/rename-user-settings-column' into 'develop'Haelwenn
Rename user.settings column See merge request pleroma/pleroma!2707
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30Merge branch 'develop' into activation-metaMark Felder
2020-06-30[#1892] Excluded bot actors (applications, services) from search results.Ivan Tashkinov
2020-06-30Rename user.settings columnMark Felder
This is used exclusively by MastoFE/GlitchFE now
2020-06-30Merge branch 'preloadfixups' into 'develop'lain
Some fixups for the preload. See merge request pleroma/pleroma!2692
2020-06-30Credo fixeslain
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-30Merge branch 'patch-1' into 'develop'lain
Use correct PostgreSQL version command in bug template See merge request pleroma/pleroma!2706
2020-06-30Use correct PostgreSQL version command in bug templatenormandy
2020-06-29Merge branch 'fix-notification-filtering' into 'develop'rinpatch
Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705
2020-06-29Apply suggestion to lib/pleroma/notification.exlain
2020-06-29Merge branch 'fix/cast-and-validate' into 'develop'lain
Fix CastAndValidate plug Closes #1889 See merge request pleroma/pleroma!2704
2020-06-29Notification: Remove TODO.lain
2020-06-29Notifications: Never return `nil` in the notification list.lain
2020-06-29Test default "content-type" for CastAndValidateEgor Kislitsyn
2020-06-29Merge branch 'fix/swoosh-sendmail' into 'develop'feld
updated swoosh See merge request pleroma/pleroma!2703
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29updated swooshMaksim Pechnikov
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
2020-06-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
2020-06-29Fix warningEgor Kislitsyn
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
2020-06-29Credo fixes.lain
2020-06-29Token Response: Remove empty file.lain
2020-06-29AccountOperation: Correctly describe create response.lain
2020-06-29OAuth: Extract view-type functions to a view.lain
2020-06-29Merge branch 'avatar-removing' into 'develop'lain
UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701
2020-06-29UpdateCredentialsTest: Add test for removing profile images.lain
2020-06-29Preloaders: Use strings as keys.lain
2020-06-29User preloader: Put user info at correct keylain
2020-06-29Merge branch '1031-parent-visible' into 'develop'lain
Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679
2020-06-29Merge branch 'openapi/schema-account-pleromafields' into 'develop'lain
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses See merge request pleroma/pleroma!2700
2020-06-29ApiSpec.Schemas.Account: import description from ↵Haelwenn (lanodan) Monnier
differences_in_mastoapi_responses
2020-06-29Merge branch 'docs/mastoapi-account-fields' into 'develop'Haelwenn
differences_in_mastoapi_responses: Update account fields See merge request pleroma/pleroma!2699
2020-06-29differences_in_mastoapi_responses: Update account fieldsHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 13:17:37 +0000