Commit Graph

  • 8a03ce50ea Merge branch 'chore/update-fe' into 'develop' rinpatch 2019-11-08 23:08:03 +00:00
  • 3cc2437598 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 rinpatch 2019-11-09 01:47:32 +03:00
  • 6871084f34 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 rinpatch 2019-11-09 01:47:32 +03:00
  • 6e65da782e object containment: handle all cases where ID is invalid (missing, nil, non-string) Ariadne Conill 2019-11-08 14:51:28 -06:00
  • d8e99189d0 Merge branch 'bugfix/containment-no-id' into 'develop' rinpatch 2019-11-08 21:12:23 +00:00
  • 5b60d82592 object containment: handle all cases where ID is invalid (missing, nil, non-string) Ariadne Conill 2019-11-08 14:51:28 -06:00
  • 4c5055bac9 Add changelog for 1.1.5 rinpatch 2019-11-08 23:43:11 +03:00
  • 89ca9560e0 Bump HtmlEntities to 0.5 rinpatch 2019-11-05 12:37:25 +03:00
  • 5cbb1cd550 Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop' rinpatch 2019-11-08 20:02:25 +00:00
  • 33d0250edc Object Fetcher: set cache after reinjecting rinpatch 2019-11-06 14:00:03 +03:00
  • c389fb4dcc Fix TrailingFormatPlug not being active for /api/oauth_tokens rinpatch 2019-11-06 17:22:23 +03:00
  • 1b58b5c8db Bump fast_sanitize rinpatch 2019-11-08 22:22:39 +03:00
  • 0929d06e69 Merge branch 'chore/add-multifetch' into 'develop' kaniini 2019-11-08 19:08:39 +00:00
  • 532fd38b12 nodeinfo: add multifetch feature (ref pleroma-fe!977). Ariadne Conill 2019-11-08 12:48:28 -06:00
  • aa3551ebd2 Merge branch 'chore/bump-fast-sanitize-again' into 'develop' rinpatch 2019-11-08 17:01:07 +00:00
  • 44f942e17d Bump fast_sanitize to 0.1.2 rinpatch 2019-11-08 19:40:13 +03:00
  • b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-11-08 13:27:11 +01:00
  • b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-11-08 18:30:49 +09:00
  • 7258db023e Support old flag format Maxim Filippov 2019-11-07 22:45:36 +10:00
  • 278674223d Merge branch 'chore/bump-fast-sanitize' into 'develop' rinpatch 2019-11-07 23:32:25 +00:00
  • 2f4e9a068f Bump fast_sanitize to 0.1.1 rinpatch 2019-11-08 00:14:53 +03:00
  • 5bf59f8e66 Merge branch 'recipients-filter' into 'develop' kaniini 2019-11-07 15:13:20 +00:00
  • 7888803ffe Mastodon API: Add the recipients parameter to GET /api/v1/conversations eugenijm 2019-11-07 03:00:21 +03:00
  • 9f9c3c4fbe Merge branch 'fix/unwrapped-object-return' into 'develop' rinpatch 2019-11-06 23:01:04 +00:00
  • 32afa07995 Fetcher: fix local check returning unwrapped object rinpatch 2019-11-07 01:40:55 +03:00
  • 802d249827 Merge branch 'fix/trailing-format-plug-oauth' into 'develop' rinpatch 2019-11-06 14:47:34 +00:00
  • e4632b0633 Merge branch 'changelog-cleanup' into 'develop' rinpatch 2019-11-06 14:39:46 +00:00
  • a918167256 Merge branch 'fix/saner-static-cache-control' into 'develop' rinpatch 2019-11-06 14:31:32 +00:00
  • 365657320c Fix TrailingFormatPlug not being active for /api/oauth_tokens rinpatch 2019-11-06 17:22:23 +03:00
  • 66c502879b Removed duplicate Changed entry in Unreleased section of CHANGELOG.md. Ivan Tashkinov 2019-11-06 17:19:32 +03:00
  • 84175fe30e Set better Cache-Control header for static content rinpatch 2019-11-06 16:41:19 +03:00
  • 8b19464176 Merge branch 'feature/multiple-users-force-password-reset' into 'develop' feld 2019-11-06 12:24:41 +00:00
  • f171095960 Grouped reports with status data baked in Maxim Filippov 2019-11-06 21:25:46 +10:00
  • be6e5e017e Merge branch 'fix/object-reinject-set-cache' into 'develop' rinpatch 2019-11-06 11:20:34 +00:00
  • 54746c6c26 Object Fetcher: set cache after reinjecting rinpatch 2019-11-06 14:00:03 +03:00
  • efc4d6d9ec Merge branch 'ci/remove-docs-build' into 'develop' Haelwenn 2019-11-06 01:13:20 +00:00
  • d5dc0c4a7e CI: Remove the docs-build job rinpatch 2019-11-05 23:45:07 +03:00
  • e1fc6cb78f Check client and token in GET /oauth/authorize AkiraFukushima 2019-11-05 23:52:47 +09:00
  • 1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel lain 2019-11-05 15:21:00 +01:00
  • faced6236b NoteValidator: Add very basic validator for Note objects. lain 2019-11-05 15:02:31 +01:00
  • 3d1b445cbf Object Validators: Extract common validations. lain 2019-11-05 15:02:09 +01:00
  • 21716aa594 Merge branch 'release/1.1.4' into 'stable' v1.1.4 lain 2019-11-05 12:02:45 +00:00
  • f11eebc183 Merge branch 'chore/bump-htmlentities' into 'develop' rinpatch 2019-11-05 10:01:29 +00:00
  • 9d3b12a658 Bump HtmlEntities to 0.5 rinpatch 2019-11-05 12:37:25 +03:00
  • e52955c961 update following_relationship.ex Maksim Pechnikov 2019-11-05 10:50:03 +03:00
  • 62bc0657e7 excluded invisible users from search results Maksim Pechnikov 2019-11-05 08:55:41 +03:00
  • 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset Maxim Filippov 2019-11-05 11:36:47 +10:00
  • 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-11-05 02:12:48 +03:00
  • 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id Maksim Pechnikov 2019-11-04 20:44:24 +03:00
  • b7de4ad082 Apply suggestion to CHANGELOG.md lain 2019-11-04 17:31:08 +00:00
  • ff6c727739 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-11-04 20:24:53 +03:00
  • 4388255eed Migrations: Don't copy over mutes unless there actually are some. lain 2019-11-04 18:13:37 +01:00
  • fee1276963 Merge branch 'failing-search-fixes' into 'develop' rinpatch 2019-11-04 16:28:55 +00:00
  • 478eb5944d Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop' lain 2019-11-04 15:59:36 +00:00
  • 4e53520917 User Search: Remove superfluous setweight and random test. lain 2019-11-04 16:57:41 +01:00
  • ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. eugenijm 2019-10-31 03:44:27 +03:00
  • 6a151e7c7f streamer: use direct object for filter checks when there is no valid child object in an activity Ariadne Conill 2019-11-03 09:05:12 -06:00
  • a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop' lain 2019-11-04 15:19:29 +00:00
  • f7f69356bd Merge branch 'missing-tesla-mocks' into 'develop' lain 2019-11-04 15:18:32 +00:00
  • 5271bbcf11 add missing tesla mocks Steven Fuchs 2019-11-04 15:18:32 +00:00
  • bec6d02f30 Merge branch 'chore/update-fast-sanitize' into 'develop' kaniini 2019-11-04 14:52:56 +00:00
  • 203d9812f0 mix: update fast_sanitize dependency to 1af67547 Ariadne Conill 2019-11-04 08:38:14 -06:00
  • 5f844fd3f2 Migrations: Add a fixup migration for the muted_notifications lain 2019-11-04 15:38:28 +01:00
  • 06cc77e6fb Merge branch 'faster-user-deactivation' into 'develop' kaniini 2019-11-04 14:24:21 +00:00
  • 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' lain 2019-11-04 14:11:44 +00:00
  • 0c31258616 User: Don't pull remote users follower count immediately after deactivating. lain 2019-11-04 14:36:54 +01:00
  • bab786cd93 Merge branch 'chore/update-fast-sanitize' into 'develop' kaniini 2019-11-03 22:00:50 +00:00
  • f42f300870 update fast sanitize dependency Ariadne Conill 2019-11-03 15:41:30 -06:00
  • 57995fa8cf fix migrate Maksim Pechnikov 2019-11-02 21:19:01 +03:00
  • 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop' rinpatch 2019-11-03 17:09:57 +00:00
  • 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop' kaniini 2019-11-03 16:19:27 +00:00
  • 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop' kaniini 2019-11-03 16:18:19 +00:00
  • 4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity Ariadne Conill 2019-11-03 09:05:12 -06:00
  • 9d8da9ea15 Merge branch 'fix/migration-schema' into 'develop' Haelwenn 2019-11-02 15:07:47 +00:00
  • 55ef88ef95 Bump fast_sanitize version rinpatch 2019-11-01 20:58:24 +03:00
  • 366ada7b29 Merge branch 'fix/moderation-log-crash' into 'develop' kaniini 2019-11-01 17:56:20 +00:00
  • ab5c8ec9fa Update docs Maxim Filippov 2019-11-01 20:26:52 +03:00
  • 10e9ba6340 Apply suggestion to CHANGELOG.md Maxim Filippov 2019-11-01 17:25:41 +00:00
  • 1b83a0694a Fix moderation log crash Maxim Filippov 2019-11-01 19:13:29 +03:00
  • 743b622b7b Force password reset for multiple users Maxim Filippov 2019-11-01 18:45:47 +03:00
  • 4bab9672ed Fix bookmark migration using a query with a schema rinpatch 2019-10-30 12:59:14 +03:00
  • 6f5ac0819a Tests: Fix tests failing because of info being null. lain 2019-11-01 14:16:00 +01:00
  • d52f9c144f Mixfile: Bump version. lain 2019-11-01 13:40:58 +01:00
  • 5b34545b64 Changelog: Add information about user.info migration. lain 2019-11-01 13:40:28 +01:00
  • 8ad75f9ecf Migrations: Add migration to fill empty info fields and make them non-null. lain 2019-11-01 13:31:55 +01:00
  • d75934b0d0 Undo dialyzer fix Maxim Filippov 2019-11-01 15:14:43 +03:00
  • 1a60215076 Merge branch 'fix-recipients-from-activity' into 'develop' kaniini 2019-11-01 12:06:44 +00:00
  • fd8099fb68 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-10-31 21:09:46 +03:00
  • 1b3a942a84 fix format Maksim Pechnikov 2019-10-31 17:36:59 +03:00
  • 58da7f6620 updated docs\changelog Maksim Pechnikov 2019-10-31 17:34:17 +03:00
  • e14cae25aa Merge branch 'refactor/db-add-defaults' into 'develop' lain 2019-10-31 13:34:57 +00:00
  • ced9f92327 Fix count Maxim Filippov 2019-10-31 15:34:49 +03:00
  • 6f9d3d30fa AdminAPI: Omit relay user from users list Maxim Filippov 2019-10-31 02:26:02 +03:00
  • 59a149c69a Fix "the call ... will never return" warning Maxim Filippov 2019-10-31 02:25:15 +03:00
  • bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux Mark Felder 2019-10-30 17:57:08 -05:00
  • fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize Mark Felder 2019-10-30 17:51:15 -05:00
  • 209319c8d2 update marker api Maksim Pechnikov 2019-10-30 23:49:05 +03:00
  • 1b82eb6d41 move sql (update_markers) from migrate to mix task Maksim Pechnikov 2019-10-30 23:22:38 +03:00
  • d719078699 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-10-30 23:07:18 +03:00
  • 8bb6da7cd6 Remove following column from the migrations Roman Chvanikov 2019-10-30 18:34:14 +03:00