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

Commit Graph

  • 28701c08ad Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-17 08:56:03 +03:00
  • 7d2d8a2a7d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-15 22:06:45 -06:00
  • 472132215e Use floki's new APIs for parsing fragments rinpatch 2020-02-16 01:55:26 +03:00
  • 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 +03:00
  • 0b5a2bbe5b Merge branch 'bugfix/link-preview-site_name' into 'develop' lain 2020-02-15 12:56:32 +00:00
  • 1257331291
         MastodonAPI.StatusView: Do not use site_name Haelwenn (lanodan) Monnier 2020-02-15 00:35:46 +01:00
  • 16bf20e3bb updates to neckbeard Your New SJW Waifu 2020-02-14 16:05:29 -06:00
  • 631eed8799 Merge branch 'chores/deps-to-hexpm' into 'develop' rinpatch 2020-02-14 18:25:54 +00:00
  • a4a90ae422
         Update all dependencies Haelwenn (lanodan) Monnier 2020-02-14 19:15:59 +01:00
  • 04139c28fe
         mix.exs: Move ex_syslogger and recon to hexpm Haelwenn (lanodan) Monnier 2020-02-14 19:08:37 +01:00
  • 5fcee577f9 Merge branch 'update/ferd/recon' into 'develop' Haelwenn 2020-02-14 17:58:26 +00:00
  • 282bb5f8df Merge branch 'develop' into contextes-boundaries rustra 2020-02-14 18:26:54 +01:00
  • 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 -06:00
  • 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 -06:00
  • 478619782b Standardize @behaviour usage in MRFs Mark Felder 2020-02-14 11:02:24 -06:00
  • 6caf6a86c5 Apply suggestion to docs/configuration/mrf.md feld 2020-02-14 16:55:52 +00:00
  • 88a76d0142 Update suggested path for location of your custom MRF Mark Felder 2020-02-14 10:55:18 -06:00
  • 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 -06:00
  • 0ddcd67d32
         Update cheatsheet.md and config/description.exs Egor Kislitsyn 2020-02-14 16:53:53 +04:00
  • 3732b0ba72
         Update CHANGELOG Egor Kislitsyn 2020-02-14 16:39:02 +04:00
  • 57878f8708
         Improve readability Egor Kislitsyn 2020-02-14 15:50:31 +04:00
  • e2d358f1fb
         Fix typo Egor Kislitsyn 2020-02-14 15:19:23 +04:00
  • 2c95b0fab9 Make the sample code actually compile Mark Felder 2020-02-13 15:19:01 -06:00
  • 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 +03:00
  • 4d459b0e99
         Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4 Egor Kislitsyn 2020-02-12 22:51:26 +04:00
  • 241a3d744a
         Add ActivityExpirationPolicy Egor Kislitsyn 2020-02-11 13:53:24 +04:00
  • 0afff36cda Formatting got me again Mark Felder 2020-02-13 12:09:11 -06:00
  • 9906c6fb6f Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' rinpatch 2020-02-13 18:08:43 +00:00
  • 21dc3e3812 Even more description improvements Mark Felder 2020-02-13 12:01:13 -06:00
  • 6846202b51 Merge branch 'develop' into issue/1469 Maksim Pechnikov 2020-02-13 20:52:21 +03:00
  • aac7f30eb2 Add missing Oban job for attachments_cleanup Mark Felder 2020-02-13 11:49:19 -06:00
  • 1c52cf933f More description cleanup work Mark Felder 2020-02-13 11:45:58 -06:00
  • 6f9839c73c Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-13 20:43:34 +03:00
  • 9218f893d7 More description cleanups Mark Felder 2020-02-13 11:31:02 -06:00
  • 18a56410b8 Merge branch 'fix/rename-no_attachment_links-setting' into 'develop' lain 2020-02-13 17:17:43 +00:00
  • 07a251d77e Merge branch 'develop' into contextes-boundaries rustra 2020-02-13 18:02:47 +01:00
  • 9bb66c0b65 Merge branch 'chore/fast-sanitize-bump-back' into 'develop' rinpatch 2020-02-13 16:55:36 +00:00
  • 23049a077e NodeInfo: Fix federating status not being reported when MRF transparency is disabled rinpatch 2020-02-13 19:53:39 +03:00
  • 070069125f deps: update back fast sanitize rinpatch 2020-02-13 19:47:39 +03:00
  • b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' feld 2020-02-13 14:37:55 +00:00
  • 0db88f547b Merge branch 'chore/config-descriptions' into 'develop' feld 2020-02-13 14:20:30 +00:00
  • 182a106746 Merge branch 'fix/status_expires_in_validation' into 'develop' feld 2020-02-13 14:03:59 +00:00
  • 571a475c7e Formatting Mark Felder 2020-02-13 08:02:33 -06:00
  • 9b778dc54a Formatting Mark Felder 2020-02-13 08:01:39 -06:00
  • 4f5ee26f2d Update description.exs feld 2020-02-13 14:00:33 +00:00
  • e4016f4dbd Apply suggestion to config/description.exs feld 2020-02-13 13:59:47 +00:00
  • 1289ee8d61 Merge branch 'develop' into issue/1469 Maksim Pechnikov 2020-02-13 09:26:06 +03:00
  • da44ee5b0f Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-13 09:20:34 +03:00
  • 812509367b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-12 17:00:40 -06:00
  • 19516af74e
         Fix status.expires_in validation Egor Kislitsyn 2020-02-12 19:43:07 +04:00
  • 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 -06:00
  • 3a9ea009ac Merge branch 'develop' into contextes-boundaries rustra 2020-02-11 22:32:24 +01:00
  • 9581d57382 First round at cleaning up descriptions Mark Felder 2020-02-11 15:21:36 -06:00
  • d056f7f722 Merge branch 'restore-twitter-api-tests' into 'develop' feld 2020-02-11 21:08:37 +00:00
  • 58b2017aa0
         Restore TwitterAPI tests Egor Kislitsyn 2020-02-12 00:51:05 +04:00
  • f98090272a Merge branch 'update/admin-fe-20200211' into 'develop' feld 2020-02-11 20:08:28 +00:00
  • 50d9fcbe29
         Hotlink logo instead of attachment Egor Kislitsyn 2020-02-11 23:33:05 +04:00
  • 98eb18e385 deps: update fast_html to 1.0.3 floki-fast_html-2-electric-boogalo rinpatch 2020-02-11 21:44:53 +03:00
  • cfaaea7a49 Revert "Merge branch 'revert-3fee859b' into 'develop'" rinpatch 2020-02-11 21:44:33 +03:00
  • 01984d15ce Merge branch 'revert-3fee859b' into 'develop' lain 2020-02-11 17:09:48 +00:00
  • 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" feld 2020-02-11 16:55:18 +00:00
  • f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 Mark Felder 2020-02-11 10:33:41 -06:00
  • de0fea4634 Update AdminFE build Mark Felder 2020-02-11 10:24:38 -06:00
  • a558d64813 Merge branch 'develop' into contextes-boundaries rustra 2020-02-11 14:23:23 +01:00
  • 3fee859b60 Merge branch 'feat/floki-fasthtml' into 'develop' lain 2020-02-11 13:22:35 +00:00
  • f694ca6536 Apply suggestion to docs/administration/CLI_tasks/frontend.md lain 2020-02-11 13:19:01 +00:00
  • ea1631d7e6 Make Floki use fast_html rinpatch 2020-02-11 00:29:25 +03:00
  • 58299fcfb4 deps: update fast_sanitize to 0.1.7 rinpatch 2020-02-11 00:16:13 +03:00
  • 9172540f8d deps: update floki to 0.25.0 rinpatch 2020-02-10 21:52:01 +03:00
  • 4125b4cc8e Merge branch 'develop' into contextes-boundaries rustra 2020-02-11 14:15:30 +01:00
  • 8f070684ab Merge branch 'develop' into contextes-boundaries rustra 2020-02-11 14:14:18 +01:00
  • 335cbe2e1b Merge branch 'uguu-uwu-notices-bulge' into 'develop' lain 2020-02-11 13:14:05 +00:00
  • 60de311164 Update frontend lain 2020-02-11 13:59:04 +01:00
  • 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge lain 2020-02-11 13:58:36 +01:00
  • 2f1c61255f Merge branch 'doc/unlisted-search' into 'develop' lain 2020-02-11 11:44:33 +00:00
  • 36c6dc1c10 Merge branch 'oban-crontab-fix' into 'develop' lain 2020-02-11 09:55:16 +00:00
  • 6875ccb6bf
         Merge branch 'develop' into feature/new-registrations-digest Egor Kislitsyn 2020-02-11 13:54:55 +04:00
  • bfd16fe41e
         set oban crontab to false in tests Alexander Strizhakov 2020-02-11 12:19:06 +03:00
  • 507d3517a1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-11 02:46:18 -06:00
  • 5ebffd5224 Merge branch 'docs/kyclos' into 'develop' lain 2020-02-11 08:04:58 +00:00
  • 58574ef156 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-11 08:35:26 +03:00
  • 3d7cd99316 Merge branch 'develop' into issue/1469 Maksim Pechnikov 2020-02-11 08:24:36 +03:00
  • 209e4d8432
         clients.md: Add Kyclos Haelwenn (lanodan) Monnier 2020-02-11 02:27:40 +01:00
  • ad16f38b9c
         differences_in_mastoapi_responses.md: Add note about unlisted results Haelwenn (lanodan) Monnier 2020-02-11 01:58:35 +01:00
  • 94e5ca1105 Merge branch 'issue/1383' into 'develop' rinpatch 2020-02-11 00:04:06 +00:00
  • a7287e2e3a Merge branch 'docs_backup_restore' into 'develop' Haelwenn 2020-02-10 23:53:26 +00:00
  • a9e946b99a DOCS Backup/Restore/Migrate your instance Ilja 2020-02-10 23:53:26 +00:00
  • 32a7b4dadd Merge branch 'fix/compilation-error-docs' into 'develop' rinpatch 2020-02-10 18:25:12 +00:00
  • 6813c0302c Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-02-10 20:49:20 +03:00
  • c55301e760 Fix a compilation error under certain circumstances rinpatch 2020-02-10 18:28:30 +03:00
  • b95dd5e217 [#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message. Ivan Tashkinov 2020-02-10 11:46:16 +03:00
  • 3830cb538b removed a comments Maksim Pechnikov 2020-02-10 09:14:15 +03:00
  • cd040691bd maked unread_count as virtual field Maksim Pechnikov 2020-02-10 09:01:45 +03:00
  • b87533760b Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-10 07:59:52 +03:00
  • 24e49d14f2 [#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests. Ivan Tashkinov 2020-02-09 17:34:48 +03:00
  • 42f76306e7 Merge branch 'release/1.1.9' into 'stable' v1.1.9 rinpatch 2020-02-09 12:15:52 +00:00
  • 544bdbfb90 Merge branch 'fix/email-task-otp' into 'develop' rinpatch 2020-02-09 12:05:32 +00:00
  • 6ea3c06d8d [#1505] Minor refactoring. Ivan Tashkinov 2020-02-09 14:09:01 +03:00
  • 06fec99e1d mix.exs: bump version to 1.1.9 rinpatch 2020-02-09 12:19:47 +03:00
  • 7c3991f59e [#1505] Fixed replies serialization (included objects' ids instead of activities' ids). Ivan Tashkinov 2020-02-09 10:17:21 +03:00