phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 454307112c
         Add clippy Alex Gleason 2022-01-22 16:01:15 -06:00
  • c368078cd0
         ChangeObjectIdToFlake: lock tables Alex Gleason 2022-01-22 15:58:40 -06:00
  • acfded5ae8
         MRF reasons: normalize config for backwards compatibility mrf-tuples-fix Alex Gleason 2022-01-22 15:53:08 -06:00
  • e72fd4ceb6
         SimplePolicy reasons: handle legacy config Alex Gleason 2022-01-22 14:32:55 -06:00
  • aaa9314f4c
         Merge remote-tracking branch 'origin/develop' into birth-dates Alex Gleason 2022-01-22 14:24:50 -06:00
  • 9983799ccb Merge branch 'less_erratic_expiration_test' into 'develop' Alex Gleason 2022-01-22 20:09:09 +00:00
  • 98ce239ebc
         Update description.exs birth-dates Alex Gleason 2022-01-22 13:28:00 -06:00
  • 66e8c6f90f
         Birthdays: birth_date --> birthday Alex Gleason 2022-01-22 13:21:55 -06:00
  • 72eb825987 Merge branch 'less_erratic_expiration_test' into 'develop' NEETzsche 2022-01-22 19:09:59 +00:00
  • 7a015b1fe2 Make test less erratic by adding five second tolerance NEETzsche 2022-01-22 12:07:54 -07:00
  • 263b42a73d Merge branch 'apple_autofill_suggestions' into 'develop' Alex Gleason 2022-01-22 18:38:03 +00:00
  • 388765858e Merge branch 'apple_autofill_suggestions' into 'develop' kloenk 2022-01-22 18:33:05 +00:00
  • 78c6aeee1b Merge branch 'erratic-filter-test' into 'develop' Alex Gleason 2022-01-22 18:32:34 +00:00
  • 59633e1772 Merge branch 'erratic-filter-test' into 'develop' Alex Gleason 2022-01-22 18:14:17 +00:00
  • f5d4ef50b4
         FilterTest: tag erratic test Alex Gleason 2022-01-22 12:13:09 -06:00
  • 8328289619 Add autocompelete values suggested by Apple Finn Behrens 2022-01-22 10:00:43 +01:00
  • 7b56690af4 add nixos to supported distros Finn Behrens 2022-01-10 23:06:42 +01:00
  • 6ffe43af70 Merge branch 'private-pins' into 'develop' Alex Gleason 2022-01-20 23:18:24 +00:00
  • 4fbdca338f Merge branch 'private-pins' into 'develop' marcin mikołajczak 2022-01-20 23:18:22 +00:00
  • 560bcd58ab Merge branch 'from/develop/tusooa/add-glitch-lily' into 'develop' Alex Gleason 2022-01-20 23:11:35 +00:00
  • 00523bdf5e
         Test pinned private statuses in AccountController Alex Gleason 2022-01-20 16:52:43 -06:00
  • 88c21b9282 Support private pinned posts from Mastodon marcin mikołajczak 2022-01-20 11:59:15 +01:00
  • 06a432ffd3 Merge branch 'from/develop/tusooa/add-glitch-lily' into 'develop' Tusooa Zhu 2022-01-20 04:58:34 +00:00
  • 9faac1094f
         Add glitch-lily to clients.md Tusooa Zhu 2022-01-19 23:56:57 -05:00
  • 86fef53695 Merge branch 'bookwyrm-entities' into 'develop' Sadposter 2022-01-20 01:19:22 +00:00
  • 787a02c4b1 Merge branch 'feat/force-mentions-mrf' into 'develop' rinpatch 2022-01-20 00:27:29 +00:00
  • 74cf0f0355 Update changelog marcin mikołajczak 2022-01-19 19:51:30 +01:00
  • 65f55d047f Merge branch 'feat/force-mentions-mrf' into 'develop' rinpatch 2022-01-19 18:07:17 +00:00
  • a02cfd7f52 Add ForceMentionsInContentPolicy rinpatch 2022-01-19 19:40:50 +03:00
  • c180f9276f check if remote bday is valid marcin mikołajczak 2022-01-19 17:19:28 +01:00
  • 3ee1f18653 Merge branch 'contrib/munin-healthcheck' into 'develop' Haelwenn 2022-01-19 11:23:54 +00:00
  • dfb2808535 Birth dates: Add tests marcin mikołajczak 2022-01-18 19:29:21 +01:00
  • 397f67fef8 Format code, expose instance configuration related to birth dates marcin mikołajczak 2022-01-18 18:02:01 +01:00
  • 70fbd1f09e Merge branch 'document-oauth-tokens' into 'develop' Alex Gleason 2022-01-18 17:18:00 +00:00
  • 743ed7fce4 Merge branch 'document-oauth-tokens' into 'develop' Alex Gleason 2022-01-18 17:03:19 +00:00
  • 1dfb67f1e0
         Docs: PleromaAPI oauth_tokens endpoints Alex Gleason 2022-01-18 11:02:23 -06:00
  • 69b089c894 Merge branch 'erratic-allow-failure' into 'develop' Alex Gleason 2022-01-18 14:56:26 +00:00
  • e78bc5fac4 Merge branch 'erratic-allow-failure' into 'develop' Alex Gleason 2022-01-18 14:56:12 +00:00
  • b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age marcin mikołajczak 2022-01-18 14:57:48 +01:00
  • 72d5e29117 Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop' Alex Gleason 2022-01-18 13:18:36 +00:00
  • a126a89358 [#2771] Made 20211218181632_change_object_id_to_flake migration automatically handle database integrity error caused by duplicate AP ID records in objects. NOTE: the reason of duplicate records with existing and valid objects_unique_apid_index unique index is not determined. See https://git.pleroma.social/pleroma/pleroma/-/issues/2771, https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3571#note_88780. Ivan Tashkinov 2022-01-16 22:41:48 +03:00
  • 1fc4885d85 Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop' Hakaba Hitoyo 2022-01-15 19:37:50 +00:00
  • ac434f83c3
         unit-testing-erratic: allow failure Alex Gleason 2022-01-15 13:35:22 -06:00
  • ecdc81b37a Merge branch 'linkify-0.5.2' into 'develop' Alex Gleason 2022-01-15 19:13:56 +00:00
  • 90d97ba4a5 Merge branch 'linkify-0.5.2' into 'develop' Alex Gleason 2022-01-15 18:56:31 +00:00
  • 39c5ebb1f6
         mix format Alex Gleason 2022-01-15 12:55:12 -06:00
  • cd8f1aac47
         CHANGELOG: hashtags markdown fix Alex Gleason 2022-01-15 12:36:33 -06:00
  • 31148c1857
         FormatterTest: fix nesting in expected output Alex Gleason 2022-01-15 12:31:36 -06:00
  • db90c9e3b0
         Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2 Alex Gleason 2022-01-15 12:27:42 -06:00
  • d5eb44e8b3
         Upgrade Linkify to v0.5.2 Alex Gleason 2022-01-15 12:27:16 -06:00
  • 18266f3699 Merge branch 'test-for-breaking-markdown' into 'develop' MK Fain 2022-01-15 18:25:44 +00:00
  • 898c8fda4b
         Change blocking/blockers queries to use index blocking-use-index Alex Gleason 2022-01-09 15:29:55 -06:00
  • 75ea7b7eb7
         Merge remote-tracking branch 'origin/develop' into operation-warpsneed Alex Gleason 2022-01-15 12:09:06 -06:00
  • 790081540d Update cheatsheet.md. Add Pleroma.Web.ActivityPub.MRF.KeywordPolicy. Hakaba Hitoyo 2022-01-15 12:26:33 +00:00
  • 71baa713bc Merge branch 'show_blockers_visible' into 'develop' Alex Gleason 2022-01-14 23:08:34 +00:00
  • 6284353025 Add blockers_visible to features list when it's enabled NEETzsche 2022-01-14 23:08:33 +00:00
  • 57d67f2f24 Merge branch 'show_blockers_visible' into 'develop' NEETzsche 2022-01-14 22:23:34 +00:00
  • 1eaab2eae7 Formatting NEETzsche 2022-01-14 15:16:01 -07:00
  • 8b5a658991 Merge branch 'mergeback' into 'develop' rinpatch 2022-01-14 22:15:10 +00:00
  • 8d5bca4094 Add blockers_visible to features list when it's enabled NEETzsche 2022-01-14 14:51:14 -07:00
  • 49f0de4030 Merge branch 'mergeback' into 'develop' Alex Gleason 2022-01-14 18:38:26 +00:00
  • a4436bcc3f
         Merge remote-tracking branch 'origin/stable' into mergeback Alex Gleason 2022-01-14 12:37:00 -06:00
  • 84dcb55b0f Merge branch 'account-endorsements' into 'develop' Alex Gleason 2022-01-13 19:02:21 +00:00
  • acb6e32006 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2022-01-13 11:43:06 -06:00
  • 240b1100d3 Merge branch 'account-endorsements' into 'develop' marcin mikołajczak 2022-01-12 21:44:26 +00:00
  • eedf551eed Add more tests marcin mikołajczak 2022-01-12 21:39:14 +01:00
  • 0f90fd5805 WIP account endorsements marcin mikołajczak 2022-01-10 21:35:55 +01:00
  • 62a45747d9 Merge branch 'release/2.4.2' into 'stable' v2.4.2 rinpatch 2022-01-11 20:47:02 +00:00
  • 2b38b65855 Merge branch 'release/2.4.2' into 'stable' rinpatch 2022-01-11 11:02:06 +00:00
  • b34f0a6e51 CI: Conservatively update release images so they keep building. Lain Soykaf 2021-11-14 20:37:32 +01:00
  • e4cfdfd701 CI: Upload the image for all platforms Lain Soykaf 2021-11-15 21:04:43 +01:00
  • a98a127718 Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf rinpatch 2022-01-11 13:49:06 +03:00
  • ea204dbca1 mix.lock: sync with mix.exs rinpatch 2022-01-10 20:18:18 +03:00
  • f4bc2f5975 Add 2.4.2 changelog entry and bump mix version rinpatch 2022-01-10 19:49:51 +03:00
  • cd3175c7fe Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' Alex Gleason 2022-01-10 15:07:09 +00:00
  • bf0b32c9aa Merge branch 'pleroma-result-1_13' into 'develop' lain 2021-12-07 16:55:01 +00:00
  • 4f249b2397 Merge remote-tracking branch 'origin/develop' into account-endorsements marcin mikołajczak 2022-01-10 20:04:14 +01:00
  • 753a9b3f32 Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' Alex Gleason 2022-01-10 15:07:09 +00:00
  • 0798a9d468 Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop' rinpatch 2022-01-10 14:53:03 +00:00
  • fd043b0ab3 Escape unicode RTL overrides in rich media parser tests rinpatch 2022-01-10 17:50:39 +03:00
  • 991b26f494 Merge branch 'update-hackney' into 'develop' lain 2021-12-01 15:49:57 +00:00
  • 0b67c794b2
         CombineActivitiesAndObjects: add back "ON CONFLICT DO NOTHING" Alex Gleason 2022-01-09 16:29:56 -06:00
  • faadb2f325
         Notifications: change blocking/blockers queries to make notifications load again Alex Gleason 2022-01-09 15:37:19 -06:00
  • c04afbbfb4
         ActivityPub: change blocking/blockers queries to make timelines load again Alex Gleason 2022-01-09 15:29:55 -06:00
  • 2451d65bd8 Merge branch 'api-docs-fixes' into 'develop' Alex Gleason 2022-01-07 20:29:28 +00:00
  • 25b4395830 just drop unknown tags bookwyrm-entities FloatingGhost 2022-01-07 20:14:04 +00:00
  • 81284fc891 Merge branch 'api-docs-fixes' into 'develop' Alex Gleason 2022-01-07 18:53:30 +00:00
  • e8b340aaa7
         Docs: fix various Pleroma API endpoints paths, fix MFA response Alex Gleason 2022-01-07 12:51:54 -06:00
  • 2cc6b1e1bd Allow for varying name fields FloatingGhost 2022-01-07 17:35:56 +00:00
  • 5c48fe1138 make credo happy FloatingGhost 2022-01-07 17:31:13 +00:00
  • 9ee27fb5ec add bookwyrm entity tests FloatingGhost 2022-01-07 17:17:18 +00:00
  • 680c5d8d89 Add compatibility with bookwyrm's weird entities FloatingGhost 2022-01-07 16:51:04 +00:00
  • f9ae674a57
         Remove unused ObjectId.shift_id/2 Alex Gleason 2022-01-05 11:36:47 -06:00
  • 4081be0001
         Merge remote-tracking branch 'origin/develop' into matrix matrix Alex Gleason 2022-01-03 13:40:19 -06:00
  • 26b0cbfd06
         ChangeObjectIdToFlake: add "on delete cascade" to deliveries fkey Alex Gleason 2022-01-02 13:13:14 -06:00
  • 1654b7fd61
         Remove pleroma.database remove_embedded_objects mix task Alex Gleason 2022-01-02 12:24:15 -06:00
  • 43db4990dc
         Pull websocket_client from Hex Sean King 2022-01-02 11:12:21 -07:00
  • 1fd27efbf4
         ResolveActivityObjectConflicts: move the triggers disable/enable into the migration itself Alex Gleason 2022-01-02 10:03:28 -06:00
  • a3094b64df Merge branch 'change/web-push-encryption-dep' into 'develop' Alex Gleason 2022-01-02 15:41:56 +00:00
  • 6373d2f272 Merge branch 'change/web-push-encryption-dep' into 'develop' Sean King 2022-01-02 04:04:56 +00:00