itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity

Commit graph

  • 8176ca9e40 static_fe: Sanitize HTML in users Haelwenn (lanodan) Monnier 2020-03-15 17:00:54 +0100
  • acb016397e mix.lock: [minor] last hash appended Haelwenn (lanodan) Monnier 2020-03-15 15:58:26 +0100
  • 0ac6e29654 static_fe: Sanitize HTML in posts Haelwenn (lanodan) Monnier 2020-03-15 15:45:57 +0100
  • fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' lain 2020-03-15 19:15:20 +0000
  • 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 +0300
  • d84670b9e1 Merge branch 'f' into 'develop' Haelwenn 2020-03-15 16:14:54 +0000
  • dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex Haelwenn (lanodan) Monnier 2020-03-15 17:07:08 +0100
  • 8096bfb891 changelog.md: add 2.0.1 entry rinpatch 2020-03-15 17:26:58 +0300
  • 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' Haelwenn 2020-03-15 14:22:10 +0000
  • 306d633b40 pleroma_api_controller.ex: Improve conversations error reporting Haelwenn (lanodan) Monnier 2020-03-02 04:23:29 +0100
  • aa4407be93 Update AdminFE Mark Felder 2020-03-12 15:12:29 -0500
  • 0b823755a2 Merge branch 'fix/cache-control-headers' into 'develop' rinpatch 2020-03-14 11:19:42 +0000
  • 3f54215219 auth_controller.ex: Add admin scope to MastoFE Haelwenn (lanodan) Monnier 2020-02-29 01:23:36 +0100
  • f9c43a4d9d pleroma_api.md: direct_conversation_id vs. conversation_id Haelwenn (lanodan) Monnier 2020-03-02 04:01:37 +0100
  • ffd636f109 Fix hashtags WebSocket streaming Egor Kislitsyn 2020-03-13 19:30:42 +0400
  • bd80ff9a6c Fix static FE plug to handle missing Accept header. Phil Hagelberg 2020-02-29 18:53:49 -0800
  • 5f9fbd7d33 Formatting: Do not use \n and prefer <br> instead Haelwenn (lanodan) Monnier 2020-02-13 03:39:47 +0100
  • 80bc8c2cc9 Revert "Set better Cache-Control header for static content" rinpatch 2020-03-11 17:58:25 +0300
  • 2183d8f849 Merge branch 'docs/new_user' into 'develop' rinpatch 2020-03-11 20:26:50 +0000
  • e7837bc14e Merge branch 'fix/signup-without-email' into 'develop' feld 2020-03-11 16:53:05 +0000
  • e3ccaeaa53 installation/otp_en.md: Fix pleroma.nginx target [deb] Haelwenn (lanodan) Monnier 2020-03-10 11:49:02 +0100
  • f8dc597c51 Fix enforcement of character limits Mark Felder 2020-03-10 13:08:00 -0500
  • 423cfaf141 Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' rinpatch 2020-03-11 15:16:18 +0000
  • 7cf7083076 relay list shows hosts without accepted follow Alexander Strizhakov 2020-02-25 16:21:48 +0300
  • 963df689b9 static-fe.css: Restore from before a65ee8ea Haelwenn (lanodan) Monnier 2020-03-11 06:35:18 +0100
  • e3f26920d0 mix.exs: bump version to 2.0.1 rinpatch 2020-03-15 16:54:27 +0300
  • e87a32bcd7 rip out fetch_initial_posts rinpatch 2020-03-14 15:39:58 +0300
  • 85ac909160 Merge branch 'bugfix/pleroma_conversation_api' into 'develop' rinpatch 2020-03-15 12:47:39 +0000
  • 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting Haelwenn (lanodan) Monnier 2020-03-02 04:23:29 +0100
  • ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-14 15:37:02 +0300
  • 14ebf8f1e5 Merge branch 'update/admin-fe-20200312' into 'develop' rinpatch 2020-03-14 11:25:17 +0000
  • d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop' rinpatch 2020-03-14 11:19:42 +0000
  • 6a28c198af uploaded media plug: do not inject compile-time params on every request rinpatch 2020-03-13 22:12:33 +0300
  • 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop' rinpatch 2020-03-13 18:58:52 +0000
  • 4db88242e5 Merge branch 'docs/direct_conversation_id' into 'develop' rinpatch 2020-03-13 18:58:22 +0000
  • 2966377cb9 Update AdminFE Mark Felder 2020-03-12 15:12:29 -0500
  • 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop' rinpatch 2020-03-13 18:50:17 +0000
  • 658f30c0b3 Merge branch 'static-accept-missing' into 'develop' rinpatch 2020-03-13 18:46:54 +0000
  • 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 +0300
  • 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop' rinpatch 2020-03-13 18:22:55 +0000
  • c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers Mark Felder 2020-03-13 12:54:06 -0500
  • 7321429a2e Lint Mark Felder 2020-03-13 12:42:06 -0500
  • 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy Mark Felder 2020-03-13 12:27:50 -0500
  • db36b48180 Remove test verifying we preserve cache-control headers; we don't Mark Felder 2020-03-13 12:23:14 -0500
  • 470090471d Fix test to use new cache-control settings Mark Felder 2020-03-13 12:20:33 -0500
  • 413177c8f0 Set correct Cache-Control header for local media Mark Felder 2020-03-13 12:02:58 -0500
  • c62195127d Update comment to reflect what the code is actually doing Mark Felder 2020-03-13 11:46:40 -0500
  • e04e16bbc0 Do not strip Cache-Control headers from media. Trust the Pleroma backend. Mark Felder 2020-03-13 11:31:55 -0500
  • ad31d0726a Do not trust remote Cache-Control headers for mediaproxy Mark Felder 2020-03-13 11:30:27 -0500
  • 096c5c52e0 Merge branch 'revert/cache-control' into 'develop' rinpatch 2020-03-13 16:25:10 +0000
  • fffc382f13
         Fix hashtags WebSocket streaming Egor Kislitsyn 2020-03-13 19:30:42 +0400
  • d1379c4de8
         Formatting: Do not use \n and prefer <br> instead Haelwenn (lanodan) Monnier 2020-02-13 03:39:47 +0100
  • 98ed0d1c4b
         more clean up Alexander Strizhakov 2020-03-13 09:37:57 +0300
  • 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop' feld 2020-03-12 20:29:51 +0000
  • 39ed608b13
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-12 18:31:10 +0300
  • 1306b92997
         clean up Alexander Strizhakov 2020-03-12 18:28:54 +0300
  • d1c7f8e576
         Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-03-12 16:02:24 +0400
  • bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-12 12:07:07 +0300
  • 00d1752031 Merge branch 'docs/new_user' into 'develop' rinpatch 2020-03-11 20:26:50 +0000
  • 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop' feld 2020-03-11 16:53:05 +0000
  • 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' rinpatch 2020-03-11 15:16:18 +0000
  • f92c447bbc Merge branch 'relay-list-change' into 'develop' feld 2020-03-11 15:10:09 +0000
  • c3b9fbd3a7 Revert "Set better Cache-Control header for static content" rinpatch 2020-03-11 17:58:25 +0300
  • fce090c1de
         using Pleroma.Config instead of ets Alexander Strizhakov 2020-03-11 17:22:50 +0300
  • 193d67cde5
         compile fix Alexander Strizhakov 2020-03-11 16:43:58 +0300
  • 282a93554f
         merging release default config on app start Alexander Strizhakov 2020-03-11 16:25:53 +0300
  • 863ec33ba2
         Add support for funkwhale Audio activity Haelwenn (lanodan) Monnier 2020-03-11 12:21:44 +0100
  • 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController. Ivan Tashkinov 2020-03-11 14:05:56 +0300
  • 9dbf493b65 Merge branch 'docs/debian-install' into 'develop' rinpatch 2020-03-11 10:39:06 +0000
  • 6316726a5f
         CLI_tasks: Use manpage formatting conventions Haelwenn (lanodan) Monnier 2020-03-11 08:46:57 +0100
  • a06104b9d5
         CLI_tasks/user.md: Fix pleroma.user new documentation Haelwenn (lanodan) Monnier 2020-03-11 08:35:46 +0100
  • 8ad73445cd Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop' Haelwenn 2020-03-11 07:25:35 +0000
  • 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-11 09:15:55 +0300
  • a747eb6df9
         static-fe.css: Restore from before a65ee8ea Haelwenn (lanodan) Monnier 2020-03-11 06:35:18 +0100
  • 953aece848 Merge branch 'fix/post-length-validation' into 'develop' lain 2020-03-10 18:16:10 +0000
  • 5af798f246 Fix enforcement of character limits Mark Felder 2020-03-10 13:08:00 -0500
  • f39e1b9eff
         add verify tls_opts only when we open connection Alexander Strizhakov 2020-03-10 15:54:11 +0300
  • 426f5ee48a
         tesla adapter can't be changed in adminFE Alexander Strizhakov 2020-03-10 15:31:44 +0300
  • d9134d4430
         installation/otp_en.md: Fix pleroma.nginx target [deb] Haelwenn (lanodan) Monnier 2020-03-10 11:49:02 +0100
  • 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring. Ivan Tashkinov 2020-03-09 20:51:44 +0300
  • 841e4e4d83 Merge branch 'patch-1' into 'develop' lain 2020-03-09 13:36:21 +0000
  • d9f8941dac
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-09 10:56:33 +0300
  • 5b74976c8d Merge branch 'chore/mix-version-bump' into 'develop' rinpatch 2020-03-08 20:31:54 +0000
  • 86e7709a4d mix.exs: bump version to development one rinpatch 2020-03-08 23:24:30 +0300
  • 5f625c9136 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-03-08 19:07:55 +0000
  • 663e466067 Merge branch 'stable' into 'develop' rinpatch 2020-03-08 13:42:15 +0000
  • edb659dc57 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-03-08 14:10:45 +0300
  • e8493431bf Merge branch 'release/2.0.0' into 'stable' rinpatch 2020-03-08 10:38:35 +0000
  • e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af rinpatch 2020-03-07 18:18:43 +0300
  • 80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' rinpatch 2020-03-07 14:45:00 +0000
  • 6cf1958b02 moderation log: fix improperly migrated data rinpatch 2020-03-07 13:51:28 +0300
  • 474ef512df wait in mix task while pleroma is rebooted Alexander Strizhakov 2020-02-18 18:10:39 +0300
  • b2eb1124d1
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-07 12:41:37 +0300
  • 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop' rinpatch 2020-03-07 09:32:29 +0000
  • 5f42ecc4c7
         start gun upload pool, if proxy_remote is enabled Alexander Strizhakov 2020-03-07 12:24:39 +0300
  • 9f884a2639
         tests changes Alexander Strizhakov 2020-03-07 11:01:37 +0300
  • 14678a7708
         using stub instead expect Alexander Strizhakov 2020-03-07 10:12:34 +0300
  • f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0' rinpatch 2020-03-06 20:23:39 +0000
  • 78282dc983
         little polishing Alexander Strizhakov 2020-03-06 21:24:19 +0300
  • c93c3096d5
         little refactor Alexander Strizhakov 2020-03-06 21:04:18 +0300