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

Commit Graph

  • 0517d3252e Probably worth documenting the MediaProxy fix Mark Felder 2020-07-10 11:22:29 -05:00
  • ce9514000d Merge branch 'proxy-range-and-chunk' into 'develop' feld 2020-07-10 16:18:28 +00:00
  • 72b3dbf4d1 Credo line length complaint Mark Felder 2020-07-10 11:04:19 -05:00
  • a1dace088c ReverseProxy: Streaming and disable encoding if Range href 2020-07-10 17:10:48 +02:00
  • 93e494ec21 ActivityPub: Don't rename a clashing nickname with the same ap id. lain 2020-07-10 14:10:44 +02:00
  • 6b7988221e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-10 06:24:32 -05:00
  • fba1ee7d7b Merge branch 'chat-federation-information' into 'develop' lain 2020-07-10 10:37:42 +00:00
  • b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information lain 2020-07-10 12:26:53 +02:00
  • 8aa7143f46 Merge branch 'bump-fe-2020-07-10' into 'develop' lain 2020-07-10 09:45:10 +00:00
  • 328062308a Update frontend lain 2020-07-10 11:41:10 +02:00
  • 31a0ed5d01 Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop' Haelwenn 2020-07-10 09:22:14 +00:00
  • 48f98a2748 Merge branch 'mix-tasks-improvement' into 'develop' lain 2020-07-10 08:58:44 +00:00
  • 4d809144d8 Merge branch 'cluster-test-ci' into 'develop' lain 2020-07-10 08:56:12 +00:00
  • 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix' Haelwenn 2020-07-10 08:55:15 +00:00
  • 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop' Haelwenn 2020-07-10 08:49:14 +00:00
  • 8743df5193 Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2020-07-10 08:45:39 +00:00
  • b6de9b1987 Translated using Weblate (Italian) Ben Is 2020-07-08 00:00:40 +00:00
  • 11c9654a32 Translated using Weblate (Polish) Ben Is 2020-07-08 22:51:39 +00:00
  • 77c4c60e55 Merge branch 'prometheus-update' into 'develop' Haelwenn 2020-07-10 08:27:41 +00:00
  • b6688030fa
         prometheus update for OTP 23 Alexander Strizhakov 2020-07-10 10:35:59 +03:00
  • b1b8f5f11a
         docs and descriptions for s3 settings Alexander Strizhakov 2020-07-10 09:16:53 +03:00
  • ac9f18de11 Update type for :replace settings Angelina Filippova 2020-07-10 03:32:53 +03:00
  • 6b9210e886 Update type for :groups setting Angelina Filippova 2020-07-10 03:07:55 +03:00
  • 9f04b793cb Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-09 19:05:36 -05:00
  • 08211eff22 Re-enable the federated tests, increase timeout stwf 2020-07-08 15:56:03 -04:00
  • 4301ae3861 Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop' feld 2020-07-09 17:23:15 +00:00
  • cc7153cd82
         user: Add support for custom emojis in profile fields Haelwenn (lanodan) Monnier 2020-07-09 19:07:07 +02:00
  • 3fd780049b Fix preloads Roman Chvanikov 2020-07-09 20:21:30 +03:00
  • 2b979cc90c Add AdminFE reports URL to report emails Mark Felder 2020-07-09 11:55:40 -05:00
  • 79707e879d
         cleap up Alexander Strizhakov 2020-07-09 19:13:16 +03:00
  • 4db6678429 Merge branch 'chore/use-the-alias' into 'develop' feld 2020-07-09 16:08:34 +00:00
  • d5fcec8315
         fix for info after tag/untag user Alexander Strizhakov 2020-07-09 18:59:48 +03:00
  • c2edfd16e0
         fix for user revoke invite task Alexander Strizhakov 2020-07-09 18:59:15 +03:00
  • d23804f191 Use the Pleroma.Config alias Mark Felder 2020-07-09 10:53:51 -05:00
  • 6b14f0c514 Merge branch 'fix/csp-for-captcha' into 'develop' feld 2020-07-09 14:33:24 +00:00
  • 49c4e24953 Merge branch 'develop' into fix/csp-for-captcha Mark Felder 2020-07-09 09:08:59 -05:00
  • 17a2ff57ac merge develop Roman Chvanikov 2020-07-09 16:56:06 +03:00
  • 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop' lain 2020-07-09 13:10:05 +00:00
  • f4469dc741 Merge branch 'features/favicons' into 'develop' lain 2020-07-09 13:09:31 +00:00
  • bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop' Haelwenn 2020-07-09 12:10:26 +00:00
  • c2be0da79f Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated eugenijm 2020-05-18 22:56:09 +03:00
  • bdefea359d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-09 06:38:48 -05:00
  • 68036f5a3b Merge branch 'follow-pipeline' into 'develop' Haelwenn 2020-07-09 10:32:24 +00:00
  • 34d6009d82 Merge branch 'patch-2' into 'develop' Haelwenn 2020-07-09 09:50:08 +00:00
  • 393a588265 Merge branch 'patch-1' into 'develop' lain 2020-07-09 09:42:39 +00:00
  • 6d688f14fa Merge branch 'bugfix/status-deletion' into 'develop' lain 2020-07-09 09:37:52 +00:00
  • ab773fa5c9 [static-fe] limit according to- and within- existing ruleset Dym Sohin 2020-07-09 09:37:50 +00:00
  • 8be0c04b40 Merge branch 'issue/1880' into 'develop' lain 2020-07-09 09:31:15 +00:00
  • 8594181597 Update static-fe.css lain 2020-07-09 09:30:15 +00:00
  • 6854c5ba2f Merge branch 'patch-3' into 'develop' lain 2020-07-09 09:25:10 +00:00
  • 6465257e1f missed : (colon) before mrf_steal_emoji Dym Sohin 2020-07-09 09:23:21 +00:00
  • 8eecc708ef fix wide2x emojis within nicknames Dym Sohin 2020-07-09 09:03:24 +00:00
  • 4cbafcef0c
         load default config in mix tasks Alexander Strizhakov 2020-07-09 11:17:43 +03:00
  • 31259cabcc fix test Maksim Pechnikov 2020-07-09 07:16:52 +03:00
  • 6e54972252 added link to changelog, removed repetition Dym Sohin 2020-07-09 03:15:51 +00:00
  • b932121c79 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-08 21:05:53 -05:00
  • 33e6285636 Update types for :headers and :options settings in MediaProxy Invalidation group Angelina Filippova 2020-07-09 01:33:23 +03:00
  • 123352ffa1 Removed unused trigram index on users. Fixed users_fts_index usage. Ivan Tashkinov 2020-07-08 22:50:15 +03:00
  • af9eb7a2b1 re-enable federation tests stwf 2020-07-08 11:32:04 -04:00
  • 00e54f8fe7 ActivityPub: Remove follow and fix issues. lain 2020-07-08 17:07:24 +02:00
  • 9dda8b5427 CommonAPI: Switch to pipeline for following. lain 2020-07-08 15:40:56 +02:00
  • b28cc15459
         don't restart pleroma in mix tasks Alexander Strizhakov 2020-07-03 20:12:00 +03:00
  • 72ad3a66f4
         don't fully start pleroma in mix tasks Alexander Strizhakov 2020-07-03 19:18:08 +03:00
  • 172f4aff8e Transmogrifier: Move following to the pipeline. lain 2020-07-08 14:30:53 +02:00
  • 29fa75d00d Notification: For follows, notify the followed. lain 2020-07-08 14:29:29 +02:00
  • 7d0e2b3fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline lain 2020-07-08 13:23:07 +02:00
  • cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880 lain 2020-07-08 13:21:58 +02:00
  • 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' lain 2020-07-08 10:55:03 +00:00
  • 3c5ae7201b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-08 05:47:22 -05:00
  • 704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches. Ivan Tashkinov 2020-07-08 13:14:18 +03:00
  • a6495f4a68 [#1895] credo fix. Ivan Tashkinov 2020-07-08 12:54:23 +03:00
  • c0385cf47a AccountController: Fix muting / unmuting reblogs. lain 2020-07-08 11:52:29 +02:00
  • 3f8370a285 [#1895] Applied code review suggestion. Ivan Tashkinov 2020-07-08 12:36:44 +03:00
  • e341f81785 fixed delete Like activity in remove user Maksim Pechnikov 2020-07-07 09:10:02 +03:00
  • 31fef95e35
         Add changelog and documentation Haelwenn (lanodan) Monnier 2020-07-08 06:09:39 +02:00
  • 312fc55f14
         Add [:instances_favicons, :enabled] setting, defaults to false Haelwenn (lanodan) Monnier 2020-07-08 05:56:24 +02:00
  • 8c9df2d2e6
         instance: Prevent loop of updates Haelwenn (lanodan) Monnier 2020-07-07 12:07:30 +02:00
  • 013e2c5057
         Use instances table instead of Cachex Haelwenn (lanodan) Monnier 2020-07-07 11:13:38 +02:00
  • 6a679d80c9
         Move get_favicon to Pleroma.Instances, use / Haelwenn (lanodan) Monnier 2020-03-02 05:38:25 +01:00
  • f6d09fafee
         Add support for remote favicons Haelwenn (lanodan) Monnier 2020-03-01 09:48:32 +01:00
  • a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop' Haelwenn 2020-07-08 03:25:30 +00:00
  • db13acf242 Merge branch 'fix/twitter-rich-media-preview' into 'develop' Haelwenn 2020-07-08 03:05:20 +00:00
  • 93ad6b8c7a Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-07-07 18:02:13 -05:00
  • 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop' lain 2020-07-07 18:26:07 +00:00
  • 20461137a3 [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting. Ivan Tashkinov 2020-07-07 20:44:16 +03:00
  • 3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. Ivan Tashkinov 2020-07-07 20:37:11 +03:00
  • 18438a9bf0 Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. Mark Felder 2020-07-07 11:21:05 -05:00
  • 4c9295adcc Update frontend lain 2020-07-07 17:13:23 +02:00
  • 92e6801c17 Changelog: Add info about avatar removal lain 2020-07-07 16:51:44 +02:00
  • c8dd973af5 AccountController: Remove unused update_? routes. lain 2020-07-07 16:48:47 +02:00
  • 1adda637d3 Docs: Document resetting of images lain 2020-07-07 16:26:57 +02:00
  • 59cf78e412 AccountController: Allow removal / reset of user images. lain 2020-07-07 16:20:50 +02:00
  • 778166f4dd Changelog: Add info about avatar removal 1918-avatar-background-header-reset lain 2020-07-07 16:51:44 +02:00
  • fca09944e8 AccountController: Remove unused update_? routes. lain 2020-07-07 16:48:47 +02:00
  • 55c7272a21 Docs: Document resetting of images lain 2020-07-07 16:26:57 +02:00
  • 539bf9de1c AccountController: Allow removal / reset of user images. lain 2020-07-07 16:20:50 +02:00
  • 4b53499bdc Merge branch 'develop' into 'develop' lain 2020-07-07 11:41:56 +00:00
  • 9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop' lain 2020-07-07 09:14:50 +00:00
  • fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop' Haelwenn 2020-07-07 08:23:49 +00:00
  • fbb9743a70
         Fix getting videos from peertube Haelwenn (lanodan) Monnier 2020-05-25 13:13:42 +02:00