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

13395 Commits

Author SHA1 Message Date
feld 745375bdcf Merge branch 'dont-crash-email-settings' into 'develop' 
Don't crash so hard when email settings are invalid

Closes #2606

See merge request pleroma/pleroma!3400
 2021-05-04 13:30:00 +00:00
feld d5263bfcf3 Merge branch 'earmark' into 'develop' 
Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076
 2021-05-04 13:29:14 +00:00
Alex Gleason 90770e0841
CHANGELOG: don't crash so hard when email settings are invalid 2021-05-03 14:43:34 -05:00
Alex Gleason c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings 2021-05-03 14:43:28 -05:00
Alex Gleason c80b1aaf51
Don't crash when email settings are invalid 
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
 2021-05-03 14:43:14 -05:00
Alex Gleason dca87c5e7b
CHANGELOG: markdown 2021-05-01 11:28:06 -05:00
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
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
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
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
feld 1bf2b645c5 Merge branch 'fix/adminapi-concurrent-limiter' into 'develop' 
Fix ConcurrentLimiter settings via AdminAPI

See merge request pleroma/pleroma!3390
 2021-04-14 16:52:02 +00:00
Mark Felder f95b52255b Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test 2021-04-14 09:39:57 -05:00
Mark Felder c3b8c77967 Improve string_to_elixir_types/1 with guards 2021-04-13 14:39:57 -05:00
Mark Felder 861f192852 Document fixed ability to save ConcurrentLimiter settings in ConfigDB 2021-04-13 14:39:44 -05:00
Mark Felder ee53ad4d77 Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1 2021-04-13 14:39:31 -05:00
Mark Felder 905efc57e9 Initial test validating the AdminAPI issue 2021-04-13 14:39:28 -05:00
Haelwenn d2a03d3c86 Merge branch 'fix/instance-thumbnail-url' into 'develop' 
Fix URL to custom instance thumbnail

Closes #2611

See merge request pleroma/pleroma!3388
 2021-04-13 19:05:07 +00:00
Mark Felder cdd271b065 Fix assignment / assertion 2021-04-13 10:55:54 -05:00
Mark Felder 9fbcdc15b1 Validate custom instance thumbnail set via AdminAPI produces correct URL 2021-04-13 10:52:53 -05:00