aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-09-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-expl...matrix-explorationslain
2020-09-07Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
2020-09-05RichMedia: do not log webpages missing metadata as errorsrinpatch
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
2020-09-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-expl...lain
2020-09-03Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
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
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
2020-09-01User table: ensure bio is always a stringrinpatch
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
2020-08-31Chats: Add cascading delete on both referenced users.lain
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
2020-08-27ChatController: Don't die if the recipient is gone.lain
2020-08-26TimelineController: Keys are atoms now.lain
2020-08-25Merge branch 'feature/1952-read-muted-notifications' into 'develop'feld
2020-08-25Webfinger: Handle bogus ids better.lain
2020-08-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bu...lain
2020-08-25MatrixController: Implement basic `messages` endpoint.lain
2020-08-24Merge branch 'relay-fix-admin-fe' into 'develop'feld
2020-08-24Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-expl...lain
2020-08-24MatrixController: Replace sleeping with waking.lain
2020-08-22MatrixController: Always give information on all roomslain
2020-08-22MatrixController: Keep the transaction id aroundlain
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
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