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

Commit Graph

  • d3cf7e19fb
         activity_pub_controller_test.exs: test posting with AP C2S uploaded media Haelwenn (lanodan) Monnier 2020-03-17 13:02:10 +01:00
  • 4705590f76 Fix ssl option on Ecto config breaking release Cevado 2020-03-16 22:02:01 -03:00
  • b17d8d305f Enable Gun adapter by default Mark Felder 2020-03-16 15:39:34 -05:00
  • 7438833685 [#1364] Improved notification-related tests. Ivan Tashkinov 2020-03-16 21:58:10 +03:00
  • 13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. eugenijm 2020-01-31 21:07:46 +03:00
  • e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop' Haelwenn 2020-03-16 17:42:10 +00:00
  • d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password eugenijm 2020-01-28 09:47:59 +03:00
  • f3791add99
         removing with_move parameter Alexander Strizhakov 2020-03-16 20:05:21 +03:00
  • 8dd01b24d2 Improve documentation of mrf_object_age Mark Felder 2020-03-16 11:44:53 -05:00
  • ac35c87cd3 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-16 10:06:48 -05:00
  • 0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control Ivan Tashkinov 2020-03-16 17:58:42 +03:00
  • b80958d4e3 Merge branch 'feat/templates' into 'develop' rinpatch 2020-03-16 14:32:23 +00:00
  • 7829de6da4 gitlab: create templates for bug reports and release MRs rinpatch 2020-03-16 17:26:28 +03:00
  • bf474ca3c1
         fix Alexander Strizhakov 2020-03-16 16:23:49 +03:00
  • 35471205f8
         temp fix for :gun.info MatchError Alexander Strizhakov 2020-03-16 15:47:25 +03:00
  • 5ad54d1bd5
         Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-03-16 16:31:15 +04:00
  • e1114dbd7e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-16 07:05:35 -05:00
  • 3805e09b9c
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-16 14:35:27 +03:00
  • 421e35b578
         Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-03-16 15:31:31 +04:00
  • ac5c2b66b9 Merge branch 'fix-warnings-in-tests' into 'develop' rinpatch 2020-03-16 11:27:10 +00:00
  • f0651730bd
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-16 14:25:55 +03:00
  • dc2ec84c0f
         warnings fix Alexander Strizhakov 2020-03-16 14:19:36 +03:00
  • c2527b8c63 Merge branch 'removing-deprecated' into 'develop' rinpatch 2020-03-16 11:08:06 +00:00
  • ba90a6d3e5
         removing from descriptions.exs deprecated settings Alexander Strizhakov 2020-03-16 14:01:35 +03:00
  • 89e4b3ebbd
         fix for content-type header for tag feed Alexander Strizhakov 2020-03-13 17:58:14 +03:00
  • 91870c8995
         adding rss for user feed Alexander Strizhakov 2020-03-13 17:41:26 +03:00
  • 26e2076659
         fix for feed page pagination Alexander Strizhakov 2020-03-10 18:11:48 +03:00
  • af5faced37 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-15 18:36:52 -05:00
  • 0d0fda0f62 This fucks with apps Your New SJW Waifu 2020-03-15 18:34:02 -05:00
  • bb49d8f5a0 Merge branch 'release/2.0.1' into 'stable' v2.0.1 rinpatch 2020-03-15 21:54:24 +00:00
  • 8d15d6c3ab CHANGELOG.md: Add upgrade notes for 2.0.1 rinpatch 2020-03-16 00:50:03 +03:00
  • be500f8c88 CHANGELOG.md: Add remaining entries for 2.0.1 rinpatch 2020-03-16 00:18:16 +03:00
  • e25197788f static-fe tests: fix to work on stable rinpatch 2020-03-16 00:17:28 +03:00
  • c46d035f7b rate limiter: disable based on if remote ip was found, not on if the plug was enabled rinpatch 2020-03-13 21:15:42 +03:00
  • 9d09755291 rip out fetch_initial_posts rinpatch 2020-03-14 15:39:58 +03:00
  • fcf51a77ba Merge branch 'features/staticfe-sanitization' into 'develop' rinpatch 2020-03-15 19:53:52 +00:00
  • 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop' rinpatch 2020-03-15 20:04:31 +00:00
  • df2608ebf8 Merge branch 'features/staticfe-sanitization' into 'develop' rinpatch 2020-03-15 19:53:52 +00:00
  • 8176ca9e40 static_fe: Sanitize HTML in users Haelwenn (lanodan) Monnier 2020-03-15 17:00:54 +01:00
  • acb016397e mix.lock: [minor] last hash appended Haelwenn (lanodan) Monnier 2020-03-15 15:58:26 +01:00
  • 0ac6e29654 static_fe: Sanitize HTML in posts Haelwenn (lanodan) Monnier 2020-03-15 15:45:57 +01:00
  • fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' lain 2020-03-15 19:15:20 +00:00
  • 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests. Ivan Tashkinov 2020-03-15 21:00:12 +03:00
  • d84670b9e1 Merge branch 'f' into 'develop' Haelwenn 2020-03-15 16:14:54 +00:00
  • dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex Haelwenn (lanodan) Monnier 2020-03-15 17:07:08 +01:00
  • 8096bfb891 changelog.md: add 2.0.1 entry rinpatch 2020-03-15 17:26:58 +03:00
  • 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' Haelwenn 2020-03-15 14:22:10 +00:00
  • 306d633b40 pleroma_api_controller.ex: Improve conversations error reporting Haelwenn (lanodan) Monnier 2020-03-02 04:23:29 +01:00
  • aa4407be93 Update AdminFE Mark Felder 2020-03-12 15:12:29 -05:00
  • 0b823755a2 Merge branch 'fix/cache-control-headers' into 'develop' rinpatch 2020-03-14 11:19:42 +00:00
  • 3f54215219 auth_controller.ex: Add admin scope to MastoFE Haelwenn (lanodan) Monnier 2020-02-29 01:23:36 +01:00
  • f9c43a4d9d pleroma_api.md: direct_conversation_id vs. conversation_id Haelwenn (lanodan) Monnier 2020-03-02 04:01:37 +01:00
  • ffd636f109 Fix hashtags WebSocket streaming Egor Kislitsyn 2020-03-13 19:30:42 +04:00
  • bd80ff9a6c Fix static FE plug to handle missing Accept header. Phil Hagelberg 2020-02-29 18:53:49 -08:00
  • 5f9fbd7d33 Formatting: Do not use \n and prefer <br> instead Haelwenn (lanodan) Monnier 2020-02-13 03:39:47 +01:00
  • 80bc8c2cc9 Revert "Set better Cache-Control header for static content" rinpatch 2020-03-11 17:58:25 +03:00
  • 2183d8f849 Merge branch 'docs/new_user' into 'develop' rinpatch 2020-03-11 20:26:50 +00:00
  • e7837bc14e Merge branch 'fix/signup-without-email' into 'develop' feld 2020-03-11 16:53:05 +00:00
  • e3ccaeaa53 installation/otp_en.md: Fix pleroma.nginx target [deb] Haelwenn (lanodan) Monnier 2020-03-10 11:49:02 +01:00
  • f8dc597c51 Fix enforcement of character limits Mark Felder 2020-03-10 13:08:00 -05:00
  • 423cfaf141 Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' rinpatch 2020-03-11 15:16:18 +00:00
  • 7cf7083076 relay list shows hosts without accepted follow Alexander Strizhakov 2020-02-25 16:21:48 +03:00
  • 963df689b9 static-fe.css: Restore from before a65ee8ea Haelwenn (lanodan) Monnier 2020-03-11 06:35:18 +01:00
  • e3f26920d0 mix.exs: bump version to 2.0.1 rinpatch 2020-03-15 16:54:27 +03:00
  • e87a32bcd7 rip out fetch_initial_posts rinpatch 2020-03-14 15:39:58 +03:00
  • 85ac909160 Merge branch 'bugfix/pleroma_conversation_api' into 'develop' rinpatch 2020-03-15 12:47:39 +00:00
  • 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting Haelwenn (lanodan) Monnier 2020-03-02 04:23:29 +01:00
  • 4de4e580da Nevermind we're mastodon now Your New SJW Waifu 2020-03-15 01:42:40 -05:00
  • 9bdbc9694e Only [a-z0-9] is allowed 😞 Your New SJW Waifu 2020-03-15 01:29:21 -05:00
  • b2c8136e7f Better name Your New SJW Waifu 2020-03-15 01:23:13 -05:00
  • bd15d8cfe8 New name and logo Your New SJW Waifu 2020-03-15 01:13:17 -05:00
  • aa456591be Merge branch 'develop' into contextes-boundaries rustra 2020-03-14 17:56:01 +01:00
  • 9ddfaf89da Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-14 09:18:12 -05:00
  • ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-14 15:37:02 +03:00
  • 14ebf8f1e5 Merge branch 'update/admin-fe-20200312' into 'develop' rinpatch 2020-03-14 11:25:17 +00:00
  • d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop' rinpatch 2020-03-14 11:19:42 +00:00
  • 6a28c198af uploaded media plug: do not inject compile-time params on every request rinpatch 2020-03-13 22:12:33 +03:00
  • 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop' rinpatch 2020-03-13 18:58:52 +00:00
  • 4db88242e5 Merge branch 'docs/direct_conversation_id' into 'develop' rinpatch 2020-03-13 18:58:22 +00:00
  • 2966377cb9 Update AdminFE Mark Felder 2020-03-12 15:12:29 -05:00
  • 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop' rinpatch 2020-03-13 18:50:17 +00:00
  • 658f30c0b3 Merge branch 'static-accept-missing' into 'develop' rinpatch 2020-03-13 18:46:54 +00:00
  • fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled rinpatch 2020-03-13 21:15:42 +03:00
  • 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop' rinpatch 2020-03-13 18:22:55 +00:00
  • c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers Mark Felder 2020-03-13 12:54:06 -05:00
  • 7321429a2e Lint Mark Felder 2020-03-13 12:42:06 -05:00
  • 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy Mark Felder 2020-03-13 12:27:50 -05:00
  • db36b48180 Remove test verifying we preserve cache-control headers; we don't Mark Felder 2020-03-13 12:23:14 -05:00
  • 470090471d Fix test to use new cache-control settings Mark Felder 2020-03-13 12:20:33 -05:00
  • 413177c8f0 Set correct Cache-Control header for local media Mark Felder 2020-03-13 12:02:58 -05:00
  • c62195127d Update comment to reflect what the code is actually doing Mark Felder 2020-03-13 11:46:40 -05:00
  • e04e16bbc0 Do not strip Cache-Control headers from media. Trust the Pleroma backend. Mark Felder 2020-03-13 11:31:55 -05:00
  • ad31d0726a Do not trust remote Cache-Control headers for mediaproxy Mark Felder 2020-03-13 11:30:27 -05:00
  • 096c5c52e0 Merge branch 'revert/cache-control' into 'develop' rinpatch 2020-03-13 16:25:10 +00:00
  • fffc382f13
         Fix hashtags WebSocket streaming Egor Kislitsyn 2020-03-13 19:30:42 +04:00
  • d1379c4de8
         Formatting: Do not use \n and prefer <br> instead Haelwenn (lanodan) Monnier 2020-02-13 03:39:47 +01:00
  • f8baea6595 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-13 07:13:07 -05:00
  • 98ed0d1c4b
         more clean up Alexander Strizhakov 2020-03-13 09:37:57 +03:00
  • 94291d5c58 Merge branch 'develop' into contextes-boundaries rustra 2020-03-12 21:45:21 +01:00
  • 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop' feld 2020-03-12 20:29:51 +00:00