a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Commit Graph

  • 1ff9ffed83 Merge branch 'live-dashboard' into 'develop' Alex Gleason 2021-12-19 17:35:14 +0000
  • e4f9cb1c1b
         Merge remote-tracking branch 'origin/develop' into manifest Alex Gleason 2021-12-19 11:33:10 -0600
  • bd853199d9 Merge branch 'v2-suggestions' into 'develop' Alex Gleason 2021-12-19 17:31:17 +0000
  • 7c1d804554 Merge branch 'fix-search-dos' into 'develop' Alex Gleason 2021-12-19 17:30:52 +0000
  • b686d68cdb Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop' lain 2021-12-18 15:04:55 +0000
  • ff17884c3b
         Bump alpine to 3.14 Tusooa Zhu 2021-12-17 18:00:29 -0500
  • 8376e83f61
         Lint Tusooa Zhu 2021-12-17 16:52:50 -0500
  • 538d5ac210
         Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568 Tusooa Zhu 2021-12-17 16:47:48 -0500
  • 951d1592c7
         Add test to ensure removed follower cease to have relationship with ex-followee Tusooa Zhu 2021-12-17 16:44:22 -0500
  • bfd870380c
         Add test to ensure the blocked cease to have follow relationship to the blocker Tusooa Zhu 2021-12-17 14:42:45 -0500
  • 3d41ccc47b
         Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 Tusooa Zhu 2021-12-17 14:17:51 -0500
  • 8cfd527589 Merge branch 'verbose-emoji-loader' into 'develop' lain 2021-12-17 14:35:01 +0000
  • 31b9034a27 emoji/loader.ex: be more verbose about which emoji pack config is loading now a1batross 2021-12-17 14:15:44 +0000
  • ec41de2201 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2021-12-17 13:57:53 +0100
  • 5660bee2dc Dirty hack to make mediaproxy functional by relying on Hackney for that part Mark Felder 2021-12-16 11:36:58 -0600
  • e1b89fe3aa
         Merge remote-tracking branch 'origin/develop' into live-dashboard Alex Gleason 2021-12-15 19:05:36 -0500
  • 29d80b39f2
         Add Phoenix LiveDashboard Alex Gleason 2021-12-15 16:17:11 -0500
  • 6eb7d69e60 Merge branch 'delete-account-fix' into 'develop' lain 2021-12-15 21:26:45 +0000
  • 4e98ba3c3a Application: Actually start finch if it's needed Lain Soykaf 2021-12-15 15:42:37 -0500
  • abb62dd886 Application, dependencies: prepare for finch Lain Soykaf 2021-12-15 13:53:09 -0500
  • 8672ad6b00
         TwitterAPI: allow deleting one's own account with request body Alex Gleason 2021-12-13 16:15:33 -0500
  • 108dfd1f87
         Search: limit number of results Alex Gleason 2021-12-12 22:50:07 -0600
  • dff435488d Add link headers in ChatController.index2 marcin mikołajczak 2021-12-12 17:43:18 +0100
  • fb0aa0661c Merge branch 'fix-attachment-dimensions' into 'develop' lain 2021-12-09 16:05:06 +0000
  • 60295b58f9 Merge branch 'benchmark-fixes' into 'develop' lain 2021-12-09 15:38:26 +0000
  • d194b5b7fe
         Benchmarks: fix user timeline and tags benchmarks Alex Gleason 2021-12-08 11:54:41 -0600
  • 01cc099c8e
         VideoHandlingTest: remove nil values Alex Gleason 2021-12-07 21:55:54 -0500
  • 992d9287d0 Apply alexgleason's suggestion(s) to 1 file(s) Haelwenn 2021-12-07 22:53:36 +0000
  • 2c96668a2c
         Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions Alex Gleason 2021-12-07 13:41:54 -0500
  • 335684182a
         Fix VideoHandlingTest Alex Gleason 2021-12-07 13:35:34 -0500
  • b57041c59a Merge branch 'fixyfix' into 'develop' lain 2021-12-07 18:19:43 +0000
  • 3f03d71ea6
         AttachmentValidator: ingest width and height Alex Gleason 2021-12-07 12:59:03 -0500
  • ca8c676867 Linting. Lain Soykaf 2021-12-07 12:12:23 -0500
  • 500e126604 Merge branch 'pleroma-result-1_13' into 'develop' lain 2021-12-07 16:55:01 +0000
  • e219e504ce Merge branch 'mix-lock' into 'develop' lain 2021-12-07 16:45:03 +0000
  • ab5dee84bf
         Run `mix deps.get` Alex Gleason 2021-12-07 10:03:31 -0500
  • 8af53101fb move result into with guard Finn Behrens 2021-12-07 09:18:53 +0100
  • d9349bc52f
         Transmogrifier: test fix_attachments/1 Alex Gleason 2021-12-07 01:10:47 -0500
  • 613f55b078 Merge branch 'benchmark' into 'develop' lain 2021-12-06 21:16:30 +0000
  • c96e52b88c Add 'notifying' to relationship for compatibility with Mastodon marcin mikołajczak 2021-12-06 21:23:34 +0100
  • 3892bd353b Add test for following with subscription marcin mikołajczak 2021-12-06 21:13:14 +0100
  • ab60c0c6c2 Merge branch 'optimisation/deactivated-subquery' into 'develop' lain 2021-12-06 19:55:52 +0000
  • 64a4c147b1 MastoAPI: accept notify param in follow request marcin mikołajczak 2021-12-06 18:00:58 +0100
  • db46913dcc make linter happy FloatingGhost 2021-12-06 11:50:51 +0000
  • cd8bdbc761 Make deactivated user check into a subquery FloatingGhost 2021-12-06 11:44:17 +0000
  • 949a53e327
         Log Ecto queries > 500ms Alex Gleason 2021-12-05 17:46:56 -0500
  • ce4560c2a1
         Fix benchmarks Alex Gleason 2021-12-03 16:20:54 -0500
  • 5c573a8a28 Merge branch 'password-reset' into 'develop' lain 2021-12-03 15:13:10 +0000
  • ba2ed3c255
         Fix frontend_status_plug_test.exs Alex Gleason 2021-12-03 07:56:26 -0600
  • 8286ceb465
         Merge remote-tracking branch 'origin/develop' into password-reset Alex Gleason 2021-12-03 00:11:38 -0600
  • 5da4f33bf1
         Restore POST /auth/password Alex Gleason 2021-12-03 00:02:49 -0600
  • 235c4139d7 Merge branch 'fix/2782-nodeinfo-active-users' into 'develop' lain 2021-12-02 16:54:28 +0000
  • cd5fb84b76 remote_interaction API endpoint marcin mikołajczak 2021-11-22 19:44:30 +0100
  • aaed93db27 Merge branch 'update-hackney' into 'develop' lain 2021-12-01 15:49:57 +0000
  • d486d7d09e Merge branch 'force_pinned_objects_to_be_empty' into 'develop' lain 2021-11-29 18:08:10 +0000
  • 182c563ed0 Force pinned_objects to be empty, not null NEETzsche 2021-11-29 18:08:09 +0000
  • 809503011f Mix: upgrade Hackney to 1.18.0 a1batross 2021-11-29 17:28:10 +0000
  • a9b0027071 Account endorsements marcin mikołajczak 2021-11-29 12:43:29 +0100
  • 6519f59d91
         v2 Suggestions: return `is_suggested` through the API Alex Gleason 2021-11-26 23:10:01 -0600
  • 8dc1d2201a
         Instance: add v2_suggestions feature Alex Gleason 2021-11-26 22:45:49 -0600
  • e5a7547fbe
         v2 Suggestions: also filter out users you follow Alex Gleason 2021-11-26 21:42:28 -0600
  • 437c1a5a52
         v2 Suggestions: actually flter out dismissed suggestions Alex Gleason 2021-11-26 21:02:14 -0600
  • aee55b9a8b
         v2 Suggestions: dismiss a suggestion Alex Gleason 2021-11-26 20:19:29 -0600
  • da06e1a17f
         v2 Suggestions: add index on is_suggested column Alex Gleason 2021-11-26 15:32:01 -0600
  • 6c0484d571
         AdminAPI: suggest a user through the API Alex Gleason 2021-11-26 15:19:01 -0600
  • e28d990ecb
         v2 Suggestions: don't skip visibility check Alex Gleason 2021-11-26 14:46:29 -0600
  • b17360cd7c
         v2 Suggestions: rudimentary API response Alex Gleason 2021-11-26 14:33:27 -0600
  • 7e1caddc58
         v2 Suggestions: return empty array Alex Gleason 2021-11-25 14:57:36 -0600
  • 720198d569
         Merge remote-tracking branch 'pleroma/develop' into manifest Alex Gleason 2021-11-24 17:58:58 -0600
  • cb9359335f
         Expose /manifest.json for PWA Alex Gleason 2021-11-24 16:45:05 -0600
  • d64d1b1d45 Fix replies count for remote replies marcin mikołajczak 2021-11-23 11:31:09 +0100
  • 588bcbac55 Apply 2 suggestion(s) to 2 file(s) rinpatch 2021-11-22 10:54:44 +0000
  • 8e040e098b Lint marcin mikołajczak 2021-11-21 18:17:06 +0100
  • cb76faece9 Update test marcin mikołajczak 2021-11-21 17:50:42 +0100
  • 106b5c2678 Fix a typo marcin mikołajczak 2021-11-21 17:36:37 +0100
  • 40414bf177 MastoAPI: Add user notes on accounts marcin mikołajczak 2021-11-21 16:53:30 +0100
  • efc28812b8 Add changelog entry Alibek Omarov 2021-11-17 00:39:10 +0100
  • c97f99ccf2 Merge branch 'bugfix/markdown-newlines' into 'develop' Haelwenn 2021-11-16 13:54:34 +0000
  • 5e15ceb49d mix: Update earmark Haelwenn (lanodan) Monnier 2021-11-16 14:32:49 +0100
  • add2b9cd8d Merge branch 'update-elixir' into 'develop' lain 2021-11-15 20:17:38 +0000
  • f78cb6ab9a CI: Upload the image for all platforms Lain Soykaf 2021-11-15 21:04:43 +0100
  • 04aca335aa nodeinfo: report activeMonth and activeHalfyear users fields Alibek Omarov 2021-11-15 16:58:25 +0100
  • 4d341f51e1 Merge branch 'fix-tests' into 'develop' lain 2021-11-15 14:31:27 +0000
  • e2772d6bf1 Merge branch 'block-behavior' into 'develop' lain 2021-11-15 14:27:59 +0000
  • 6e3df11693 Merge branch 'instance-deletion' into 'develop' lain 2021-11-15 14:24:13 +0000
  • 6aff3d3204 Merge branch 'fix-object-deletion-timeout' into 'develop' lain 2021-11-15 13:21:42 +0000
  • 8b689dfddc Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2021-11-15 13:18:29 +0100
  • 838da53ea7 Merge branch 'bump/http_signatures-0.1.1' into 'develop' lain 2021-11-15 11:58:49 +0000
  • bd77243981 Merge branch 'userfeed-fe-fallback' into 'develop' lain 2021-11-15 10:48:56 +0000
  • d058e1c978 Merge branch 'fix-releases' into 'develop' lain 2021-11-14 20:35:10 +0000
  • 5c7aa4a1e9 CI: Conservatively update release images so they keep building. Lain Soykaf 2021-11-14 20:37:32 +0100
  • 0f8b10ff5a Merge branch 'bugfix/inbox-misleading-warning' into 'develop' lain 2021-11-14 16:14:09 +0000
  • eb0f7620f2 Merge branch 'update-crypt' into 'develop' lain 2021-11-14 16:00:01 +0000
  • 7dcc73f294 Mix: Update crypt to fix musl builds. Lain Soykaf 2021-11-14 16:04:08 +0100
  • 871936b3ca MediaProxyCacheControllerTest: Fix unstable tests. Lain Soykaf 2021-11-14 11:45:38 +0100
  • 2dea4a8c04 StealEmojiPolicyTest: Make mocks explicit. Lain Soykaf 2021-11-14 11:44:24 +0100
  • 26450a0be3 Mix: Upgrade mogrify library Lain Soykaf 2021-11-14 11:43:39 +0100
  • 23e91ec8dd activity_pub_controller: Fix misleading debug warning in post_inbox_fallback Haelwenn (lanodan) Monnier 2021-11-10 00:37:27 +0100
  • e4ad4f0bd6 mix: Update http_signatures to 0.1.1 Haelwenn (lanodan) Monnier 2021-11-10 00:53:32 +0100
  • 0ba69edc29 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2021-10-10 23:25:54 +0200