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

Commit Graph

  • 9ce9c8c1a0 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-13 02:21:17 -05:00
  • 26f710b9e3 Merge branch 'develop' into preload-data Mark Felder 2020-06-12 16:52:52 -05:00
  • e2793744c5 Merge branch 'patch-1' into 'develop' Haelwenn 2020-06-12 21:46:16 +00:00
  • d050d21103 Apply suggestion to CHANGELOG.md rinpatch 2020-06-12 20:06:49 +00:00
  • 9b7f6237a8 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-12 13:53:46 -05:00
  • ffd12d3a1e CHANGELOG.md: add 2.0.7 entry rinpatch 2020-06-12 21:09:40 +03:00
  • 9046f85ced mix.exs: bump to 2.0.7 rinpatch 2020-06-12 21:09:28 +03:00
  • 90676bdfe3 Merge branch 'fix/csp-mediaproxy-base-url' into 'develop' feld 2020-06-11 16:18:06 +00:00
  • cd2df734dd Merge branch 'bugfix/csp-unproxied' into 'develop' rinpatch 2020-05-29 21:23:49 +00:00
  • e313aa0977 static-fe.css: Restore and move to /priv/static/static-fe Haelwenn (lanodan) Monnier 2020-05-01 21:15:43 +02:00
  • 4115701f71 Merge branch 'recipients-experiments' into 'develop' Haelwenn 2020-06-12 16:57:13 +00:00
  • 8efd1614ec Remove use of atoms in MRF.UserAllowListPolicy href 2020-06-10 17:34:23 +02:00
  • 8b8b8599e9 Fix atom leak in Rich Media Parser Egor Kislitsyn 2020-06-09 21:49:24 +04:00
  • 09d31d24de
         Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 Egor Kislitsyn 2020-06-12 18:37:32 +04:00
  • 697cf92024
         Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers Egor Kislitsyn 2020-06-12 18:25:29 +04:00
  • e557265a03 Merge branch 'global-status-expiration' into 'develop' lain 2020-06-12 14:14:09 +00:00
  • 4655407451 Apply suggestion to config/description.exs lain 2020-06-12 14:03:33 +00:00
  • 6d902916dd Merge branch 'features/mix-task-reset-mfa' into 'develop' feld 2020-06-12 14:01:19 +00:00
  • f491306aa9 Merge remote-tracking branch 'upstream/features/mix-task-reset-mfa' into neckbeard Your New SJW Waifu 2020-06-12 08:56:57 -05:00
  • 4c4113ad68 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-12 08:56:45 -05:00
  • ebbf2189ee Merge branch 'chore/bump-changelog' into 'develop' feld 2020-06-12 13:55:13 +00:00
  • e505e59d9c Document new mix task feature to reset mfa Mark Felder 2020-06-12 08:51:11 -05:00
  • 34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa Mark Felder 2020-06-12 08:43:50 -05:00
  • c2048f75cd Add changelog entry for emoji pack reload command Mark Felder 2020-06-12 08:42:23 -05:00
  • 1419c67f4d Merge branch 'feature/cli-reload-emoji' into 'develop' lain 2020-06-12 13:32:59 +00:00
  • 11aa02bb10 Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop' feld 2020-06-12 12:31:27 +00:00
  • f9dcf15ecb added admin api for MediaProxy cache invalidation Maksim Pechnikov 2020-06-12 14:49:54 +03:00
  • 2188097066 [#1794] Fixes URI query handling for hashtags extraction in search. Ivan Tashkinov 2020-06-12 14:25:41 +03:00
  • 122328b93a Update pleroma.nginx to support TLSv1.3 normandy 2020-06-12 01:41:09 +00:00
  • ba4481e23c Merge remote-tracking branch 'upstream/features/mix-task-reset-mfa' into neckbeard Your New SJW Waifu 2020-06-11 16:15:53 -05:00
  • 9e6768cd7e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-11 16:01:25 -05:00
  • 40970f6bb9
         New mix task: pleroma.user reset_mfa <nickname> Haelwenn (lanodan) Monnier 2020-06-11 22:54:39 +02:00
  • 2419776e19
         Deprecate Pleroma.Web.RichMedia.Parsers.OGP Egor Kislitsyn 2020-06-11 23:11:46 +04:00
  • 5474b5c988 Merge branch 'fix/csp-mediaproxy-base-url' into 'develop' feld 2020-06-11 16:18:06 +00:00
  • 7f7a1a4676 Check for media proxy base_url, not Upload base_url Mark Felder 2020-06-11 11:05:22 -05:00
  • 8a59fde0e5 Merge branch 'develop' into fix/csp-mediaproxy-base-url Mark Felder 2020-06-11 10:25:00 -05:00
  • 5d6ec6e5fc Merge branch '1794-hashtags-construction-from-uri' into 'develop' feld 2020-06-11 14:04:51 +00:00
  • 1f35acce54
         Merge OGP parser with TwitterCard Egor Kislitsyn 2020-06-11 17:57:31 +04:00
  • b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search. Ivan Tashkinov 2020-06-11 16:05:14 +03:00
  • 9bf3d8487b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-10 14:14:33 -05:00
  • 5e44e9d698 Apply suggestion to lib/pleroma/web/controller_helper.ex lain 2020-06-10 18:56:46 +00:00
  • 659e15896e [#1570] Experimental feature to improve user search using Levenshtein distance calculation. Improves short queries, especially containing typos. 1570-levenshtein-distance-user-search Ivan Tashkinov 2020-06-10 21:02:44 +03:00
  • 7c47f791a8 Add command to reload emoji packs from cli for OTP users Mark Felder 2020-06-10 13:02:08 -05:00
  • 99afc7f4e4 HTTP security plug: add media proxy base url host to csp rinpatch 2020-06-10 20:09:16 +03:00
  • 5d87405b51 ActivityPubTest: Update test for atomized parameters. lain 2020-06-10 16:55:30 +02:00
  • 570123ae21 Add test Thibaut Girka 2020-06-07 18:21:11 +02:00
  • 0ab69da1f2 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-10 17:20:33 +03:00
  • 7aa6c82937 Merge branch 'remake-remodel-dms' into 'develop' rinpatch 2020-06-10 12:05:45 +00:00
  • 600e2ea073 ActivityPubTest: Make test easier to understand. lain 2020-06-10 12:15:56 +02:00
  • 9e411372d0 ActivityPub: Don't show announces of your own objects in timeline. lain 2020-06-10 12:10:09 +02:00
  • 86fec45f40 ControllerHelper: Fix wrong comparison. lain 2020-06-10 11:09:45 +02:00
  • b4c50be9df Apply suggestion to lib/pleroma/web/controller_helper.ex lain 2020-06-10 08:12:29 +00:00
  • be7c322865 Apply suggestion to lib/pleroma/web/controller_helper.ex lain 2020-06-10 08:02:35 +00:00
  • c4f267b3be Apply suggestion to lib/pleroma/web/controller_helper.ex lain 2020-06-10 08:02:26 +00:00
  • 2f65e1b059 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-10 10:45:33 +03:00
  • 6c90fc8e70 Merge branch 'release/2.0.6' into 'stable' v2.0.6 rinpatch 2020-06-09 18:06:27 +00:00
  • b9501dcc78 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-09 11:53:58 -05:00
  • acd7b7ada4 Invalidation.enabled function is boolean fix/mediaproxy-http-invalidation Mark Felder 2020-06-09 10:19:55 -05:00
  • 2222b21eb7 Merge branch 'develop' into fix/mediaproxy-http-invalidation Mark Felder 2020-06-09 09:37:46 -05:00
  • 1b746cfbbb Merge branch 'add-url-to-admin-account-view' into 'develop' lain 2020-06-09 12:59:14 +00:00
  • 3dd1de61a7 Add url field to AdminAPI.AccountView Egor Kislitsyn 2020-06-08 22:08:57 +04:00
  • 063e6b9841 StatusController: Correctly paginate favorites. lain 2020-06-09 10:53:40 +02:00
  • 235a949d3b Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-09 10:46:35 +03:00
  • 064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-09 09:36:07 +02:00
  • 674efb0ad2 Merge branch 'features/mediatype-mime-valid' into 'develop' lain 2020-06-09 07:32:43 +00:00
  • 40d5058cc4 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-09 09:21:44 +02:00
  • e1bc37d118 MigrationHelper: Move notification backfilling to own module. lain 2020-06-09 09:20:55 +02:00
  • fc04a138d4 Apply suggestion to lib/pleroma/notification.ex lain 2020-06-08 20:01:37 +00:00
  • fe1cb56fdc
         transmogrifier: MIME.valid?/1 for mediaType Haelwenn (lanodan) Monnier 2020-06-08 21:04:16 +02:00
  • f05f206e13 CHANGELOG.md: add 2.0.6 entry rinpatch 2020-06-08 01:33:43 +03:00
  • 4e27cd5207 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-08 19:30:36 +03:00
  • 604a83ae3e merge develop Roman Chvanikov 2020-06-08 19:21:07 +03:00
  • 83f12b8229 update project home Your New SJW Waifu 2020-06-08 11:11:17 -05:00
  • 8d201e6949 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-08 10:29:42 -05:00
  • d44843e677
         Restrict ActivityExpirationPolicy to Notes only Egor Kislitsyn 2020-06-08 17:56:34 +04:00
  • da22119c2f
         Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-06-08 17:21:47 +04:00
  • d192492658 Merge branch 'openapi/admin/relay' into 'develop' lain 2020-06-08 11:07:01 +00:00
  • c450b248cc Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop' lain 2020-06-08 10:54:43 +00:00
  • 3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-08 11:19:18 +02:00
  • a1aa9fa913 Merge branch 'activity-pub-use-atoms-as-keys' into 'develop' lain 2020-06-08 09:11:55 +00:00
  • 89b85f6529 ChatController: Remove nonsensical pagination. lain 2020-06-08 11:09:53 +02:00
  • 7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-08 10:18:10 +02:00
  • fe8cf54829 mix.exs: bump version to 2.0.6 rinpatch 2020-06-08 01:33:07 +03:00
  • ada9d15eee Merge branch 'recipients-query-speedup' into 'develop' rinpatch 2020-05-19 14:32:27 +00:00
  • eabf9317b5 Migrations: Add index on client_id and client_secret for apps. lain 2020-05-26 16:46:57 +02:00
  • c29ad60c20 Activity.Queries: Use correct actor restriction. lain 2020-05-26 17:46:16 +02:00
  • e9aa6a3fa4 ActivityPub: Change ordering to nulls last in favorites query lain 2020-05-27 09:46:12 +02:00
  • 3687788cf2 Merge branch 'notification-fixes' into 'develop' rinpatch 2020-05-27 13:45:14 +00:00
  • f10b40828f [stable rewrite]: fix streamer streaming out announces from a muted thread rinpatch 2020-06-07 23:51:03 +03:00
  • 9396b2f8cf Merge branch 'features/apc2s-pagination' into 'develop' Haelwenn 2020-06-05 14:52:09 +00:00
  • 0186f56d93 Update crypt library Roman Chvanikov 2020-05-19 14:46:06 +03:00
  • cf6501f314 fix for syslog compile with updated rebar3 Alexander Strizhakov 2020-05-06 18:04:16 +03:00
  • df06bab437 [stable rewrite] update hackney to 1.16.0 and add support for tlsv1.3 rinpatch 2020-06-06 18:11:43 +03:00
  • a51284b60a Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' rinpatch 2020-05-29 09:46:31 +00:00
  • 1a2acce7c5 Docs: Document new mandatory parameter. lain 2020-06-07 20:23:17 +02:00
  • fe2a5d0614 ChatController: Make last_read_id mandatory. lain 2020-06-07 20:22:08 +02:00
  • 8d9e586887
         Delete pending follow requests on user deletion Sergey Suprunenko 2020-06-07 17:31:37 +02:00
  • 680fa5fa36 Docs: Update docs on mark as read. lain 2020-06-07 15:41:46 +02:00
  • 801e668a97 ChatController: Add last_read_id option to mark_as_read. lain 2020-06-07 15:38:33 +02:00
  • 2cdaac4330 SideEffects: Move streaming of chats to after the transaction. lain 2020-06-07 14:52:56 +02:00