Commit graph

  • b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro rinpatch 2020-03-01 02:03:46 +0300
  • e6ccf12129 changelog: entries for timeline DoS fixes rinpatch 2020-02-28 17:59:16 +0300
  • ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user rinpatch 2020-02-28 17:44:59 +0300
  • 4d416343fa rate limiter: Fix a race condition rinpatch 2020-02-28 17:35:01 +0300
  • df2173343a pagination: limit the number of elements returned at one time to 40 rinpatch 2020-02-28 17:29:53 +0300
  • 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop' rinpatch 2020-02-29 21:52:33 +0000
  • c747260989 [#2250] Tiny refactoring per merge request review. Ivan Tashkinov 2020-02-29 22:04:09 +0300
  • 269aa9c8a5 Merge branch 'chore/update-cachex' into 'develop' rinpatch 2020-02-29 17:58:48 +0000
  • c026128325 deps: update cachex to 3.2.0 rinpatch 2020-02-29 20:40:23 +0300
  • 0fefc4033f Merge branch 'mastofe/bundle-2020-01-20' into 'develop' rinpatch 2020-02-29 16:31:31 +0000
  • 5db2fb3ce7 Merge branch 'descriptions-changes' into 'develop' Haelwenn 2020-02-29 11:29:45 +0000
  • 814b275af7
    Merge branch 'develop' into gun Alexander Strizhakov 2020-02-29 11:34:50 +0300
  • 04b03e4762
    streamer group & Oban crontab child Alexander Strizhakov 2020-02-29 11:24:30 +0300
  • 2a850abbeb
    MastoFE: Bundle 2020-01-20 Haelwenn (lanodan) Monnier 2020-02-29 06:41:13 +0100
  • 3ef2ff3e47
    auth_controller.ex: Add admin scope to MastoFE Haelwenn (lanodan) Monnier 2020-02-29 01:23:36 +0100
  • aad057a2d6 Merge branch 'update/pleroma-fe-20200228' into 'develop' feld 2020-02-28 23:28:58 +0000
  • bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228 Mark Felder 2020-02-28 16:18:09 -0600
  • c28de93912 Update PleromaFE bundle for the 2.0 release Mark Felder 2020-02-28 16:15:12 -0600
  • d075bdc9e9 Merge branch 'update/admin-fe-20200228' into 'develop' feld 2020-02-28 18:40:22 +0000
  • 3d24a0917b Update AdminFE build Mark Felder 2020-02-28 12:32:44 -0600
  • 3759b146c4 Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex Ivan Tashkinov 2020-02-28 13:33:42 +0000
  • e892a7eb01 Merge branch 'filtered-params' into 'develop' Haelwenn 2020-02-28 04:27:50 +0000
  • fabcd82f4a add confirm field to filtered params Steven Fuchs 2020-02-28 04:27:50 +0000
  • 457a653f88 Merge branch 'descriptions-changes' into 'develop' feld 2020-02-27 18:11:26 +0000
  • f2216287a7 Merge branch 'admin-status-list' into 'develop' feld 2020-02-27 18:11:04 +0000
  • ab0aa04e4c Merge branch 'exclude-boosts-admin-api' into 'develop' feld 2020-02-27 18:09:19 +0000
  • 6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. Ivan Tashkinov 2020-02-27 18:46:05 +0300
  • cb60a9c42f
    Do not fail when user has no email Egor Kislitsyn 2020-02-27 17:27:49 +0400
  • 4ab07cf0d5 Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses eugenijm 2020-02-26 14:47:19 +0300
  • e2a6a40367 Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only) eugenijm 2020-02-10 14:32:38 +0300
  • 2076c9f8c8
    unnecessary groups Alexander Strizhakov 2020-02-26 19:50:07 +0300
  • f446744a6a
    Allow account registration without an email Egor Kislitsyn 2020-02-26 20:13:53 +0400
  • fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop' lain 2020-02-26 08:26:16 +0000
  • 3bbfebd1c2 instance.gen task: make example instance name less confusing rinpatch 2020-02-26 00:32:34 +0300
  • 359faa8645 instance.gen task: remind to transfer the config to the database after migrations rinpatch 2020-02-25 22:13:08 +0300
  • cfa28dee32 instance.gen task: make instance name default to the domain rinpatch 2020-02-25 21:59:37 +0300
  • 8b4d1a0b29 Merge branch 'fix/dialyzer-warnings' into 'develop' rinpatch 2020-02-25 18:56:37 +0000
  • 2cd253f6d5 Merge branch 'merge/admin-fe-20200225' into 'develop' feld 2020-02-25 17:14:54 +0000
  • 554bc88e8a Update AdminFE build Mark Felder 2020-02-25 11:08:35 -0600
  • 97dae77240 Merge branch 'token-web-push-test' into 'develop' feld 2020-02-25 16:06:06 +0000
  • 6b012ddd69
    some docs Alexander Strizhakov 2020-02-25 19:01:29 +0300
  • 22018adae6
    Fix Dialyzer warnings Egor Kislitsyn 2020-02-25 18:34:56 +0400
  • c495e6d387
    Add a test to ensure OAuth tokens are tied to Push subscriptions Egor Kislitsyn 2020-02-25 18:04:28 +0400
  • 87e8d792bd Merge branch 'test-fix' into 'develop' lain 2020-02-25 12:26:39 +0000
  • 3eccdd15aa
    compile fix Alexander Strizhakov 2020-02-25 15:19:52 +0300
  • e4804137b3 Document database default changes lain 2020-02-25 11:51:01 +0100
  • f71aa644b1 Add :unnamed option to default database configuration lain 2020-02-25 11:17:51 +0100
  • 10f452ad1f Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-02-25 07:15:33 +0300
  • 035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' rinpatch 2020-02-24 20:52:10 +0000
  • 5e4fe0e8f7 instance.gen task: fix crash when using custom static directory rinpatch 2020-02-24 22:52:38 +0300
  • 908b6ee49a Merge branch 'status-visibility-count-stats' into 'develop' Haelwenn 2020-02-24 19:21:29 +0000
  • 7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope eugenijm 2020-01-09 22:18:55 +0300
  • d240ce41b5 Merge branch 'theming_your_instance' into 'develop' lain 2020-02-24 17:48:18 +0000
  • c0146f4859 DOCS Theming your instance Ilja 2020-02-24 17:48:18 +0000
  • 8efae966b1
    open conn in separate task Alexander Strizhakov 2020-02-24 19:56:27 +0300
  • 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' lain 2020-02-24 14:54:22 +0000
  • 1e1156b645 Merge branch '1505-threads-federation' into 'develop' Haelwenn 2020-02-24 07:28:35 +0000
  • f9fe6a9e30
    Captcha: return invalid when answer_data is nil Haelwenn (lanodan) Monnier 2020-02-24 02:41:48 +0100
  • ee57663d34
    captcha_test.exs: Use the same testing logic in Kocaptcha and native Haelwenn (lanodan) Monnier 2020-02-24 01:27:16 +0100
  • 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. Ivan Tashkinov 2020-02-22 19:48:41 +0300
  • 1961a680ec Merge branch 'fix/missing-config-settings' into 'develop' feld 2020-02-22 15:35:33 +0000
  • 9fe60c3b9c Add missing invites_enabled and account_activation_required settings Mark Felder 2020-02-22 09:29:05 -0600
  • c05cbc47f9 Better advice for vacuuming after restoring. lain 2020-02-22 13:14:30 +0000
  • 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-22 09:31:43 +0300
  • 114e7b764e Merge branch 'patch-1' into 'develop' lain 2020-02-21 19:34:45 +0000
  • 1ed485ec1d added why doing a vacuum after restoring a backup is so important Igeljäger 2020-02-21 15:30:52 +0000
  • d44f9e3b6c
    fix for timeout clause Alexander Strizhakov 2020-02-21 16:56:55 +0300
  • f604f9e470
    hackney pool timeout Alexander Strizhakov 2020-02-21 14:33:55 +0300
  • 6806df80dd
    don't log info ssl messages Alexander Strizhakov 2020-02-21 14:28:16 +0300
  • 011ede4536
    Update documentation Egor Kislitsyn 2020-02-21 14:42:43 +0400
  • ad8f26c0a4
    more info in Connections.checkin timout errors Alexander Strizhakov 2020-02-21 12:53:40 +0300
  • a03c420b84
    by default don't use gun retries Alexander Strizhakov 2020-02-21 12:32:42 +0300
  • 3849bbb60d
    temp using tesla from fork Alexander Strizhakov 2020-02-21 10:15:56 +0300
  • 13918cb545
    Merge branch 'develop' into gun Alexander Strizhakov 2020-02-21 10:02:37 +0300
  • 292031f6dd Merge branch 'migration-fixes-20' into 'develop' Haelwenn 2020-02-20 23:53:52 +0000
  • 499d9405d5 Merge branch 'fix/gin-fuzzy' into 'develop' Haelwenn 2020-02-20 23:52:45 +0000
  • c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' Haelwenn 2020-02-20 23:50:40 +0000
  • b6bb73f43e Apply database session parameter to improve GIN full text search Mark Felder 2020-02-20 15:34:10 -0600
  • effb4a3d48
    init.d/pleroma: Add option to attach an elixir console Haelwenn (lanodan) Monnier 2019-09-21 03:15:09 +0200
  • 819cd46717
    Auto-expire Create activities only Egor Kislitsyn 2020-02-20 22:04:02 +0400
  • 2d5cf0f8cd Migrations: Make them not fail for old databases lain 2020-02-20 16:44:31 +0100
  • fae0d4ba9d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-02-20 13:50:56 +0000
  • 0d14c3f410 [#1505] Typo fix. Ivan Tashkinov 2020-02-20 15:18:28 +0300
  • 3eddd9caa6 Merge branch 'require-signature' into 'develop' lain 2020-02-20 12:13:21 +0000
  • c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop' lain 2020-02-20 12:04:29 +0000
  • d536a00d42 Merge branch 'docs_updating' into 'develop' lain 2020-02-20 12:03:21 +0000
  • 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-20 15:00:48 +0300
  • e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop' lain 2020-02-20 11:58:37 +0000
  • 3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3 Ivan Tashkinov 2020-02-20 14:48:46 +0300
  • cf4ecffcea Merge branch 'tests-clear-config-tweaks' into 'develop' lain 2020-02-20 11:36:48 +0000
  • 3af6d3f8e2 Emoji Reactions: Add documentation lain 2020-02-19 17:17:05 +0100
  • 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji lain 2020-02-19 17:16:45 +0100
  • c9db0507f8
    removing retry option and changing some logger messages levels Alexander Strizhakov 2020-02-19 12:19:03 +0300
  • 3b78695c98 Merge branch 'fix/mrf-sample-doc' into 'develop' feld 2020-02-18 21:03:01 +0000
  • 53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc' feld 2020-02-18 20:58:15 +0000
  • 3416948cdf Merge branch 'fix/mrf-docs' into 'develop' feld 2020-02-18 20:57:23 +0000
  • 264d18be32 Merge branch 'chore/config-descriptions' into 'develop' feld 2020-02-18 20:45:31 +0000
  • 138a3c1fe4 Spelling was wrong in test as well Mark Felder 2020-02-18 09:30:18 -0600
  • 7d73e7a09a Spelling Mark Felder 2020-02-18 09:18:09 -0600
  • 2a219f5e86 Improve changelog message Mark Felder 2020-02-18 09:12:46 -0600