Commit graph

  • be6e5e017e Merge branch 'fix/object-reinject-set-cache' into 'develop' rinpatch 2019-11-06 11:20:34 +0000
  • 54746c6c26 Object Fetcher: set cache after reinjecting rinpatch 2019-11-06 14:00:03 +0300
  • efc4d6d9ec Merge branch 'ci/remove-docs-build' into 'develop' Haelwenn 2019-11-06 01:13:20 +0000
  • d5dc0c4a7e CI: Remove the docs-build job rinpatch 2019-11-05 23:45:07 +0300
  • e1fc6cb78f Check client and token in GET /oauth/authorize AkiraFukushima 2019-11-05 23:52:47 +0900
  • 1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel lain 2019-11-05 15:21:00 +0100
  • faced6236b NoteValidator: Add very basic validator for Note objects. lain 2019-11-05 15:02:31 +0100
  • 3d1b445cbf Object Validators: Extract common validations. lain 2019-11-05 15:02:09 +0100
  • 21716aa594 Merge branch 'release/1.1.4' into 'stable' v1.1.4 lain 2019-11-05 12:02:45 +0000
  • f11eebc183 Merge branch 'chore/bump-htmlentities' into 'develop' rinpatch 2019-11-05 10:01:29 +0000
  • 9d3b12a658 Bump HtmlEntities to 0.5 rinpatch 2019-11-05 12:37:25 +0300
  • e52955c961 update following_relationship.ex Maksim Pechnikov 2019-11-05 10:50:03 +0300
  • 62bc0657e7 excluded invisible users from search results Maksim Pechnikov 2019-11-05 08:55:41 +0300
  • 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset Maxim Filippov 2019-11-05 11:36:47 +1000
  • 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-11-05 02:12:48 +0300
  • 9bc70ca0c1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-11-04 18:20:19 +0000
  • 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id Maksim Pechnikov 2019-11-04 20:44:24 +0300
  • b7de4ad082 Apply suggestion to CHANGELOG.md lain 2019-11-04 17:31:08 +0000
  • ff6c727739 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-11-04 20:24:53 +0300
  • 4388255eed Migrations: Don't copy over mutes unless there actually are some. lain 2019-11-04 18:13:37 +0100
  • fee1276963 Merge branch 'failing-search-fixes' into 'develop' rinpatch 2019-11-04 16:28:55 +0000
  • 478eb5944d Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop' lain 2019-11-04 15:59:36 +0000
  • 4e53520917 User Search: Remove superfluous setweight and random test. lain 2019-11-04 16:57:41 +0100
  • ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. eugenijm 2019-10-31 03:44:27 +0300
  • 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 -0600
  • a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop' lain 2019-11-04 15:19:29 +0000
  • f7f69356bd Merge branch 'missing-tesla-mocks' into 'develop' lain 2019-11-04 15:18:32 +0000
  • 5271bbcf11 add missing tesla mocks Steven Fuchs 2019-11-04 15:18:32 +0000
  • bec6d02f30 Merge branch 'chore/update-fast-sanitize' into 'develop' kaniini 2019-11-04 14:52:56 +0000
  • 203d9812f0 mix: update fast_sanitize dependency to 1af67547 Ariadne Conill 2019-11-04 08:38:14 -0600
  • 5f844fd3f2 Migrations: Add a fixup migration for the muted_notifications lain 2019-11-04 15:38:28 +0100
  • 06cc77e6fb Merge branch 'faster-user-deactivation' into 'develop' kaniini 2019-11-04 14:24:21 +0000
  • 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' lain 2019-11-04 14:11:44 +0000
  • 0c31258616 User: Don't pull remote users follower count immediately after deactivating. lain 2019-11-04 14:36:54 +0100
  • bab786cd93 Merge branch 'chore/update-fast-sanitize' into 'develop' kaniini 2019-11-03 22:00:50 +0000
  • f42f300870 update fast sanitize dependency Ariadne Conill 2019-11-03 15:41:30 -0600
  • 57995fa8cf fix migrate Maksim Pechnikov 2019-11-02 21:19:01 +0300
  • 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop' rinpatch 2019-11-03 17:09:57 +0000
  • 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop' kaniini 2019-11-03 16:19:27 +0000
  • 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop' kaniini 2019-11-03 16:18:19 +0000
  • 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 -0600
  • 9d8da9ea15 Merge branch 'fix/migration-schema' into 'develop' Haelwenn 2019-11-02 15:07:47 +0000
  • 55ef88ef95 Bump fast_sanitize version rinpatch 2019-11-01 20:58:24 +0300
  • 366ada7b29 Merge branch 'fix/moderation-log-crash' into 'develop' kaniini 2019-11-01 17:56:20 +0000
  • ab5c8ec9fa Update docs Maxim Filippov 2019-11-01 20:26:52 +0300
  • 10e9ba6340 Apply suggestion to CHANGELOG.md Maxim Filippov 2019-11-01 17:25:41 +0000
  • 1b83a0694a Fix moderation log crash Maxim Filippov 2019-11-01 19:13:29 +0300
  • 743b622b7b Force password reset for multiple users Maxim Filippov 2019-11-01 18:45:47 +0300
  • 4bab9672ed Fix bookmark migration using a query with a schema rinpatch 2019-10-30 12:59:14 +0300
  • 6f5ac0819a Tests: Fix tests failing because of info being null. lain 2019-11-01 14:16:00 +0100
  • d52f9c144f Mixfile: Bump version. lain 2019-11-01 13:40:58 +0100
  • 5b34545b64 Changelog: Add information about user.info migration. lain 2019-11-01 13:40:28 +0100
  • 8ad75f9ecf Migrations: Add migration to fill empty info fields and make them non-null. lain 2019-11-01 13:31:55 +0100
  • d75934b0d0 Undo dialyzer fix Maxim Filippov 2019-11-01 15:14:43 +0300
  • 1a60215076 Merge branch 'fix-recipients-from-activity' into 'develop' kaniini 2019-11-01 12:06:44 +0000
  • fd8099fb68 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-10-31 21:09:46 +0300
  • 1b3a942a84 fix format Maksim Pechnikov 2019-10-31 17:36:59 +0300
  • 58da7f6620 updated docs\changelog Maksim Pechnikov 2019-10-31 17:34:17 +0300
  • e14cae25aa Merge branch 'refactor/db-add-defaults' into 'develop' lain 2019-10-31 13:34:57 +0000
  • ced9f92327 Fix count Maxim Filippov 2019-10-31 15:34:49 +0300
  • 6f9d3d30fa AdminAPI: Omit relay user from users list Maxim Filippov 2019-10-31 02:26:02 +0300
  • 59a149c69a Fix "the call ... will never return" warning Maxim Filippov 2019-10-31 02:25:15 +0300
  • bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux Mark Felder 2019-10-30 17:57:08 -0500
  • fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize Mark Felder 2019-10-30 17:51:15 -0500
  • 209319c8d2 update marker api Maksim Pechnikov 2019-10-30 23:49:05 +0300
  • 1b82eb6d41 move sql (update_markers) from migrate to mix task Maksim Pechnikov 2019-10-30 23:22:38 +0300
  • d719078699 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-10-30 23:07:18 +0300
  • 8bb6da7cd6 Remove following column from the migrations Roman Chvanikov 2019-10-30 18:34:14 +0300
  • 61fc739ab8
    Handle "Move" activity Egor Kislitsyn 2019-10-30 18:21:49 +0700
  • d1ae51b02a Update test for get_recipients_from_activity kPherox 2019-10-30 20:14:07 +0900
  • 9b40e5f563 Merge branch 'fix/blocked-follows' into 'develop' rinpatch 2019-10-30 10:59:25 +0000
  • c546da7cfe Fix bookmark migration using a query with a schema rinpatch 2019-10-30 12:59:14 +0300
  • 83a9ec228e tos sadposter 2019-10-30 09:26:23 +0000
  • 40d5fb6ef8
    Add a migration to fix blocked follows Egor Kislitsyn 2019-10-30 15:52:37 +0700
  • 363e76d4da Fix duplicate recipients kPherox 2019-10-30 15:40:25 +0900
  • ae59b38203 Rip out the rest of htmlsanitizeex rinpatch 2019-10-30 09:20:13 +0300
  • b27a92e8fa Merge branch 'develop' into issue/1276 Maksim Pechnikov 2019-10-29 22:23:19 +0300
  • 77cfb08b8c Remove commented-out code rinpatch 2019-10-29 20:58:54 +0300
  • 61400d7eb7 Fix XSS emoji test rinpatch 2019-10-29 20:49:32 +0300
  • eba8acff09 Merge branch 'fix/migrations-same-module-name' into 'develop' rinpatch 2019-10-29 14:17:09 +0000
  • 7358cf1f20 Bump fast_sanitize dependency rinpatch 2019-10-29 17:00:03 +0300
  • 3e09b7c5ae Fix two migrations sharing the same module name rinpatch 2019-10-29 16:56:24 +0300
  • bea4a82d1e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-29 13:12:38 +0000
  • 07c7f16356 Merge branch 'fix-follow-requests' into 'develop' rinpatch 2019-10-29 11:24:07 +0000
  • e50d018bfe fe sadposter 2019-10-29 11:01:50 +0000
  • 55ce1daeaf Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-29 10:47:37 +0000
  • 5334190056
    Migrate missing follow requests kPherox 2019-10-29 19:16:34 +0900
  • 41c23251f1 Bump fast_sanitize version rinpatch 2019-10-29 13:05:20 +0300
  • c2f2d7bcf6 Add test follow activity for locked account kPherox 2019-10-29 18:46:22 +0900
  • 0c361eeb25
    Add pending to handle incoming for Follow activity kPherox 2019-10-29 17:12:49 +0900
  • 9cde3321a3 Add fast_sanitize to dependencies rinpatch 2019-10-29 01:21:00 +0300
  • 08f6837065 Switch from HtmlSanitizeEx to FastSanitize rinpatch 2019-10-29 01:18:08 +0300
  • 2453928b57 Ensure myhtmlex is started before swarm rinpatch 2019-10-29 01:16:57 +0300
  • 9434e151a9 Blacklist myhtmlex nodes from swarm rinpatch 2019-10-29 01:16:22 +0300
  • 05d111b622 Use the default scrubber before mediaproxy transformation rinpatch 2019-10-29 01:15:28 +0300
  • 56e42602b0 capture where errors are expected stwf 2019-10-28 12:51:58 -0400
  • 435d220700 Move setDefaultsToTables to past to run before notNull migrations Roman Chvanikov 2019-10-28 19:17:50 +0300
  • 4b0893631f Complete defaults Roman Chvanikov 2019-10-28 19:16:19 +0300
  • 4270861085
    Merge branch 'develop' into feature/move-activity Egor Kislitsyn 2019-10-28 15:10:47 +0700
  • e80f90e9db Merge branch 'fix/migration' into 'develop' lain 2019-10-28 08:05:14 +0000