Commit Graph

  • 1963e143c5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api lain 2020-07-06 12:15:59 +0200
  • 158c26d7dd StaticFE Plug: Use phoenix helper to get the requested format. lain 2020-07-06 12:11:10 +0200
  • ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json lain 2020-07-06 12:07:56 +0200
  • 208baf157a ActivityPub: Add new 'capabilities' to user. lain 2020-07-06 11:38:40 +0200
  • 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information lain 2020-07-06 11:27:06 +0200
  • 69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop' rinpatch 2020-07-06 09:21:03 +0000
  • a2cabb99ca Merge branch 'filter-tesla-config' into 'develop' lain 2020-07-06 09:20:10 +0000
  • 58da575935 Changelog: Document description limits. lain 2020-07-06 11:18:01 +0200
  • 729506c56a Docs: document instance differences lain 2020-07-06 11:16:58 +0200
  • cc8b4e48d9 InstanceView: Add chat limit, description limit lain 2020-07-06 11:12:37 +0200
  • 2e21ae1b6d Docs: Add description limits to cheat sheet lain 2020-07-06 11:08:53 +0200
  • af7720237b Upload: Restrict description length lain 2020-07-06 11:08:13 +0200
  • 818f3c2393
    test fixes Alexander Strizhakov 2020-06-17 12:34:27 +0300
  • 028a241b7d
    tests fixes Alexander Strizhakov 2020-05-01 09:20:54 +0300
  • da509487b2
    adding benchmarks in new format Alexander Strizhakov 2020-03-31 16:53:11 +0300
  • 20c27bef40
    renaming back and reject nil on create Alexander Strizhakov 2020-02-26 17:50:56 +0300
  • 52ff75413a
    Apply suggestion to test/notification_test.exs Alexander Strizhakov 2020-02-26 14:00:38 +0000
  • 086a260c04
    Apply suggestion to test/notification_test.exs Alexander Strizhakov 2020-02-26 14:00:28 +0000
  • 771748db1f
    Apply suggestion to lib/pleroma/filter.ex Alexander Strizhakov 2020-02-26 13:59:07 +0000
  • 6558f31cda
    don't filter notifications for follow and move types Alexander Strizhakov 2020-02-07 18:16:39 +0300
  • 8277b29790
    Restrict thread statuses that contain user's irreversible filters Sergey Suprunenko 2019-11-25 16:59:55 +0100
  • 5af1bf443d
    Skip notifications for statuses that contain an irreversible filtered word Sergey Suprunenko 2019-11-22 19:52:50 +0100
  • 4a8c26654e
    Restrict statuses that contain user's irreversible filters Sergey Suprunenko 2019-11-16 22:54:13 +0100
  • 465ddcfd20
    migration to delete migrated tesla setting Alexander Strizhakov 2020-07-06 09:12:29 +0300
  • 480dfafa83
    don't save tesla settings into db Alexander Strizhakov 2020-07-06 08:48:20 +0300
  • fc1f34b851 Delete activity before sending response to client Roman Chvanikov 2020-07-06 00:01:25 +0300
  • 9faa632037 [#2497] Fixed merge issue. Ivan Tashkinov 2020-07-05 19:02:43 +0300
  • af612bd006 Ensure all CSP parameters for remote hosts have a scheme Mark Felder 2020-07-05 10:11:43 -0500
  • cf56655614 Streamer: Don't filter out announce notifications. lain 2020-07-04 17:11:37 +0200
  • 991bd78dda Document the Captcha CSP fix Mark Felder 2020-07-03 17:19:43 -0500
  • e9a28078ad Rename function and clarify that CSP is only strict with MediaProxy enabled Mark Felder 2020-07-03 17:18:22 -0500
  • eaa59daa4c Add Captcha endpoint to CSP headers when MediaProxy is enabled. Mark Felder 2020-07-03 17:06:20 -0500
  • e8710a3f87 Revert "Document Oban update" Mark Felder 2020-07-03 13:49:02 -0500
  • bc956d0c41 Document Oban update Mark Felder 2020-07-03 11:29:17 -0500
  • 4d3d867f10 Update Oban to 2.0-rc3 Mark Felder 2020-07-03 10:37:07 -0500
  • 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban Mark Felder 2020-07-03 10:36:41 -0500
  • c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' lain 2020-07-03 15:06:33 +0000
  • 9a27ef47f1 Merge branch '1912-leading-trailing-space-search' into 'develop' lain 2020-07-03 14:59:12 +0000
  • cbf2fe9649 Update changelog lain 2020-07-03 16:46:11 +0200
  • d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text lain 2020-07-03 16:44:31 +0200
  • 19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop' lain 2020-07-03 14:38:22 +0000
  • 945e75c8e8 SearchController: Trim query. lain 2020-07-03 16:36:55 +0200
  • ef4c16f6f1 Update changelog lain 2020-07-03 15:59:42 +0200
  • 01695716c8 Docs: Document `accepts_chat_messages` setting. lain 2020-07-03 15:55:18 +0200
  • e3b5559780 AccountController: Make setting accepts_chat_messages possible. lain 2020-07-03 15:54:25 +0200
  • 4a7b89e372 ChatMessageValidator: Additional validation. lain 2020-07-03 15:13:27 +0200
  • 3ca9af1f9f Account Schema: Add `accepts_chat_messages` lain 2020-07-03 14:31:04 +0200
  • b374fd622b Docs: Document the added `accepts_chat_messages` user property. lain 2020-07-03 14:24:54 +0200
  • 5c0bf4c472 ActivityPub: Ingest information about chat acceptance. lain 2020-07-03 13:58:34 +0200
  • 8289ec67a8 Litepub: Add acceptsChatMessages to schema. lain 2020-07-03 13:39:21 +0200
  • 26a7cc3f00 UserView: Add acceptsChatMessages field lain 2020-07-03 13:38:59 +0200
  • db76c26469 AccountViewTest: Fix test. lain 2020-07-03 13:24:16 +0200
  • 37fdb05058 User, Migration: Change `accepts_chat_messages` to be nullable lain 2020-07-03 13:12:23 +0200
  • 3250228be9 AccountView: Add 'accepts_chat_messages' to view. lain 2020-07-03 13:07:33 +0200
  • 98bfdba108 User: On registration, set `accepts_chat_messages` to true. lain 2020-07-03 12:47:05 +0200
  • 8ad166e8e3 Migrations: Add `accepts_chat_messages` to users. lain 2020-07-03 12:46:28 +0200
  • 86151b23a6 Merge branch '1910-migration-fix' into 'develop' rinpatch 2020-07-03 10:44:19 +0000
  • 59b426ebef Notification Backfill: Explicitly select the needed fields. lain 2020-07-03 11:25:12 +0200
  • 90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results. Ivan Tashkinov 2020-07-03 11:02:15 +0300
  • fd5ad99ace Merge branch 'feature/1885-MRF-metadata' into 'develop' feld 2020-07-02 19:44:05 +0000
  • 4f8e0170e9 Merge branch 'activation-meta' into 'develop' feld 2020-07-02 18:12:03 +0000
  • 8121e46f25 Merge branch 'develop' into activation-meta Mark Felder 2020-07-02 13:01:22 -0500
  • 02d855b2b9 Document the new API extension of /api/v1/instance Mark Felder 2020-07-02 12:59:45 -0500
  • d44ec2bf4c Remove camelCase from the keys Mark Felder 2020-07-02 12:55:08 -0500
  • 80076f1974 Lint, long lines Mark Felder 2020-07-02 10:33:27 -0500
  • d169e51b7e Improve descriptions, move primary MRF settings to top for AdminFE ordering Mark Felder 2020-07-02 10:27:15 -0500
  • a5d611abc2 Update AdminFE build to utilize new MRF metadata Mark Felder 2020-07-02 10:16:19 -0500
  • 6b5563ed2c Merge branch 'develop' into feature/1885-MRF-metadata Mark Felder 2020-07-02 09:57:57 -0500
  • 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-07-02 16:36:54 +0300
  • 4c044f6225 Merge branch 'fetcher-fixes' into 'develop' rinpatch 2020-07-02 10:17:51 +0000
  • b0439df1b5 Merge branch '1907-fix-announce-streaming' into 'develop' rinpatch 2020-07-02 10:08:42 +0000
  • d884b6f704 Merge branch 'feature/update-description' into 'develop' lain 2020-07-02 08:43:32 +0000
  • bad08f34ca Credo fixes. lain 2020-07-02 09:57:31 +0200
  • ce9b7c0e0f Changelog: Update with stream changes. lain 2020-07-02 09:54:48 +0200
  • 311b7c19d0 Streamer: Align announce streaming with polling. lain 2020-07-02 09:50:26 +0200
  • 61fe94d698 SideEffects: Refactor. lain 2020-07-02 09:33:50 +0200
  • fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop' rinpatch 2020-07-01 13:51:23 +0000
  • fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id lain 2020-07-01 12:26:07 +0200
  • ce92e6e5ce Fetcher: Work when we can't get the OP. lain 2020-07-01 11:48:51 +0200
  • 8ae572d5ae Fixtures: Pretty print. lain 2020-07-01 11:47:45 +0200
  • d889c9ca70 Merge branch 'revert-651f2695' into 'develop' lain 2020-07-01 09:18:02 +0000
  • 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'" lain 2020-07-01 08:51:56 +0000
  • df2d6564d5 Add labels, update descriptions and labels Angelina Filippova 2020-07-01 03:01:15 +0300
  • 8daacc9114
    AutoLinker --> Linkify, update to latest version https://git.pleroma.social/pleroma/elixir-libraries/linkify Alex Gleason 2020-06-23 14:17:23 -0500
  • 9cf4bfcd81 Merge branch 'chore/rename-user-settings-column' into 'develop' Haelwenn 2020-06-30 20:51:10 +0000
  • 5a8e0208b1 Add fields limits to instance metadata, add tests Mark Felder 2020-06-30 15:25:10 -0500
  • 0883a706dc Merge branch 'develop' into activation-meta Mark Felder 2020-06-30 15:09:03 -0500
  • 3d2989278c [#1892] Excluded bot actors (applications, services) from search results. Ivan Tashkinov 2020-06-30 21:26:39 +0300
  • d69af7f742 Rename user.settings column Mark Felder 2020-06-30 11:50:53 -0500
  • b9e6ad571a Merge branch 'preloadfixups' into 'develop' lain 2020-06-30 10:52:55 +0000
  • 8b7055e25e Credo fixes lain 2020-06-30 11:55:58 +0200
  • 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups lain 2020-06-30 11:40:34 +0200
  • 2382a2a151 Preload: Load the correct instance panel lain 2020-06-30 11:35:54 +0200
  • 34c9446cb1 Merge branch 'patch-1' into 'develop' lain 2020-06-30 08:42:45 +0000
  • 27542f19c6 Use correct PostgreSQL version command in bug template normandy 2020-06-30 03:12:30 +0000
  • 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop' rinpatch 2020-06-29 18:06:25 +0000
  • 09c5991f82 Apply suggestion to lib/pleroma/notification.ex lain 2020-06-29 16:04:14 +0000
  • b2b332984c Merge branch 'fix/cast-and-validate' into 'develop' lain 2020-06-29 15:59:40 +0000
  • c01f4ca07f Notification: Remove TODO. lain 2020-06-29 17:52:56 +0200
  • 90083a754d Notifications: Never return `nil` in the notification list. lain 2020-06-29 17:48:18 +0200