aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-25Mix: Make rc version explicit.lain
2020-08-25Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0lain
2020-08-25Merge branch 'frontend-bundles-downloads' into 'develop'lain
frontend install mix tasks See merge request pleroma/pleroma!2841
2020-08-25Description: Update description.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-25Merge branch 'docs/update-clients' into 'develop'lain
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE See merge request pleroma/pleroma!2914
2020-08-24clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFEHaelwenn (lanodan) Monnier
2020-08-24Merge branch 'feature/add-preload-to-description' into 'develop'feld
Add Pleroma.Web.Preload to description.exs See merge request pleroma/pleroma!2913
2020-08-24Add Pleroma.Web.Preload to description.exsAngelina Filippova
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-21Merge branch 'feature/2071-actor-type' into 'develop'lain
Adding actor type in user show Closes #2071 See merge request pleroma/pleroma!2910
2020-08-21adding actor type in user showAlexander Strizhakov
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-20.lain
2020-08-19.Lain Soykaf
2020-08-19Merge branch 'features/validators-audio2' into 'develop'lain
Pipeline Ingestion: Audio (Part 2) See merge request pleroma/pleroma!2903
2020-08-19AudioHandlingTest: Make mock explicitlain
2020-08-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/validators-audio2
2020-08-19Merge branch 'fix-arm64' into 'develop'lain
CI: Fix release builds once more. See merge request pleroma/pleroma!2907
2020-08-19CI: Fix release builds once more.lain
2020-08-19Merge branch 'email-tests' into 'develop'lain
Fix for sometimes failing email tests See merge request pleroma/pleroma!2906
2020-08-19fix for sometimes failing testsAlexander Strizhakov
2020-08-19Merge branch 'mix-task-fixes' into 'develop'lain
Fixes for mix tasks See merge request pleroma/pleroma!2905
2020-08-19fixes for mix tasksAlexander Strizhakov
- fix for `mix pleroma.database update_users_following_followers_counts` - raise error, if fetch was unsuccessful in emoji tasks - fix for `pleroma.digest test` task
2020-08-19additional changelog entryAlexander Strizhakov
2020-08-19changelog entryAlexander Strizhakov
2020-08-19relay fix for admin-feAlexander Strizhakov
2020-08-19Pipeline Ingestion: Audio (Part 2)Haelwenn (lanodan) Monnier
2020-08-18Merge branch '2064-image-blanking' into 'develop'Haelwenn
Resolve "Make default image description blank" Closes #2064 See merge request pleroma/pleroma!2899
2020-08-18Merge branch 'improve/freebsd-rc-script' into 'develop'feld
Improve FreeBSD rc script See merge request pleroma/pleroma!2901
2020-08-18Improve FreeBSD rc scriptMark Felder
Passes rclint now, $HOME is dynamic, and properly matches process name for signalling shutdown.
2020-08-18Merge branch 'freebsd-docs' into 'develop'lain
FreeBSD installation process See merge request pleroma/pleroma!2887
2020-08-18Merge branch 'chore/improve-descriptions' into 'develop'lain
Improve description for mediaproxy cache invalidation settings See merge request pleroma/pleroma!2891