summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-06ObjectValidator Test: Extract attachments.lain
2020-07-06Merge branch '1915-dont-filter-announce-notifications' into 'develop'rinpatch
Streamer: Don't filter out announce notifications. Closes #1915 See merge request pleroma/pleroma!2719
2020-07-06Merge branch 'filter-tesla-config' into 'develop'lain
Filter tesla config See merge request pleroma/pleroma!2722
2020-07-06migration to delete migrated tesla settingAlexander Strizhakov
2020-07-06don't save tesla settings into dbAlexander Strizhakov
2020-07-04Streamer: Don't filter out announce notifications.lain
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690
2020-07-03Merge branch '1912-leading-trailing-space-search' into 'develop'lain
SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717
2020-07-03Update changeloglain
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/mastoapi-2.9.0-status_text
2020-07-03Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain
[#1892] Exclusion of service actors from user search results Closes #1892 See merge request pleroma/pleroma!2708
2020-07-03SearchController: Trim query.lain
2020-07-03Merge branch '1910-migration-fix' into 'develop'rinpatch
Notification Backfill: Explicitly select the needed fields. Closes #1910 See merge request pleroma/pleroma!2715
2020-07-03Notification Backfill: Explicitly select the needed fields.lain
Prevents a crashing migration when we change user fields.
2020-07-03[#1892] Excluded internal users (applications) from user search results, ↵Ivan Tashkinov
reinstated service actors in search results.
2020-07-02Merge branch 'feature/1885-MRF-metadata' into 'develop'feld
Feature/1885 mrf metadata Closes #1885 See merge request pleroma/pleroma!2693
2020-07-02Merge branch 'activation-meta' into 'develop'feld
Add more FE-required fields to /api/v1/instance See merge request pleroma/pleroma!2613
2020-07-02Merge branch 'develop' into activation-metaMark Felder
2020-07-02Document the new API extension of /api/v1/instanceMark Felder
2020-07-02Remove camelCase from the keysMark Felder
2020-07-02Lint, long linesMark Felder
2020-07-02Improve descriptions, move primary MRF settings to top for AdminFE orderingMark Felder
2020-07-02Update AdminFE build to utilize new MRF metadataMark Felder
2020-07-02Merge branch 'develop' into feature/1885-MRF-metadataMark Felder
2020-07-02Merge branch 'fetcher-fixes' into 'develop'rinpatch
Don't fail fetching when the user in a replied-to message can't be fetched. See merge request pleroma/pleroma!2711
2020-07-02Merge branch '1907-fix-announce-streaming' into 'develop'rinpatch
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline" Closes #1907 See merge request pleroma/pleroma!2714
2020-07-02Merge branch 'feature/update-description' into 'develop'lain
Update settings descriptions and labels See merge request pleroma/pleroma!2709
2020-07-02Credo fixes.lain
2020-07-02Changelog: Update with stream changes.lain
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-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
This reverts merge request !2701
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 14:31:09 +0000