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

Commit Graph

  • c533434d09 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-25 15:22:20 -06:00
  • 359faa8645 instance.gen task: remind to transfer the config to the database after migrations rinpatch 2020-02-25 22:13:08 +03:00
  • cfa28dee32 instance.gen task: make instance name default to the domain rinpatch 2020-02-25 21:59:37 +03:00
  • 8b4d1a0b29 Merge branch 'fix/dialyzer-warnings' into 'develop' rinpatch 2020-02-25 18:56:37 +00:00
  • 2cd253f6d5 Merge branch 'merge/admin-fe-20200225' into 'develop' feld 2020-02-25 17:14:54 +00:00
  • 554bc88e8a Update AdminFE build Mark Felder 2020-02-25 11:08:35 -06:00
  • 97dae77240 Merge branch 'token-web-push-test' into 'develop' feld 2020-02-25 16:06:06 +00:00
  • 6b012ddd69
         some docs Alexander Strizhakov 2020-02-25 19:01:29 +03:00
  • 1c05ff7c06
         relay list shows hosts without accepted follow relay-list-change-for-stable Alexander Strizhakov 2020-02-25 17:58:15 +03:00
  • 22018adae6
         Fix Dialyzer warnings Egor Kislitsyn 2020-02-25 18:34:56 +04:00
  • c495e6d387
         Add a test to ensure OAuth tokens are tied to Push subscriptions Egor Kislitsyn 2020-02-25 18:04:28 +04:00
  • 87e8d792bd Merge branch 'test-fix' into 'develop' lain 2020-02-25 12:26:39 +00:00
  • 3eccdd15aa
         compile fix Alexander Strizhakov 2020-02-25 15:19:52 +03:00
  • 2afa6d38cf Activity: Use more sensible block query make-hashtags-fast-again lain 2020-02-25 13:14:05 +01:00
  • e4804137b3 Document database default changes lain 2020-02-25 11:51:01 +01:00
  • f71aa644b1 Add :unnamed option to default database configuration lain 2020-02-25 11:17:51 +01:00
  • 252a65dc18 Merge branch 'develop' into issue/1469 Maksim Pechnikov 2020-02-25 09:24:13 +03:00
  • 10f452ad1f Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-25 07:15:33 +03:00
  • 3bbfa9c0c1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-24 19:06:21 -06:00
  • e025ce0d94 Merge branch 'develop' into contextes-boundaries rustra 2020-02-25 01:36:50 +01:00
  • 035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' rinpatch 2020-02-24 20:52:10 +00:00
  • 5e4fe0e8f7 instance.gen task: fix crash when using custom static directory rinpatch 2020-02-24 22:52:38 +03:00
  • 908b6ee49a Merge branch 'status-visibility-count-stats' into 'develop' Haelwenn 2020-02-24 19:21:29 +00:00
  • 7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope eugenijm 2020-01-09 22:18:55 +03:00
  • d240ce41b5 Merge branch 'theming_your_instance' into 'develop' lain 2020-02-24 17:48:18 +00:00
  • c0146f4859 DOCS Theming your instance Ilja 2020-02-24 17:48:18 +00:00
  • 8efae966b1
         open conn in separate task Alexander Strizhakov 2020-02-24 19:56:27 +03:00
  • 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' lain 2020-02-24 14:54:22 +00:00
  • 1e1156b645 Merge branch '1505-threads-federation' into 'develop' Haelwenn 2020-02-24 07:28:35 +00:00
  • f9fe6a9e30
         Captcha: return invalid when answer_data is nil Haelwenn (lanodan) Monnier 2020-02-24 02:41:48 +01:00
  • ee57663d34
         captcha_test.exs: Use the same testing logic in Kocaptcha and native Haelwenn (lanodan) Monnier 2020-02-24 01:27:16 +01:00
  • 2dbc5a6fc5 Don't rename migration modules rustra 2020-02-23 17:15:22 +01:00
  • 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. Ivan Tashkinov 2020-02-22 19:48:41 +03:00
  • 0a1daacd71 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-22 09:55:37 -06:00
  • 1961a680ec Merge branch 'fix/missing-config-settings' into 'develop' feld 2020-02-22 15:35:33 +00:00
  • 9fe60c3b9c Add missing invites_enabled and account_activation_required settings Mark Felder 2020-02-22 09:29:05 -06:00
  • 1edc2a3ede Merge branch 'develop' into contextes-boundaries rustra 2020-02-22 15:52:30 +01:00
  • c05cbc47f9 Better advice for vacuuming after restoring. lain 2020-02-22 13:14:30 +00:00
  • 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-22 09:31:43 +03:00
  • f7f6ba1958 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-21 17:07:07 -06:00
  • 114e7b764e Merge branch 'patch-1' into 'develop' lain 2020-02-21 19:34:45 +00:00
  • 1ed485ec1d added why doing a vacuum after restoring a backup is so important Igeljäger 2020-02-21 15:30:52 +00:00
  • d44f9e3b6c
         fix for timeout clause Alexander Strizhakov 2020-02-21 16:56:55 +03:00
  • f604f9e470
         hackney pool timeout Alexander Strizhakov 2020-02-21 14:33:55 +03:00
  • 6806df80dd
         don't log info ssl messages Alexander Strizhakov 2020-02-21 14:28:16 +03:00
  • 011ede4536
         Update documentation Egor Kislitsyn 2020-02-21 14:42:43 +04:00
  • ad8f26c0a4
         more info in Connections.checkin timout errors Alexander Strizhakov 2020-02-21 12:53:40 +03:00
  • a03c420b84
         by default don't use gun retries Alexander Strizhakov 2020-02-21 12:32:42 +03:00
  • 3849bbb60d
         temp using tesla from fork Alexander Strizhakov 2020-02-21 10:15:56 +03:00
  • 13918cb545
         Merge branch 'develop' into gun Alexander Strizhakov 2020-02-21 10:02:37 +03:00
  • 3fa0dcbb7f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-02-20 19:56:38 -06:00
  • 3eae0884af Force BBS/SSH enabled Your New SJW Waifu 2020-02-21 01:57:31 +00:00
  • 292031f6dd Merge branch 'migration-fixes-20' into 'develop' Haelwenn 2020-02-20 23:53:52 +00:00
  • 499d9405d5 Merge branch 'fix/gin-fuzzy' into 'develop' Haelwenn 2020-02-20 23:52:45 +00:00
  • c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' Haelwenn 2020-02-20 23:50:40 +00:00
  • 4961a2bdb0 Tag Chat and Tesla Adapter settings with the reboot flag chore/tag-settings-with-reboot Mark Felder 2020-02-20 16:23:23 -06:00
  • b6bb73f43e Apply database session parameter to improve GIN full text search Mark Felder 2020-02-20 15:34:10 -06:00
  • effb4a3d48
         init.d/pleroma: Add option to attach an elixir console Haelwenn (lanodan) Monnier 2019-09-21 03:15:09 +02:00
  • 8d064eb451
         rich_media/helpers.ex: Add config to disable fetching from remote activities features/link-previews-disable-remote Haelwenn (lanodan) Monnier 2020-02-14 21:51:57 +01:00
  • 819cd46717
         Auto-expire Create activities only Egor Kislitsyn 2020-02-20 22:04:02 +04:00
  • 2d5cf0f8cd Migrations: Make them not fail for old databases lain 2020-02-20 16:44:31 +01:00
  • 0d14c3f410 [#1505] Typo fix. Ivan Tashkinov 2020-02-20 15:18:28 +03:00
  • 3eddd9caa6 Merge branch 'require-signature' into 'develop' lain 2020-02-20 12:13:21 +00:00
  • c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop' lain 2020-02-20 12:04:29 +00:00
  • d536a00d42 Merge branch 'docs_updating' into 'develop' lain 2020-02-20 12:03:21 +00:00
  • 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-20 15:00:48 +03:00
  • e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop' lain 2020-02-20 11:58:37 +00:00
  • 3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3 Ivan Tashkinov 2020-02-20 14:48:46 +03:00
  • cf4ecffcea Merge branch 'tests-clear-config-tweaks' into 'develop' lain 2020-02-20 11:36:48 +00:00
  • ca5dc7d5d6 Apply suggestion to lib/mix/tasks/pleroma/frontend.ex lain 2020-02-19 16:21:26 +00:00
  • 3af6d3f8e2 Emoji Reactions: Add documentation lain 2020-02-19 17:17:05 +01:00
  • 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji lain 2020-02-19 17:16:45 +01:00
  • c9db0507f8
         removing retry option and changing some logger messages levels Alexander Strizhakov 2020-02-19 12:19:03 +03:00
  • 3b78695c98 Merge branch 'fix/mrf-sample-doc' into 'develop' feld 2020-02-18 21:03:01 +00:00
  • 53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc' feld 2020-02-18 20:58:15 +00:00
  • 3416948cdf Merge branch 'fix/mrf-docs' into 'develop' feld 2020-02-18 20:57:23 +00:00
  • 264d18be32 Merge branch 'chore/config-descriptions' into 'develop' feld 2020-02-18 20:45:31 +00:00
  • 138a3c1fe4 Spelling was wrong in test as well Mark Felder 2020-02-18 09:30:18 -06:00
  • 7d73e7a09a Spelling Mark Felder 2020-02-18 09:18:09 -06:00
  • 2a219f5e86 Improve changelog message Mark Felder 2020-02-18 09:12:46 -06:00
  • cf94349287 Merge branch 'develop' into gun Mark Felder 2020-02-18 09:06:27 -06:00
  • cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop' lain 2020-02-18 14:56:59 +00:00
  • 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks Ivan Tashkinov 2020-02-18 17:52:31 +03:00
  • 61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-18 17:46:09 +03:00
  • 3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop' lain 2020-02-18 14:36:10 +00:00
  • c07efd5b42 Merge branch 'need-reboot-flag' into 'develop' lain 2020-02-18 14:32:03 +00:00
  • ca7ac068f0
         Add a test Egor Kislitsyn 2020-02-18 17:09:50 +04:00
  • fb6c2576dc Merge branch 'chore/floki-update' into 'develop' lain 2020-02-18 13:09:37 +00:00
  • 12738732c9 Hashtags, Blocks: Reword for performance. lain 2020-02-18 13:17:00 +01:00
  • 2ef70b55f5
         Fix status.expires_at type Egor Kislitsyn 2020-02-18 14:52:11 +04:00
  • 514c899275
         adding gun adapter Alexander Strizhakov 2020-02-11 10:12:57 +03:00
  • 962eb8d4ac Merge branch 'update/admin-fe-20200217' into 'develop' feld 2020-02-17 22:22:53 +00:00
  • 6a97c1b9ff Update adminFE build Mark Felder 2020-02-17 15:50:45 -06:00
  • 81cc9dd085 Merge branch 'develop' into chore/floki-update Mark Felder 2020-02-17 14:13:05 -06:00
  • a0977a1f1e
         optimization for group reports fix/1518-admin-reports-timeout Alexander Strizhakov 2020-02-13 15:45:35 +03:00
  • 5178c8dbc3 Merge branch 'upgrade_crypto' into 'develop' rinpatch 2020-02-17 11:13:37 +00:00
  • 7df13e6f3a Update plug_crypto lain 2020-02-17 11:41:14 +01:00
  • 02809dc276 Merge branch 'feat/git-attributes-elixir' into 'develop' rinpatch 2020-02-17 10:34:32 +00:00
  • b4b472d782 .gitattributes: use native support for elixir definitions rinpatch 2020-02-17 13:19:04 +03:00
  • 1b136f39e2 Merge branch 'develop' into issue/1469 Maksim Pechnikov 2020-02-17 09:10:51 +03:00