rinpatch
|
0417b2f649
|
Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
|
2020-08-31 07:22:35 +00:00 |
|
rinpatch
|
858e9a59ed
|
mix.lock: bump fast_sanitize
The update brings a better error message for when cmake isn't installed
|
2020-08-31 09:54:16 +03:00 |
|
Maksim Pechnikov
|
f0fefc4f5c
|
marks notifications as read after mute
|
2020-08-28 18:17:44 +03:00 |
|
lain
|
51844b1e42
|
Merge branch 'stable-sync/2.1.0' into 'develop'
Merge stable in develop and bump development version
Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866
See merge request pleroma/pleroma!2928
|
2020-08-28 14:40:26 +00:00 |
|
lain
|
b41c8cff18
|
Merge branch 'mention-sudo-pleroma-when-updating' into 'develop'
Add mention of sudo -Hu pleroma to update docs
See merge request pleroma/pleroma!2929
|
2020-08-28 14:12:23 +00:00 |
|
Shpuld Shpludson
|
35da3be9dd
|
Add mention of sudo -Hu pleroma to docs
|
2020-08-28 13:50:21 +00:00 |
|
rinpatch
|
ce387ce730
|
mix.exs: bump development version after 2.1.0 release
|
2020-08-28 16:15:57 +03:00 |
|
lain
|
73dd5bdb7d
|
Merge branch 'release/2.1.0' into 'stable'
Release/2.1.0
See merge request pleroma/pleroma!2927
|
2020-08-28 12:17:19 +00:00 |
|
lain
|
b141e35d64
|
Mix: Update version
|
2020-08-28 11:34:48 +02:00 |
|
lain
|
4e022fc16c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-28 11:33:11 +02:00 |
|
Haelwenn
|
6b01a09a08
|
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
|
2020-08-27 17:05:53 +00:00 |
|
lain
|
82bf27172c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-27 15:38:03 +02:00 |
|
lain
|
1c05819c9b
|
Merge branch '2081-deleted-user-chats' into 'develop'
ChatController: Don't die if the recipient is gone.
Closes #2081
See merge request pleroma/pleroma!2926
|
2020-08-27 11:18:42 +00:00 |
|
lain
|
78939c1d16
|
ChatController: Don't die if the recipient is gone.
|
2020-08-27 12:13:18 +02:00 |
|
rinpatch
|
22050f9ec0
|
Merge branch 'update/admin-fe-20200826' into 'develop'
Update AdminFE build in preparation for 2.1.0 release
See merge request pleroma/pleroma!2925
|
2020-08-27 04:11:34 +00:00 |
|
Mark Felder
|
f1b9e3595d
|
Update AdminFE build in preparation for 2.1.0 release
|
2020-08-26 15:43:34 -05:00 |
|
lain
|
5dba3a50fc
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-26 15:58:49 +02:00 |
|
rinpatch
|
6f17aea066
|
Merge branch 'fix/fast_html-build-errors' into 'develop'
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
See merge request pleroma/pleroma!2922
|
2020-08-26 13:49:52 +00:00 |
|
lain
|
5ffd20f3b5
|
Changelog: Add info about list fixes.
|
2020-08-26 15:40:00 +02:00 |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
2020-08-26 15:37:30 +02:00 |
|
rinpatch
|
6da17f88d6
|
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
|
2020-08-26 16:31:02 +03:00 |
|
rinpatch
|
6ef9db0557
|
Merge branch '2079-welcome-message-docs' into 'develop'
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
|
2020-08-26 13:11:17 +00:00 |
|
lain
|
b76839e008
|
Cheatsheet: Remove misleading example
|
2020-08-26 13:53:16 +02:00 |
|
lain
|
fc42446755
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-26 13:17:39 +02:00 |
|
lain
|
7975351550
|
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
release MR template: add a note about merging stable changes back to develop
See merge request pleroma/pleroma!2920
|
2020-08-26 05:50:41 +00:00 |
|
rinpatch
|
dcd06488e0
|
release MR template: add a note about merging stable changes back to
develop
|
2020-08-26 07:09:28 +03:00 |
|
Haelwenn
|
fd04137e18
|
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2
Closes pleroma-docker-compose#2
See merge request pleroma/pleroma!2789
|
2020-08-25 22:27:19 +00:00 |
|
|
|
fb33321fa2
|
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
|
2020-08-25 21:32:32 +00:00 |
|
Haelwenn
|
976094cd7b
|
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
Webfinger: Handle bogus ids better.
Closes #2077
See merge request pleroma/pleroma!2919
|
2020-08-25 20:01:43 +00:00 |
|
lain
|
112bec5225
|
Webfinger: Handle bogus ids better.
|
2020-08-25 17:35:59 +02:00 |
|
lain
|
49a436ad3e
|
Mix: Make rc version explicit.
|
2020-08-25 16:07:07 +02:00 |
|
lain
|
ea2b5c07e3
|
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-25 15:38:12 +02:00 |
|
lain
|
361aa22e28
|
Merge branch 'frontend-bundles-downloads' into 'develop'
frontend install mix tasks
See merge request pleroma/pleroma!2841
|
2020-08-25 10:34:09 +00:00 |
|
lain
|
6d6e43fd09
|
Description: Update description.
|
2020-08-25 11:49:44 +02:00 |
|
lain
|
c1d51944c7
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
|
2020-08-25 11:44:51 +02:00 |
|
lain
|
5722b0e2e5
|
Merge branch 'docs/update-clients' into 'develop'
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
See merge request pleroma/pleroma!2914
|
2020-08-25 07:41:25 +00:00 |
|
Haelwenn (lanodan) Monnier
|
16f777a7b2
|
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
|
2020-08-24 23:14:07 +02:00 |
|
|
|
3d5940da3e
|
Merge branch 'feature/add-preload-to-description' into 'develop'
Add Pleroma.Web.Preload to description.exs
See merge request pleroma/pleroma!2913
|
2020-08-24 20:41:33 +00:00 |
|
Angelina Filippova
|
6e5678b5af
|
Add Pleroma.Web.Preload to description.exs
|
2020-08-24 22:43:37 +03:00 |
|
|
|
d39abd02ac
|
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
|
2020-08-24 17:03:18 +00:00 |
|
lain
|
e1c8c599ff
|
Merge branch 'features/validators-event' into 'develop'
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
|
2020-08-21 16:10:30 +00:00 |
|
lain
|
02db6c596e
|
Merge branch 'feature/2071-actor-type' into 'develop'
Adding actor type in user show
Closes #2071
See merge request pleroma/pleroma!2910
|
2020-08-21 08:36:56 +00:00 |
|
Alexander Strizhakov
|
1f8c32b773
|
adding actor type in user show
|
2020-08-21 10:38:56 +03:00 |
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
2020-08-20 21:49:26 +02:00 |
|
lain
|
5c2b6922e1
|
Merge branch 'features/validators-audio2' into 'develop'
Pipeline Ingestion: Audio (Part 2)
See merge request pleroma/pleroma!2903
|
2020-08-19 12:59:41 +00:00 |
|
lain
|
c1277be041
|
AudioHandlingTest: Make mock explicit
|
2020-08-19 14:36:42 +02:00 |
|
lain
|
9aae342e7a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
|
2020-08-19 14:10:11 +02:00 |
|
lain
|
5054a6aa9a
|
Merge branch 'fix-arm64' into 'develop'
CI: Fix release builds once more.
See merge request pleroma/pleroma!2907
|
2020-08-19 11:41:00 +00:00 |
|
lain
|
d833d2c1fd
|
CI: Fix release builds once more.
|
2020-08-19 13:37:33 +02:00 |
|
lain
|
4681771af4
|
Merge branch 'email-tests' into 'develop'
Fix for sometimes failing email tests
See merge request pleroma/pleroma!2906
|
2020-08-19 10:56:07 +00:00 |
|
