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

Commit Graph

  • bad08f34ca Credo fixes. lain 2020-07-02 09:57:31 +02:00
  • ce9b7c0e0f Changelog: Update with stream changes. lain 2020-07-02 09:54:48 +02:00
  • 311b7c19d0 Streamer: Align announce streaming with polling. lain 2020-07-02 09:50:26 +02:00
  • 61fe94d698 SideEffects: Refactor. lain 2020-07-02 09:33:50 +02:00
  • 2c8d57ff06 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-01 14:04:55 -05:00
  • fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop' rinpatch 2020-07-01 13:51:23 +00:00
  • fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id lain 2020-07-01 12:26:07 +02:00
  • ce92e6e5ce Fetcher: Work when we can't get the OP. lain 2020-07-01 11:48:51 +02:00
  • 8ae572d5ae Fixtures: Pretty print. lain 2020-07-01 11:47:45 +02:00
  • d889c9ca70 Merge branch 'revert-651f2695' into 'develop' lain 2020-07-01 09:18:02 +00:00
  • c0c904dd73 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-01 11:58:57 +03:00
  • 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'" lain 2020-07-01 08:51:56 +00:00
  • df2d6564d5 Add labels, update descriptions and labels Angelina Filippova 2020-07-01 03:01:15 +03:00
  • cf28f3bd33 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-30 17:37:28 -05:00
  • 8daacc9114
         AutoLinker --> Linkify, update to latest version https://git.pleroma.social/pleroma/elixir-libraries/linkify Alex Gleason 2020-06-23 14:17:23 -05:00
  • 46235ac77d Merge develop Roman Chvanikov 2020-06-30 23:59:35 +03:00
  • 9cf4bfcd81 Merge branch 'chore/rename-user-settings-column' into 'develop' Haelwenn 2020-06-30 20:51:10 +00:00
  • 5a8e0208b1 Add fields limits to instance metadata, add tests Mark Felder 2020-06-30 15:25:10 -05:00
  • 0883a706dc Merge branch 'develop' into activation-meta Mark Felder 2020-06-30 15:09:03 -05:00
  • 3d2989278c [#1892] Excluded bot actors (applications, services) from search results. Ivan Tashkinov 2020-06-30 21:26:39 +03:00
  • d69af7f742 Rename user.settings column Mark Felder 2020-06-30 11:50:53 -05:00
  • b9e6ad571a Merge branch 'preloadfixups' into 'develop' lain 2020-06-30 10:52:55 +00:00
  • 8b7055e25e Credo fixes lain 2020-06-30 11:55:58 +02:00
  • 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups lain 2020-06-30 11:40:34 +02:00
  • 2382a2a151 Preload: Load the correct instance panel lain 2020-06-30 11:35:54 +02:00
  • 34c9446cb1 Merge branch 'patch-1' into 'develop' lain 2020-06-30 08:42:45 +00:00
  • 27542f19c6 Use correct PostgreSQL version command in bug template normandy 2020-06-30 03:12:30 +00:00
  • d3aed15c07 This seems wrong Your New SJW Waifu 2020-06-29 17:25:11 -05:00
  • 667049a7a9 format racism_remover Your New SJW Waifu 2020-06-29 16:50:04 -05:00
  • fae534391e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-29 15:15:23 -05:00
  • 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop' rinpatch 2020-06-29 18:06:25 +00:00
  • 09c5991f82 Apply suggestion to lib/pleroma/notification.ex lain 2020-06-29 16:04:14 +00:00
  • b2b332984c Merge branch 'fix/cast-and-validate' into 'develop' lain 2020-06-29 15:59:40 +00:00
  • c01f4ca07f Notification: Remove TODO. lain 2020-06-29 17:52:56 +02:00
  • 90083a754d Notifications: Never return nil in the notification list. lain 2020-06-29 17:48:18 +02:00
  • 3aa04b81c4
         Test default "content-type" for CastAndValidate Egor Kislitsyn 2020-06-29 19:47:04 +04:00
  • 344a9b28b3 Merge branch 'fix/swoosh-sendmail' into 'develop' feld 2020-06-29 15:24:39 +00:00
  • 979f02ec94
         Fix CastAndValidate plug Egor Kislitsyn 2020-06-29 17:33:00 +04:00
  • dc60b1ee58 updated swoosh Maksim Pechnikov 2020-06-29 16:22:54 +03:00
  • 67d92ac7b7
         Remove /statusnet/config Egor Kislitsyn 2020-06-29 17:00:37 +04:00
  • 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop' lain 2020-06-29 12:44:58 +00:00
  • 8693e01799
         Fix warning Egor Kislitsyn 2020-06-29 16:29:51 +04:00
  • 6512ef6879
         excluding attachment links from RichMedia Alexander Strizhakov 2020-06-29 15:25:57 +03:00
  • 4a306720e8
         Merge branch 'develop' into remove-twitter-api Egor Kislitsyn 2020-06-29 16:09:49 +04:00
  • 59540131c1 Credo fixes. lain 2020-06-29 14:09:03 +02:00
  • f308196b75 Token Response: Remove empty file. lain 2020-06-29 13:52:50 +02:00
  • e374872fe7 AccountOperation: Correctly describe create response. lain 2020-06-29 13:49:48 +02:00
  • bb168ed94a OAuth: Extract view-type functions to a view. lain 2020-06-29 13:39:09 +02:00
  • 651f269568 Merge branch 'avatar-removing' into 'develop' lain 2020-06-29 11:16:30 +00:00
  • e64d08439e UpdateCredentialsTest: Add test for removing profile images. lain 2020-06-29 12:40:23 +02:00
  • 8630a6c7f5 Preloaders: Use strings as keys. lain 2020-06-29 11:41:00 +02:00
  • a19f8778af User preloader: Put user info at correct key lain 2020-06-29 11:06:20 +02:00
  • 577da132da Merge branch '1031-parent-visible' into 'develop' lain 2020-06-29 08:39:51 +00:00
  • e229640372 Merge branch 'openapi/schema-account-pleromafields' into 'develop' lain 2020-06-29 08:32:56 +00:00
  • 9f51b03eed
         ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses Haelwenn (lanodan) Monnier 2020-06-29 03:31:33 +02:00
  • cf1bd386c6 Merge branch 'docs/mastoapi-account-fields' into 'develop' Haelwenn 2020-06-29 00:56:02 +00:00
  • efb5d64e50
         differences_in_mastoapi_responses: Update account fields Haelwenn (lanodan) Monnier 2020-06-29 02:39:26 +02:00
  • c36dd359b8 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-27 16:47:47 -05:00
  • 4b32bc80de Merge branch 'reduce-preloading-defaults' into 'develop' lain 2020-06-27 10:40:29 +00:00
  • 0313520cd2 Config: Reduce default preloaders to configuration endpoints. lain 2020-06-27 12:18:37 +02:00
  • 542fc16b0b Apply suggestion to docs/administration/CLI_tasks/frontend.md lain 2020-06-27 09:42:24 +00:00
  • dc31fbfe6c Merge branch 'fix/fetcher-transmogrifier-error' into 'develop' lain 2020-06-27 09:41:35 +00:00
  • f89390110b
         added tab & labels for mrf policies Alexander Strizhakov 2020-06-27 12:18:34 +03:00
  • dc54059c0c Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-26 15:45:53 -05:00
  • ce85db41a3 Lint Mark Felder 2020-06-26 14:35:04 -05:00
  • 1566543bec
         object/fetcher: Pass full Transmogrifier error Haelwenn (lanodan) Monnier 2020-06-26 20:10:47 +02:00
  • 244655e884
         MastoAPI: Show source field when deleting Haelwenn (lanodan) Monnier 2020-06-26 07:16:24 +02:00
  • 76313e8162 Document breaking change of hide_notification_details setting Mark Felder 2020-06-26 12:48:05 -05:00
  • 69848d5c97 Rename notification "privacy_option" setting Mark Felder 2020-06-26 12:45:46 -05:00
  • bf1c5e255a Merge branch 'block-handling' into 'develop' Haelwenn 2020-06-26 17:41:00 +00:00
  • 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop' Haelwenn 2020-06-26 16:59:46 +00:00
  • fd5e797379 Simplify notification filtering settings further Mark Felder 2020-06-26 11:24:28 -05:00
  • b950fb01db Merge branch 'develop' into refactor/notification_settings Mark Felder 2020-06-26 10:23:19 -05:00
  • a5bbfa21a1 StaticFE: Prioritize json in requests. lain 2020-06-26 16:27:39 +02:00
  • f378e93bf4 AccountController: Return scope in proper format. lain 2020-06-26 16:15:27 +02:00
  • a2002ebb63 Preloading: Fix nodeinfo url. lain 2020-06-26 14:48:23 +02:00
  • 4a7a34ae8c Preloading: Return correct data for statusnet stuff. lain 2020-06-26 14:47:38 +02:00
  • e7bc0273e5
         additional data to MRF policies in descriptions Alexander Strizhakov 2020-06-26 15:22:08 +03:00
  • 6db9f7cdb3 Merge branch 'fix-chats' into 'develop' lain 2020-06-26 11:09:37 +00:00
  • 7ed2296416 Nodeinfo: Add chat information back in. lain 2020-06-26 13:04:15 +02:00
  • 15a8b70318 User: Don't unfollow on block when the relevant setting is set. lain 2020-06-26 12:06:00 +02:00
  • c3383d4fab BlockValidator: Restore old behavior for incoming blocks. lain 2020-06-26 11:58:40 +02:00
  • 91cd023720
         Pleroma.Upload.Filter.Mogrify args description Alexander Strizhakov 2020-06-26 09:03:07 +03:00
  • 13da5315e4 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-25 23:09:33 -05:00
  • 27c33f216a
         activity_draft: Add source field Haelwenn (lanodan) Monnier 2020-06-26 05:39:35 +02:00
  • 7c7a6509b9 Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop' Haelwenn 2020-06-26 03:48:25 +00:00
  • d6c958b4c2
         nodeinfo: Fix MRF transparency Haelwenn (lanodan) Monnier 2020-06-26 05:33:59 +02:00
  • d7af3d92e7 add racism remover mrf Your New SJW Waifu 2020-06-25 17:24:36 -05:00
  • 8288419686 Merge branch 'preload-data' into 'develop' feld 2020-06-25 21:35:39 +00:00
  • 16f80ad6b2 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-25 16:27:16 -05:00
  • 2e39fbe02e Merge branch 'mastoapi-omitted' into 'develop' feld 2020-06-25 21:25:02 +00:00
  • bb275c4985 Merge branch 'update/admin-fe-20200625' into 'develop' feld 2020-06-25 20:09:19 +00:00
  • d9e4623628 Update AdminFE build Mark Felder 2020-06-25 14:55:00 -05:00
  • 433c01b370 Merge branch 'develop' into refactor/notification_settings Mark Felder 2020-06-25 14:16:28 -05:00
  • 28d4e60f66
         MastoAPI differences: Document not implemented features Alex Gleason 2020-06-25 12:32:06 -05:00
  • 87bf6d6300 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-25 09:08:21 -05:00
  • 1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop' lain 2020-06-25 10:42:57 +00:00
  • 04abee782b AntiSpamLinkPolicy: Exempt local users. lain 2020-06-25 12:40:39 +02:00
  • f585622f85 Apply suggestion to config/description.exs lain 2020-06-25 10:17:16 +00:00
  • 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop' lain 2020-06-25 10:14:19 +00:00