Commit graph

  • cf94349287 Merge branch 'develop' into gun Mark Felder 2020-02-18 09:06:27 -0600
  • cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop' lain 2020-02-18 14:56:59 +0000
  • 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks Ivan Tashkinov 2020-02-18 17:52:31 +0300
  • 61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-18 17:46:09 +0300
  • 3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop' lain 2020-02-18 14:36:10 +0000
  • c07efd5b42 Merge branch 'need-reboot-flag' into 'develop' lain 2020-02-18 14:32:03 +0000
  • ca7ac068f0
    Add a test Egor Kislitsyn 2020-02-18 17:09:50 +0400
  • fb6c2576dc Merge branch 'chore/floki-update' into 'develop' lain 2020-02-18 13:09:37 +0000
  • 2ef70b55f5
    Fix status.expires_at type Egor Kislitsyn 2020-02-18 14:52:11 +0400
  • 514c899275
    adding gun adapter Alexander Strizhakov 2020-02-11 10:12:57 +0300
  • 962eb8d4ac Merge branch 'update/admin-fe-20200217' into 'develop' feld 2020-02-17 22:22:53 +0000
  • 6a97c1b9ff Update adminFE build Mark Felder 2020-02-17 15:50:45 -0600
  • 81cc9dd085 Merge branch 'develop' into chore/floki-update Mark Felder 2020-02-17 14:13:05 -0600
  • 5178c8dbc3 Merge branch 'upgrade_crypto' into 'develop' rinpatch 2020-02-17 11:13:37 +0000
  • 7df13e6f3a Update plug_crypto lain 2020-02-17 11:41:14 +0100
  • 02809dc276 Merge branch 'feat/git-attributes-elixir' into 'develop' rinpatch 2020-02-17 10:34:32 +0000
  • b4b472d782 .gitattributes: use native support for elixir definitions rinpatch 2020-02-17 13:19:04 +0300
  • 28701c08ad Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-17 08:56:03 +0300
  • 472132215e Use floki's new APIs for parsing fragments rinpatch 2020-02-16 01:55:26 +0300
  • 269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). Ivan Tashkinov 2020-02-15 20:41:38 +0300
  • 0b5a2bbe5b Merge branch 'bugfix/link-preview-site_name' into 'develop' lain 2020-02-15 12:56:32 +0000
  • 1257331291
    MastodonAPI.StatusView: Do not use site_name Haelwenn (lanodan) Monnier 2020-02-15 00:35:46 +0100
  • 631eed8799 Merge branch 'chores/deps-to-hexpm' into 'develop' rinpatch 2020-02-14 18:25:54 +0000
  • a4a90ae422
    Update all dependencies Haelwenn (lanodan) Monnier 2020-02-14 19:15:59 +0100
  • 04139c28fe
    mix.exs: Move ex_syslogger and recon to hexpm Haelwenn (lanodan) Monnier 2020-02-14 19:08:37 +0100
  • 5fcee577f9 Merge branch 'update/ferd/recon' into 'develop' Haelwenn 2020-02-14 17:58:26 +0000
  • 589bffa57d Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc Mark Felder 2020-02-14 11:06:04 -0600
  • 31749559e1 Fix MRF docs further. I don't think anyone has actually tested with the old docs. Mark Felder 2020-02-14 11:04:27 -0600
  • 478619782b Standardize @behaviour usage in MRFs Mark Felder 2020-02-14 11:02:24 -0600
  • 6caf6a86c5 Apply suggestion to docs/configuration/mrf.md feld 2020-02-14 16:55:52 +0000
  • 88a76d0142 Update suggested path for location of your custom MRF Mark Felder 2020-02-14 10:55:18 -0600
  • 0b19fcdda1 Update ferd/recon, requested by @tk to support an AMPQ library he's integrating with an MRF. Mark Felder 2020-02-14 10:16:12 -0600
  • 0ddcd67d32
    Update cheatsheet.md and config/description.exs Egor Kislitsyn 2020-02-14 16:53:53 +0400
  • 3732b0ba72
    Update CHANGELOG Egor Kislitsyn 2020-02-14 16:39:02 +0400
  • 57878f8708
    Improve readability Egor Kislitsyn 2020-02-14 15:50:31 +0400
  • e2d358f1fb
    Fix typo Egor Kislitsyn 2020-02-14 15:19:23 +0400
  • 2c95b0fab9 Make the sample code actually compile Mark Felder 2020-02-13 15:19:01 -0600
  • 4f8c3462a8 Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution. Ivan Tashkinov 2020-02-13 21:55:47 +0300
  • 4d459b0e99
    Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4 Egor Kislitsyn 2020-02-12 22:51:26 +0400
  • 241a3d744a
    Add ActivityExpirationPolicy Egor Kislitsyn 2020-02-11 13:53:24 +0400
  • 0afff36cda Formatting got me again Mark Felder 2020-02-13 12:09:11 -0600
  • 9906c6fb6f Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' rinpatch 2020-02-13 18:08:43 +0000
  • 21dc3e3812 Even more description improvements Mark Felder 2020-02-13 12:01:13 -0600
  • aac7f30eb2 Add missing Oban job for attachments_cleanup Mark Felder 2020-02-13 11:49:19 -0600
  • 1c52cf933f More description cleanup work Mark Felder 2020-02-13 11:45:58 -0600
  • 6f9839c73c Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-13 20:43:34 +0300
  • 9218f893d7 More description cleanups Mark Felder 2020-02-13 11:31:02 -0600
  • 18a56410b8 Merge branch 'fix/rename-no_attachment_links-setting' into 'develop' lain 2020-02-13 17:17:43 +0000
  • 9bb66c0b65 Merge branch 'chore/fast-sanitize-bump-back' into 'develop' rinpatch 2020-02-13 16:55:36 +0000
  • 23049a077e NodeInfo: Fix federating status not being reported when MRF transparency is disabled rinpatch 2020-02-13 19:53:39 +0300
  • 070069125f deps: update back fast sanitize rinpatch 2020-02-13 19:47:39 +0300
  • b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' feld 2020-02-13 14:37:55 +0000
  • 0db88f547b Merge branch 'chore/config-descriptions' into 'develop' feld 2020-02-13 14:20:30 +0000
  • 182a106746 Merge branch 'fix/status_expires_in_validation' into 'develop' feld 2020-02-13 14:03:59 +0000
  • 571a475c7e Formatting Mark Felder 2020-02-13 08:02:33 -0600
  • 9b778dc54a Formatting Mark Felder 2020-02-13 08:01:39 -0600
  • 4f5ee26f2d Update description.exs feld 2020-02-13 14:00:33 +0000
  • e4016f4dbd Apply suggestion to config/description.exs feld 2020-02-13 13:59:47 +0000
  • da44ee5b0f Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-13 09:20:34 +0300
  • 19516af74e
    Fix status.expires_in validation Egor Kislitsyn 2020-02-12 19:43:07 +0400
  • ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links" The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare. Mark Felder 2020-02-11 15:39:19 -0600
  • 9581d57382 First round at cleaning up descriptions Mark Felder 2020-02-11 15:21:36 -0600
  • d056f7f722 Merge branch 'restore-twitter-api-tests' into 'develop' feld 2020-02-11 21:08:37 +0000
  • 58b2017aa0
    Restore TwitterAPI tests Egor Kislitsyn 2020-02-12 00:51:05 +0400
  • f98090272a Merge branch 'update/admin-fe-20200211' into 'develop' feld 2020-02-11 20:08:28 +0000
  • 50d9fcbe29
    Hotlink logo instead of attachment Egor Kislitsyn 2020-02-11 23:33:05 +0400
  • 01984d15ce Merge branch 'revert-3fee859b' into 'develop' lain 2020-02-11 17:09:48 +0000
  • 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" feld 2020-02-11 16:55:18 +0000
  • f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 Mark Felder 2020-02-11 10:33:41 -0600
  • de0fea4634 Update AdminFE build Mark Felder 2020-02-11 10:24:38 -0600
  • 3fee859b60 Merge branch 'feat/floki-fasthtml' into 'develop' lain 2020-02-11 13:22:35 +0000
  • ea1631d7e6 Make Floki use fast_html rinpatch 2020-02-11 00:29:25 +0300
  • 58299fcfb4 deps: update fast_sanitize to 0.1.7 rinpatch 2020-02-11 00:16:13 +0300
  • 9172540f8d deps: update floki to 0.25.0 rinpatch 2020-02-10 21:52:01 +0300
  • 335cbe2e1b Merge branch 'uguu-uwu-notices-bulge' into 'develop' lain 2020-02-11 13:14:05 +0000
  • 60de311164 Update frontend lain 2020-02-11 13:59:04 +0100
  • 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge lain 2020-02-11 13:58:36 +0100
  • 2f1c61255f Merge branch 'doc/unlisted-search' into 'develop' lain 2020-02-11 11:44:33 +0000
  • 36c6dc1c10 Merge branch 'oban-crontab-fix' into 'develop' lain 2020-02-11 09:55:16 +0000
  • 6875ccb6bf
    Merge branch 'develop' into feature/new-registrations-digest Egor Kislitsyn 2020-02-11 13:54:55 +0400
  • bfd16fe41e
    set oban crontab to false in tests Alexander Strizhakov 2020-02-11 12:19:06 +0300
  • 5ebffd5224 Merge branch 'docs/kyclos' into 'develop' lain 2020-02-11 08:04:58 +0000
  • 58574ef156 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-11 08:35:26 +0300
  • 209e4d8432
    clients.md: Add Kyclos Haelwenn (lanodan) Monnier 2020-02-11 02:27:40 +0100
  • ad16f38b9c
    differences_in_mastoapi_responses.md: Add note about unlisted results Haelwenn (lanodan) Monnier 2020-02-11 01:58:35 +0100
  • 94e5ca1105 Merge branch 'issue/1383' into 'develop' rinpatch 2020-02-11 00:04:06 +0000
  • a7287e2e3a Merge branch 'docs_backup_restore' into 'develop' Haelwenn 2020-02-10 23:53:26 +0000
  • a9e946b99a DOCS Backup/Restore/Migrate your instance Ilja 2020-02-10 23:53:26 +0000
  • 32a7b4dadd Merge branch 'fix/compilation-error-docs' into 'develop' rinpatch 2020-02-10 18:25:12 +0000
  • 6813c0302c Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-02-10 20:49:20 +0300
  • c55301e760 Fix a compilation error under certain circumstances rinpatch 2020-02-10 18:28:30 +0300
  • b95dd5e217 [#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message. Ivan Tashkinov 2020-02-10 11:46:16 +0300
  • 3830cb538b removed a comments Maksim Pechnikov 2020-02-10 09:14:15 +0300
  • cd040691bd maked unread_count as virtual field Maksim Pechnikov 2020-02-10 09:01:45 +0300
  • b87533760b Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-10 07:59:52 +0300
  • 1b03dc2031 fe sadposter 2020-02-09 18:19:14 +0000
  • 7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-02-09 18:12:40 +0000
  • 57b3925a88 fe sadposter 2020-02-09 18:12:09 +0000
  • 24e49d14f2 [#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests. Ivan Tashkinov 2020-02-09 17:34:48 +0300
  • 42f76306e7 Merge branch 'release/1.1.9' into 'stable' rinpatch 2020-02-09 12:15:52 +0000