Commit Graph

  • 6a244cd851
    config descriptions v2 endpoint with tabs field Alexander Strizhakov 2021-03-03 08:48:02 +03:00
  • a4487de27e
    added tabs setting to the description.exs Alexander Strizhakov 2021-03-02 19:45:32 +03:00
  • 19f8ad8e1d
    adding tab & tab_label fields to the descriptions Alexander Strizhakov 2021-02-26 12:00:41 +03:00
  • 2538c741c0
    config versioning feature/config-versioning Alexander Strizhakov 2020-07-16 19:57:27 +03:00
  • 5be9d13981
    a better query to delete from hashtags faried nawaz 2021-04-21 03:52:32 +05:00
  • a0c9a2b4cc
    mix prune_objects: remove unused hashtags after pruning remote objects faried nawaz 2021-04-21 02:38:59 +05:00
  • 22b2451edd
    migration: add on_delete: :delete_all to hashtags object_id fk faried nawaz 2021-04-21 02:37:03 +05:00
  • cea44b6b3e
    Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak Alex Gleason 2021-05-07 12:40:45 -05:00
  • b15c4629ff
    CHANGELOG: notice routes Alex Gleason 2021-05-05 14:36:27 -05:00
  • 1a45aa1278
    Merge remote-tracking branch 'pleroma/develop' into notice-routes Alex Gleason 2021-05-05 14:50:54 -05:00
  • 50e3750758
    Add notice compatibility routes for other frontends Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785 Alex Gleason 2021-05-05 13:58:50 -05:00
  • 35779b5540
    CHANGELOG: rich media Alex Gleason 2021-05-04 19:51:07 -05:00
  • d4e1cecb99
    Merge remote-tracking branch 'pleroma/develop' into rich-media-redux Alex Gleason 2021-05-05 12:43:31 -05:00
  • 9fbea2df6e
    Fall back to OEmbed "url" for Photo types Alex Gleason 2021-05-05 12:37:52 -05:00
  • 0ebf3b3afd
    Add rich type back but sanitize HTML better Alex Gleason 2021-05-04 19:06:30 -05:00
  • d2260bde45
    Reject "rich" type embeds for now Alex Gleason 2021-05-04 18:53:22 -05:00
  • 8b9ff5dab2
    Sanitize rich media HTML Alex Gleason 2021-05-04 18:29:25 -05:00
  • 3a4ad366d5
    Fix existing tests Alex Gleason 2021-05-04 18:21:43 -05:00
  • 0afa091e6c
    Fix MastodonAPI.StatusViewTest Alex Gleason 2021-05-04 17:46:42 -05:00
  • e1996d7b96
    Fix RichMedia.HelpersTest Alex Gleason 2021-05-04 17:18:20 -05:00
  • 359c1d9f1f
    Fix ParserTest Alex Gleason 2021-05-04 17:13:28 -05:00
  • 6b2fa5f0bb
    Let :oembed_providers_enabled be configurable Alex Gleason 2021-05-04 16:24:10 -05:00
  • 8e2ff7669a
    Add Parser.CardTest Alex Gleason 2021-05-04 16:16:42 -05:00
  • 95196fb5ac
    Handle invalid cards Alex Gleason 2021-05-04 15:54:24 -05:00
  • ebeb9c6bc9
    Refactor rich media parser to store %Embed{} instead of %Card{} Alex Gleason 2021-05-04 15:42:24 -05:00
  • 8c4599c1dd
    Fix TwitterCard tests Alex Gleason 2021-05-04 14:15:41 -05:00
  • 63af654688
    Update TwitterCard tests and add Parser.MetaTags Alex Gleason 2021-05-04 13:31:02 -05:00
  • 9411f90398 Remove unused suggestions Angelina Filippova 2021-05-04 19:08:05 +03:00
  • b045dc6058
    Make OEmbed discovery work Alex Gleason 2021-05-04 11:06:10 -05:00
  • 70dd284865 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-05-04 10:41:07 -05:00
  • 745375bdcf Merge branch 'dont-crash-email-settings' into 'develop' feld 2021-05-04 13:30:00 +00:00
  • d5263bfcf3 Merge branch 'earmark' into 'develop' feld 2021-05-04 13:29:14 +00:00
  • 765bdfca7d
    Get basic embed working Alex Gleason 2021-05-04 02:23:22 -05:00
  • 90770e0841
    CHANGELOG: don't crash so hard when email settings are invalid Alex Gleason 2021-05-03 14:30:21 -05:00
  • c186b059a7
    Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings Alex Gleason 2021-05-03 14:43:28 -05:00
  • 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 Alex Gleason 2021-05-03 14:27:03 -05:00
  • 921d874187 Update :rate_limit types, add placeholders Angelina Filippova 2021-05-02 16:06:14 +03:00
  • dca87c5e7b
    CHANGELOG: markdown earmark Alex Gleason 2021-05-01 11:28:06 -05:00
  • 20878c7f99
    CHANGELOG: SimplePolicy embedded objects are now checked Alex Gleason 2021-04-02 12:18:35 -05:00
  • 926a233cc4
    Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak Alex Gleason 2021-04-30 14:21:17 -05:00
  • c16c7fdb87
    SimplePolicy: filter string Objects Alex Gleason 2021-04-29 11:51:49 -05:00
  • 3d742c3c1a
    SimplePolicy: filter nested objects Alex Gleason 2021-03-18 15:31:50 -05:00
  • 52fc59f125
    Merge remote-tracking branch 'upstream/develop' into earmark Alex Gleason 2021-04-30 13:17:03 -05:00
  • a8fa00ef66
    Fix failing remote mentions test, valid TLDs Alex Gleason 2021-04-30 12:55:43 -05:00
  • 53760d2cda
    Delete obsolete EarmarkRendereTests (moved to UtilsTest) Alex Gleason 2021-04-30 12:51:18 -05:00
  • 6727a3659f
    Remove Pleroma.Formatter.minify/2 Alex Gleason 2021-04-30 12:27:06 -05:00
  • 004bcedb07
    Upgrade Earmark 1.4.15 Alex Gleason 2021-04-30 12:23:11 -05:00
  • eac0b77536 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-04-30 09:56:28 -05:00
  • 377f84f367 Merge branch 'oauth-token-id' into 'develop' feld 2021-04-29 19:13:50 +00:00
  • 6bc8ab225d
    Merge remote-tracking branch 'upstream/develop' into oauth-token-id Alex Gleason 2021-04-29 14:06:12 -05:00
  • 2fe3bd8178 Merge branch 'maybe-fix-ci' into 'develop' feld 2021-04-29 18:56:28 +00:00
  • b5ae826898
    CI: Purge pleroma build directory between runs Alex Gleason 2021-04-29 13:03:41 -05:00
  • 8c1d6e8839
    CHANGELOG: Return OAuth token id Alex Gleason 2021-04-29 12:20:46 -05:00
  • e7ac15905e
    Merge remote-tracking branch 'upstream/develop' into oauth-token-id Alex Gleason 2021-04-29 12:19:10 -05:00
  • 762be6ce10
    Merge remote-tracking branch 'upstream/develop' into block-behavior Alex Gleason 2021-04-29 11:14:32 -05:00
  • 115673bce7 Merge branch 'gitlab-ci-mix-lock' into 'develop' Haelwenn 2021-04-28 04:53:25 +00:00
  • f0a3bafe84 Revert "Cache gitlab-ci based on mix.lock" test/buildperf Mark Felder 2021-04-27 16:24:48 -05:00
  • ebf24734f6 Senseless commit 2 Mark Felder 2021-04-27 16:21:38 -05:00
  • b480360ae5 Useless test commit that forces rebuild of 245 files Mark Felder 2021-04-27 16:14:25 -05:00
  • 6e7e8d2f2f Cache gitlab-ci based on mix.lock Alex Gleason 2021-04-27 11:54:28 -05:00
  • b9a99ac0d4
    Cache gitlab-ci based on mix.lock Alex Gleason 2021-04-27 11:54:28 -05:00
  • 515a5e2bba Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-04-24 09:56:45 -05:00
  • d9e782c180 Merge branch 'fix/delete_activities_timeout' into 'develop' Haelwenn 2021-04-23 02:14:11 +00:00
  • d7a71a275a Fixed pleroma.user delete_activities mix task. Mark Felder 2021-04-22 10:15:05 -05:00
  • 959dc6e6fc Cleanup and ensure we obey custom Repo timeout Mark Felder 2021-04-22 10:11:08 -05:00
  • 99fd9c5e38 OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval Mark Felder 2021-04-20 12:00:02 -05:00
  • 9f711ddcf8 Try to set query timeout intelligently Mark Felder 2021-04-20 11:16:24 -05:00
  • 9bc69196d5 Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task Mark Felder 2021-04-20 11:10:39 -05:00
  • 0effcd2cfe Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task. Mark Felder 2021-04-19 15:43:17 -05:00
  • 69f8f9446e
    batch mention email notifications in timeframe feature/2295-email-mention-notification Alexander Strizhakov 2020-11-29 14:45:16 +03:00
  • f9bedf5597 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:08:31 +00:00
  • 42185d8750 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:45 +00:00
  • e104829c2f Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:39 +00:00
  • 30b1d50938 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:32 +00:00
  • b050adb5e2 Merge branch 'fix/docs' into 'develop' feld 2021-04-20 18:02:48 +00:00
  • 7eded72189 Fix incorrect shell command Mark Felder 2021-04-20 12:31:14 -05:00
  • 8defbe431e Merge branch 'feature/opt-out-of-google-floc' into 'develop' feld 2021-04-19 22:39:52 +00:00
  • 2780cdd4e7
    Add CHANGELOG entry Sean King 2021-04-19 16:06:19 -06:00
  • d1eb1913e8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc Sean King 2021-04-19 15:42:38 -06:00
  • 7183655a07 Merge branch 'fix/tests' into 'develop' feld 2021-04-19 21:34:38 +00:00
  • efed94a23e Fix error response which was breaking tests related to pinned posts Mark Felder 2021-04-19 16:23:57 -05:00
  • 2b4f958b2a
    Add opting out of Google FLoC to HTTPSecurityPlug headers Sean King 2021-04-18 14:00:18 -06:00
  • 5f440fd839 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-04-16 21:20:13 -05:00
  • 2de41770d0
    Remove Twemoji stuff from MastoFE Sean King 2021-04-16 18:02:08 -06:00
  • 0f8da39b72
    Remove priv/static/sounds folder Sean King 2021-04-16 15:56:00 -06:00
  • a787fed8f7
    Move changelog around Sean King 2021-04-16 15:50:17 -06:00
  • c6dcd863e2 Apply rinpatch's suggestion(s) to 1 file(s) rinpatch 2021-04-16 09:59:50 +00:00
  • 15f87cf658 Merge branch 'features/ingestion-ecto-tag' into 'develop' rinpatch 2021-04-16 09:55:55 +00:00
  • 79376b4afb Merge branch 'feature/521-pinned-post-federation' into 'develop' rinpatch 2021-04-16 09:53:47 +00:00
  • 0ababdc068 Merge branch 'fix/2593-reading-exported-config-file' into 'develop' rinpatch 2021-04-16 09:50:26 +00:00
  • fa2e62078c
    Remove MastoFE configuration stuff Sean King 2021-04-15 23:51:04 -06:00
  • 08694599ae
    Remove bash script for downloading new MastoFE build Sean King 2021-04-15 23:41:34 -06:00
  • bf9c4f5289
    Add note about Mastodon FE being removed from Pleroma in changelog Sean King 2021-04-15 23:39:33 -06:00
  • f3b403fa98
    Remove MastoFE stuff from docs and default panel Sean King 2021-04-15 23:37:18 -06:00
  • ca79aab0bf
    Remove MastoFE settings from users table Sean King 2021-04-15 23:33:24 -06:00
  • 8afa3f2d1b
    Remove no longer necessary unit tests for MastoFE Sean King 2021-04-15 23:12:42 -06:00
  • 4f55d5123b
    Remove MastoFE-related backend code and frontend pieces Sean King 2021-04-15 22:56:21 -06:00
  • 152cb3074e Merge branch 'fix/notifsettings-breaking-login' into 'develop' Haelwenn 2021-04-15 21:34:55 +00:00
  • 0a7c2a32ba Merge branch 'develop' into 'fix/notifsettings-breaking-login' feld 2021-04-15 14:59:26 +00:00
  • 0ba8efc950 Merge branch 'fix/mastodon-interface-docs-link' into 'develop' Haelwenn 2021-04-15 05:44:01 +00:00