moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,465 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

11465 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier d872858046
Fix removing an account from a list 
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
 2020-09-01 12:49:32 +02:00
lain d48755791d Merge branch 'fix/static-fe-nil-bio-crash' into 'develop' 
User table: ensure bio is always a string

Closes #2067

See merge request pleroma/pleroma!2938
 2020-09-01 09:32:01 +00:00
rinpatch 126461942b User table: ensure bio is always a string 
Gets rid of '|| ""' in multiple places and fixes #2067
 2020-09-01 10:45:42 +03:00
Haelwenn (lanodan) Monnier d9a21e4784
fetcher: Remove fix_object call for Question activities 2020-09-01 08:35:00 +02:00
Haelwenn (lanodan) Monnier b960cede9a
common_fixes: Force inserting context and context_id 2020-09-01 08:35:00 +02:00
Haelwenn (lanodan) Monnier a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question 2020-09-01 08:34:57 +02:00
Haelwenn (lanodan) Monnier 2ecc7d9230
transmogrifier: Remove mastodon emoji-format from emoji field 2020-09-01 08:29:53 +02:00
rinpatch dc3a418c27 application.ex: disable warnings_as_errors at runtime 
see changed files for rationale
 2020-09-01 09:08:54 +03:00
Haelwenn 9d63b2c9db Merge branch 'chat-relation-constraints' into 'develop' 
Chats: Add cascading delete on both referenced users.

See merge request pleroma/pleroma!2934
 2020-08-31 20:55:05 +00:00
lain 0b621a834a Chats: Add cascading delete on both referenced users. 
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
 2020-08-31 16:48:17 +02:00
lain e0eb90f62a Merge branch 'issue/2068' into 'develop' 
[#2068] marks notifications as read after mute

Closes #2068

See merge request pleroma/pleroma!2930
 2020-08-31 09:21:02 +00:00
lain d91c4feebe Notification: Small refactor. 2020-08-31 11:02:54 +02:00
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
feld 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
feld 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