Commit Graph

  • 1edbda39e1
    Make password reset pages translatable Tusooa Zhu 2022-02-28 01:04:04 -0500
  • ee05abe052 Merge branch 'revert/notice-routes' into 'develop' HJ 2022-02-26 16:24:49 +0000
  • 17aa3644be
    Copyright bump for 2022 Sean King 2022-02-25 23:11:42 -0700
  • 56197192bb mix: Check .git presence Haelwenn (lanodan) Monnier 2022-02-25 10:31:42 +0100
  • 6ba93c2cb3 Fix test get_user_apps/1 Ilja 2022-02-22 18:56:26 +0100
  • 9f4c5743e8
    Make lint happy Tusooa Zhu 2022-02-21 19:12:32 -0500
  • 2fa1ca84e6
    Extract translatable text Tusooa Zhu 2022-02-21 18:44:36 -0500
  • a867107437
    Make remote follow pages translatable Tusooa Zhu 2022-02-21 18:42:25 -0500
  • 0fd3695b9c
    Prefer userLanguage cookie over Accept-Language header in detecting locale Tusooa Zhu 2022-02-21 17:54:18 -0500
  • d91e9cee04 Merge branch 'unicode-14.0-backend' into 'develop' lain 2022-02-21 19:38:52 +0000
  • 061cb749cd
    Add unicode 14 support and add a test with a unicode 14 emoji Sam Therapy 2022-02-21 12:28:33 -0600
  • 927419d2e7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-02-14 18:25:15 +0100
  • fa8e2ffa3f Merge branch 'max_media_attachments' into 'develop' Alex Gleason 2022-02-06 18:25:14 +0000
  • e473bcf7a0 Max media attachment count marcin mikołajczak 2022-02-06 17:41:15 +0100
  • 60deddb7e5 Merge branch 'fix-tests-warn' into 'develop' Alex Gleason 2022-02-02 19:57:03 +0000
  • 7c044a1841
    FilterControllerTest: tag erratic test Alex Gleason 2022-02-02 13:10:39 -0600
  • d1cc9e4eaf
    Fix tests matching on "warn" Haelwenn (lanodan) Monnier 2022-01-24 19:03:10 +0100
  • 71c80204c9 Merge branch 'roadhouse' into 'develop' Alex Gleason 2022-02-02 18:44:09 +0000
  • bd81af731e
    Tag erratic test Alex Gleason 2022-02-02 12:29:53 -0600
  • 2d77976305
    Add tests for mismatched context in replies Alex Gleason 2022-02-02 12:19:35 -0600
  • 5a4e3aa715
    Test that a Create/Note from Roadhouse validates Alex Gleason 2022-02-02 11:02:23 -0600
  • 61dfeca1cc
    Test that a Note from Roadhouse validates Alex Gleason 2022-02-02 10:38:30 -0600
  • de99fd7804 Merge branch 'birth-dates' into 'develop' Alex Gleason 2022-02-01 15:21:34 +0000
  • f8f2a17754 Birthdays: Fix outgoing federation of birth dates marcin mikołajczak 2022-02-01 11:28:08 +0100
  • 64944c164f Merge branch 'mention-mrf-md' into 'develop' Alex Gleason 2022-01-28 16:53:40 +0000
  • 3bf257171f
    ForceMentionsInContent: improve display of Markdown posts Alex Gleason 2022-01-27 14:15:06 -0600
  • a146f6acab Merge branch 'mentions-mrf-replies-only' into 'develop' Alex Gleason 2022-01-27 19:57:28 +0000
  • 27cb3d6273
    ForceMentionsInContent: don't apply it to top-level posts Alex Gleason 2022-01-26 21:24:26 -0600
  • 2bab9dd175 Merge branch 'fix-bot-policy' into 'develop' Alex Gleason 2022-01-26 23:25:58 +0000
  • a4de79ced0 ForceBotUnlistedPolicy: fix to stop unlisting my posts >:( bot 2022-01-26 22:53:02 +0000
  • 8951be7710 Merge branch 'inline-mention-self' into 'develop' Alex Gleason 2022-01-25 21:49:33 +0000
  • 0604b0dd09
    ForceMentionsInContent: don't mention self Alex Gleason 2022-01-25 12:33:26 -0600
  • 0f4e0e667e Merge branch 'recipients-inline' into 'develop' Alex Gleason 2022-01-25 17:43:39 +0000
  • 99e9c2c668 Merge branch 'birth-dates' into 'develop' Alex Gleason 2022-01-25 16:59:07 +0000
  • 65b4d2ce84
    ForceMentionsInContent: fix order of mentions Alex Gleason 2022-01-25 10:42:34 -0600
  • ab12a05a43 AccountView: Add test for show_birthday marcin mikołajczak 2022-01-25 17:10:40 +0100
  • c1ae35ff2c Fix show_birthday marcin mikołajczak 2022-01-25 17:04:41 +0100
  • dd7977bb68 Merge branch 'birth-dates' into 'develop' Alex Gleason 2022-01-25 15:35:47 +0000
  • 249fe88d12 Birthdays: users_birthday_month_day_index marcin mikołajczak 2022-01-25 10:45:32 +0100
  • 267184b70e
    ForceMentionsInContentTest: return mentions in a not terrible format Alex Gleason 2022-01-24 20:03:43 -0600
  • c5a20c80c4
    ForceMentionsInContent: simplify finding users Alex Gleason 2022-01-24 19:44:44 -0600
  • d5644a52aa
    ForceMentionsInContent: wrap inline mentions with span tag Alex Gleason 2022-01-24 19:11:45 -0600
  • 1bbc701a3a
    ForceMentionsInContent: use `to` instead of `tag` Alex Gleason 2022-01-24 19:11:14 -0600
  • 19d557c870 Merge branch 'revert-6e27fc9c' into 'develop' Alex Gleason 2022-01-24 19:06:33 +0000
  • 53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'" Alex Gleason 2022-01-24 18:54:43 +0000
  • 7b87cac6cc Merge branch 'preserve-mentions-order' into 'develop' Alex Gleason 2022-01-23 15:23:56 +0000
  • 75c4fefb1c Add a test marcin mikołajczak 2022-01-23 12:50:34 +0100
  • 1dba3bc4dc Preserve order of mentioned users marcin mikołajczak 2022-01-23 12:29:01 +0100
  • 61bae9a407 Create index for `show_birthday` marcin mikołajczak 2022-01-23 09:54:24 +0100
  • e3d394eef6 Birthdays: Fix tests, add test for misskey marcin mikołajczak 2022-01-23 09:41:21 +0100
  • 0266bc3c96 Birthdays: hide_birthday -> show_birthday marcin mikołajczak 2022-01-23 08:42:18 +0100
  • aaa9314f4c
    Merge remote-tracking branch 'origin/develop' into birth-dates Alex Gleason 2022-01-22 14:24:50 -0600
  • 9983799ccb Merge branch 'less_erratic_expiration_test' into 'develop' Alex Gleason 2022-01-22 20:09:09 +0000
  • 98ce239ebc
    Update description.exs Alex Gleason 2022-01-22 13:28:00 -0600
  • 66e8c6f90f
    Birthdays: birth_date --> birthday Alex Gleason 2022-01-22 13:21:55 -0600
  • 7a015b1fe2 Make test less erratic by adding five second tolerance NEETzsche 2022-01-22 12:07:54 -0700
  • 263b42a73d Merge branch 'apple_autofill_suggestions' into 'develop' Alex Gleason 2022-01-22 18:38:03 +0000
  • 78c6aeee1b Merge branch 'erratic-filter-test' into 'develop' Alex Gleason 2022-01-22 18:32:34 +0000
  • f5d4ef50b4
    FilterTest: tag erratic test Alex Gleason 2022-01-22 12:13:09 -0600
  • 8328289619 Add autocompelete values suggested by Apple Finn Behrens 2022-01-22 10:00:43 +0100
  • 6ffe43af70 Merge branch 'private-pins' into 'develop' Alex Gleason 2022-01-20 23:18:24 +0000
  • 560bcd58ab Merge branch 'from/develop/tusooa/add-glitch-lily' into 'develop' Alex Gleason 2022-01-20 23:11:35 +0000
  • 00523bdf5e
    Test pinned private statuses in AccountController Alex Gleason 2022-01-20 16:52:43 -0600
  • 53df0c2d81 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-01-20 20:06:02 +0100
  • 88c21b9282 Support private pinned posts from Mastodon marcin mikołajczak 2022-01-20 11:59:15 +0100
  • 9faac1094f
    Add glitch-lily to clients.md Tusooa Zhu 2022-01-19 23:56:57 -0500
  • 787a02c4b1 Merge branch 'feat/force-mentions-mrf' into 'develop' rinpatch 2022-01-20 00:27:29 +0000
  • 74cf0f0355 Update changelog marcin mikołajczak 2022-01-19 19:51:30 +0100
  • a02cfd7f52 Add ForceMentionsInContentPolicy rinpatch 2022-01-19 19:40:50 +0300
  • c180f9276f check if remote bday is valid marcin mikołajczak 2022-01-19 17:19:28 +0100
  • dfb2808535 Birth dates: Add tests marcin mikołajczak 2022-01-18 19:29:21 +0100
  • 397f67fef8 Format code, expose instance configuration related to birth dates marcin mikołajczak 2022-01-18 18:02:01 +0100
  • 70fbd1f09e Merge branch 'document-oauth-tokens' into 'develop' Alex Gleason 2022-01-18 17:18:00 +0000
  • 1dfb67f1e0
    Docs: PleromaAPI oauth_tokens endpoints Alex Gleason 2022-01-18 11:02:23 -0600
  • 69b089c894 Merge branch 'erratic-allow-failure' into 'develop' Alex Gleason 2022-01-18 14:56:26 +0000
  • b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age marcin mikołajczak 2022-01-18 14:57:48 +0100
  • 72d5e29117 Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop' Alex Gleason 2022-01-18 13:18:36 +0000
  • ac434f83c3
    unit-testing-erratic: allow failure Alex Gleason 2022-01-15 13:35:22 -0600
  • ecdc81b37a Merge branch 'linkify-0.5.2' into 'develop' Alex Gleason 2022-01-15 19:13:56 +0000
  • 39c5ebb1f6
    mix format Alex Gleason 2022-01-15 12:55:12 -0600
  • cd8f1aac47
    CHANGELOG: hashtags markdown fix Alex Gleason 2022-01-15 12:36:33 -0600
  • 31148c1857
    FormatterTest: fix nesting in expected output Alex Gleason 2022-01-15 12:31:36 -0600
  • db90c9e3b0
    Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2 Alex Gleason 2022-01-15 12:27:42 -0600
  • d5eb44e8b3
    Upgrade Linkify to v0.5.2 Alex Gleason 2022-01-15 12:27:16 -0600
  • 790081540d Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`. Hakaba Hitoyo 2022-01-15 12:26:33 +0000
  • 71baa713bc Merge branch 'show_blockers_visible' into 'develop' Alex Gleason 2022-01-14 23:08:34 +0000
  • 6284353025 Add blockers_visible to features list when it's enabled NEETzsche 2022-01-14 23:08:33 +0000
  • 8b5a658991 Merge branch 'mergeback' into 'develop' rinpatch 2022-01-14 22:15:10 +0000
  • a4436bcc3f
    Merge remote-tracking branch 'origin/stable' into mergeback Alex Gleason 2022-01-14 12:37:00 -0600
  • 84dcb55b0f Merge branch 'account-endorsements' into 'develop' Alex Gleason 2022-01-13 19:02:21 +0000
  • eedf551eed Add more tests marcin mikołajczak 2022-01-12 21:39:14 +0100
  • 0f90fd5805 WIP account endorsements marcin mikołajczak 2022-01-10 21:35:55 +0100
  • 62a45747d9 Merge branch 'release/2.4.2' into 'stable' rinpatch 2022-01-11 20:47:02 +0000
  • b34f0a6e51 CI: Conservatively update release images so they keep building. Lain Soykaf 2021-11-14 20:37:32 +0100
  • e4cfdfd701 CI: Upload the image for all platforms Lain Soykaf 2021-11-15 21:04:43 +0100
  • a98a127718 Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf rinpatch 2022-01-11 13:49:06 +0300
  • ea204dbca1 mix.lock: sync with mix.exs rinpatch 2022-01-10 20:18:18 +0300
  • f4bc2f5975 Add 2.4.2 changelog entry and bump mix version rinpatch 2022-01-10 19:49:51 +0300
  • cd3175c7fe Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' Alex Gleason 2022-01-10 15:07:09 +0000
  • bf0b32c9aa Merge branch 'pleroma-result-1_13' into 'develop' lain 2021-12-07 16:55:01 +0000