Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Alex Gleason
|
a8fa00ef66
|
Fix failing remote mentions test, valid TLDs
|
2021-04-30 12:55:43 -05:00 |
|
Alex Gleason
|
53760d2cda
|
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
|
2021-04-30 12:51:18 -05:00 |
|
Alex Gleason
|
6727a3659f
|
Remove Pleroma.Formatter.minify/2
|
2021-04-30 12:27:06 -05:00 |
|
Alex Gleason
|
004bcedb07
|
Upgrade Earmark 1.4.15
|
2021-04-30 12:23:11 -05:00 |
|
feld
|
377f84f367
|
Merge branch 'oauth-token-id' into 'develop'
Return token's primary key with POST /oauth/token
See merge request pleroma/pleroma!3380
|
2021-04-29 19:13:50 +00:00 |
|
Alex Gleason
|
6bc8ab225d
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
2021-04-29 14:06:12 -05:00 |
|
feld
|
2fe3bd8178
|
Merge branch 'maybe-fix-ci' into 'develop'
CI: Purge pleroma build directory between runs
See merge request pleroma/pleroma!3399
|
2021-04-29 18:56:28 +00:00 |
|
Alex Gleason
|
b5ae826898
|
CI: Purge pleroma build directory between runs
|
2021-04-29 13:15:48 -05:00 |
|
Alex Gleason
|
8c1d6e8839
|
CHANGELOG: Return OAuth token id
|
2021-04-29 12:20:46 -05:00 |
|
Alex Gleason
|
e7ac15905e
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
2021-04-29 12:19:10 -05:00 |
|
Haelwenn
|
115673bce7
|
Merge branch 'gitlab-ci-mix-lock' into 'develop'
Cache GitLab CI based on mix.lock
See merge request pleroma/pleroma!3398
|
2021-04-28 04:53:25 +00:00 |
|
Alex Gleason
|
b9a99ac0d4
|
Cache gitlab-ci based on mix.lock
|
2021-04-27 11:54:28 -05:00 |
|
Haelwenn
|
d9e782c180
|
Merge branch 'fix/delete_activities_timeout' into 'develop'
Fix pleroma.user delete_activities mix task
See merge request pleroma/pleroma!3394
|
2021-04-23 02:14:11 +00:00 |
|
Mark Felder
|
d7a71a275a
|
Fixed pleroma.user delete_activities mix task.
|
2021-04-22 10:15:50 -05:00 |
|
Mark Felder
|
959dc6e6fc
|
Cleanup and ensure we obey custom Repo timeout
|
2021-04-22 10:15:50 -05:00 |
|
Mark Felder
|
99fd9c5e38
|
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
|
2021-04-22 10:15:50 -05:00 |
|
Mark Felder
|
9f711ddcf8
|
Try to set query timeout intelligently
|
2021-04-22 10:15:50 -05:00 |
|
Mark Felder
|
9bc69196d5
|
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
|
2021-04-22 10:15:50 -05:00 |
|
Mark Felder
|
0effcd2cfe
|
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
|
2021-04-22 10:15:50 -05:00 |
|
Haelwenn
|
f9bedf5597
|
Apply lanodan's suggestion(s) to 1 file(s)
|
2021-04-20 21:08:31 +00:00 |
|
Haelwenn
|
42185d8750
|
Apply lanodan's suggestion(s) to 1 file(s)
|
2021-04-20 21:06:45 +00:00 |
|
Haelwenn
|
e104829c2f
|
Apply lanodan's suggestion(s) to 1 file(s)
|
2021-04-20 21:06:39 +00:00 |
|
Haelwenn
|
30b1d50938
|
Apply lanodan's suggestion(s) to 1 file(s)
|
2021-04-20 21:06:32 +00:00 |
|
feld
|
b050adb5e2
|
Merge branch 'fix/docs' into 'develop'
Docs: Fix incorrect shell command
See merge request pleroma/pleroma!3396
|
2021-04-20 18:02:48 +00:00 |
|
Mark Felder
|
7eded72189
|
Fix incorrect shell command
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
|
2021-04-20 12:31:14 -05:00 |
|
feld
|
8defbe431e
|
Merge branch 'feature/opt-out-of-google-floc' into 'develop'
Add opting out of Google FLoC to HTTPSecurityPlug headers
Closes #2630
See merge request pleroma/pleroma!3393
|
2021-04-19 22:39:52 +00:00 |
|
Sean King
|
2780cdd4e7
|
Add CHANGELOG entry
|
2021-04-19 16:06:19 -06:00 |
|
Sean King
|
d1eb1913e8
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
|
2021-04-19 15:42:38 -06:00 |
|
feld
|
7183655a07
|
Merge branch 'fix/tests' into 'develop'
Fix tests broken since !3312
See merge request pleroma/pleroma!3395
|
2021-04-19 21:34:38 +00:00 |
|
Mark Felder
|
efed94a23e
|
Fix error response which was breaking tests related to pinned posts
|
2021-04-19 16:23:57 -05:00 |
|
Sean King
|
2b4f958b2a
|
Add opting out of Google FLoC to HTTPSecurityPlug headers
|
2021-04-18 14:00:18 -06:00 |
|
Sean King
|
2de41770d0
|
Remove Twemoji stuff from MastoFE
|
2021-04-16 18:02:08 -06:00 |
|
Sean King
|
0f8da39b72
|
Remove priv/static/sounds folder
|
2021-04-16 15:56:00 -06:00 |
|
Sean King
|
a787fed8f7
|
Move changelog around
|
2021-04-16 15:50:17 -06:00 |
|
rinpatch
|
c6dcd863e2
|
Apply rinpatch's suggestion(s) to 1 file(s)
|
2021-04-16 09:59:50 +00:00 |
|
rinpatch
|
15f87cf658
|
Merge branch 'features/ingestion-ecto-tag' into 'develop'
TagValidator: New
See merge request pleroma/pleroma!3244
|
2021-04-16 09:55:55 +00:00 |
|
rinpatch
|
79376b4afb
|
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
|
2021-04-16 09:53:47 +00:00 |
|
rinpatch
|
0ababdc068
|
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
|
2021-04-16 09:50:26 +00:00 |
|
Sean King
|
fa2e62078c
|
Remove MastoFE configuration stuff
|
2021-04-15 23:51:04 -06:00 |
|
Sean King
|
08694599ae
|
Remove bash script for downloading new MastoFE build
|
2021-04-15 23:41:34 -06:00 |
|
Sean King
|
bf9c4f5289
|
Add note about Mastodon FE being removed from Pleroma in changelog
|
2021-04-15 23:39:33 -06:00 |
|
Sean King
|
f3b403fa98
|
Remove MastoFE stuff from docs and default panel
|
2021-04-15 23:37:18 -06:00 |
|
Sean King
|
ca79aab0bf
|
Remove MastoFE settings from users table
|
2021-04-15 23:33:24 -06:00 |
|
Sean King
|
8afa3f2d1b
|
Remove no longer necessary unit tests for MastoFE
|
2021-04-15 23:12:42 -06:00 |
|
Sean King
|
4f55d5123b
|
Remove MastoFE-related backend code and frontend pieces
|
2021-04-15 22:56:21 -06:00 |
|
Haelwenn
|
152cb3074e
|
Merge branch 'fix/notifsettings-breaking-login' into 'develop'
Enforce user.notification_settings is NOT NULL
Closes #2571
See merge request pleroma/pleroma!3386
|
2021-04-15 21:34:55 +00:00 |
|
feld
|
0a7c2a32ba
|
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
# Conflicts:
# CHANGELOG.md
|
2021-04-15 14:59:26 +00:00 |
|
Haelwenn
|
0ba8efc950
|
Merge branch 'fix/mastodon-interface-docs-link' into 'develop'
Fix Mastodon interface link in documentation, fixes #2622
Closes #2622
See merge request pleroma/pleroma!3391
|
2021-04-15 05:44:01 +00:00 |
|
Sean King
|
d9fce0133e
|
Fix Mastodon interface link
|
2021-04-14 14:01:33 -06:00 |
|