aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-09-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵matrix-explorationslain
matrix-explorations
2020-09-07Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-05RichMedia: do not log webpages missing metadata as errorsrinpatch
Also fixes the return value of Parser.parse on errors, previously was just `:ok` due to the logger call in the end
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
Closes #1987
2020-09-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
matrix-explorations
2020-09-03Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain
Fix emoji in Question, force generated context/context_id insertion Closes #1870 See merge request pleroma/pleroma!2915
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
Ensure all responses to password reset events are identical.
2020-09-02StatusView: Start fetching rich media cards as soon as possiblerinpatch
2020-09-02Rich media: Add failure trackingrinpatch
2020-09-02Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941
2020-09-02correct pool and uniform headers formatAlexander Strizhakov
2020-09-01don't fail on url fetchAlexander Strizhakov
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
Mastodon (Frontend) changed a different method for deletes, keeping old format as mastodon documentation is too loose
2020-09-01User table: ensure bio is always a stringrinpatch
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01common_fixes: Force inserting context and context_idHaelwenn (lanodan) Monnier
2020-09-01Add new Emoji Ecto.Type and fix emoji in QuestionHaelwenn (lanodan) Monnier
2020-09-01transmogrifier: Remove mastodon emoji-format from emoji fieldHaelwenn (lanodan) Monnier
2020-08-31Merge branch 'chat-relation-constraints' into 'develop'Haelwenn
Chats: Add cascading delete on both referenced users. See merge request pleroma/pleroma!2934
2020-08-31Chats: Add cascading delete on both referenced users.lain
Also remove the now-superfluous join in the chat controller, which was only used to filter out these cases.
2020-08-31Notification: Small refactor.lain
2020-08-28marks notifications as read after muteMaksim Pechnikov
2020-08-27Merge branch '2078-list-fixes' into 'develop'Haelwenn
Resolve "List timeline returns incorrectly assigned Account for replies and repeats" Closes #2070 and #2078 See merge request pleroma/pleroma!2923
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-26TimelineController: Keys are atoms now.lain
Closes #2078 Closes #2070
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
Automatically mark notifications about statuses from muted users and threads as read Closes #1952 See merge request pleroma/pleroma!2893
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-25MatrixController: Implement basic `messages` endpoint.lain
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
Relay fix for admin-fe See merge request pleroma/pleroma!2902
2020-08-24Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
matrix-explorations
2020-08-24MatrixController: Replace sleeping with waking.lain
PubSub to a channel that will tell us about new chat messages.
2020-08-22MatrixController: Always give information on all roomslain
Otherwise element (iOS) will start thinking all DM chats are rooms
2020-08-22MatrixController: Keep the transaction id aroundlain
Prevents message doubling in element (web)
2020-08-22MatrixController: Better guesses.lain
2020-08-22MatrixController: Implement some more placeholders.lain
2020-08-22MatrixController: Actually set the read marker.lain
2020-08-22MatrixController: Add basic tests, respect the 'since' parameter.lain
2020-08-21Merge branch 'features/validators-event' into 'develop'lain
Pipeline Ingestion: Event See merge request pleroma/pleroma!2909
2020-08-21.lain
2020-08-21.lain
2020-08-21.lain
2020-08-21.lain
2020-08-21.lain
2020-08-21.lain
2020-08-21.lain
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier