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

Commit Graph

  • ddf2314836 Merge branch 'chore/jason-in-tests' into 'develop' Haelwenn 2020-11-24 12:17:09 +00:00
  • 54df44d380 Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters Mark Felder 2020-11-23 14:48:14 -06:00
  • 3283d0805f Use Jason instead of Poison in tests Mark Felder 2020-11-23 13:28:55 -06:00
  • 1ab61953db Merge branch 'chore/bump-linkify' into 'develop' rinpatch 2020-11-23 17:37:27 +00:00
  • 60c8c5402c Update Linkify to 0.3.0 Mark Felder 2020-11-23 11:22:50 -06:00
  • 12bdced845 Merge branch 'websearch' into 'develop' rinpatch 2020-11-23 14:40:33 +00:00
  • 67b15cc033 Search: Save detected pg version in a persistent term. lain 2020-11-23 15:29:55 +01:00
  • f9a4cf2097 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch lain 2020-11-23 15:18:19 +01:00
  • e07f8f8aa5 Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2020-11-23 13:43:57 +00:00
  • 15550f7c4b Merge branch 'cherry-pick-a65fc78c' into 'stable' feld 2020-11-21 18:29:26 +00:00
  • 9b7ade6568 Install file-dev in Dockerfile build stage Michael Walker 2020-11-12 22:20:17 +00:00
  • 22f85e0570 Merge branch 'libmagic' into 'develop' feld 2020-11-21 18:11:58 +00:00
  • d5f5d01495 Translated using Weblate (Hebrew) Guy Sheffer 2020-11-20 16:09:10 +00:00
  • a65fc78c6a Merge branch 'libmagic' into 'develop' feld 2020-11-21 18:11:58 +00:00
  • e6af7dc777 Add missing libmagic for image upload Guy Sheffer 2020-11-21 19:57:38 +02:00
  • 489b12cde4 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements Ivan Tashkinov 2020-11-21 19:47:46 +03:00
  • ccc2cf0e87 Session-based OAuth auth fixes (token expiration check), refactoring, tweaks. Ivan Tashkinov 2020-11-21 19:47:25 +03:00
  • 4999efad3f
         Update CHANGELOG.md: registration workflow Alex Gleason 2020-11-21 10:24:45 -06:00
  • 30ed7b502f
         Merge remote-tracking branch 'upstream/develop' into registration-workflow Alex Gleason 2020-11-21 10:23:53 -06:00
  • 76cb01cde8 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-11-20 15:50:12 -06:00
  • 9fc3356a06 Merge branch 'cherry-pick-8a7ee9fe' into 'stable' feld 2020-11-20 21:40:23 +00:00
  • ba3bf16c70 Merge branch 'revert-da4660d2' into 'develop' feld 2020-11-18 21:16:12 +00:00
  • ecd1ef8cb5 Merge branch 'fix/2302-report-duplicates' into 'develop' feld 2020-11-20 18:40:15 +00:00
  • e4289792d2 Linting. lain 2020-11-20 16:38:05 +01:00
  • 25a03a9b5b Config, Docs: Remove search_function lain 2020-11-20 16:33:11 +01:00
  • 8532325d65 SearchController Test: Fix test. lain 2020-11-20 16:29:11 +01:00
  • cc52f03566 Changelog: Add info about search changes lain 2020-11-20 16:28:00 +01:00
  • 9a1e5f5d48 Search: Change search method based on detected pg version lain 2020-11-20 16:26:43 +01:00
  • a407e33c78 Application: Save postgres version in the environment lain 2020-11-20 16:26:22 +01:00
  • f4092e96d1 Change what nodeinfo returns without breaking backwards compatibility Ilja 2020-11-20 13:48:28 +01:00
  • d8924e1a56 Merge branch 'fix/mix-tasks' into 'develop' lain 2020-11-20 10:30:02 +00:00
  • 0a5b22bc3b
         start limiters in mix tasks Alexander Strizhakov 2020-11-20 11:37:01 +03:00
  • 770a29054f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-11-19 21:00:39 -06:00
  • 79a509ee61 Merge branch '2301-users-search-discoverability-fix' into 'develop' feld 2020-11-19 20:33:52 +00:00
  • cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop' feld 2020-11-19 20:32:32 +00:00
  • 66f411fba0 added subject actor to moderation log Maksim Pechnikov 2020-11-19 22:13:45 +03:00
  • b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix Ivan Tashkinov 2020-11-19 19:35:44 +03:00
  • 5e04f4156c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch lain 2020-11-19 17:32:57 +01:00
  • e164c37139 [#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots. Ivan Tashkinov 2020-11-19 19:30:02 +03:00
  • c8d11c3064 Merge branch '2317-old-reset-tokens' into 'develop' Haelwenn 2020-11-19 16:22:14 +00:00
  • 6fc38aac88 Merge branch 'fix-rum-search' into 'develop' rinpatch 2020-11-19 16:20:59 +00:00
  • b38c3de411 Gitlab CI: Update postgres lain 2020-11-19 17:15:05 +01:00
  • 1eda5ab267 CHANGELOG.md: Move rum fix entry to patch section rinpatch 2020-11-19 19:13:19 +03:00
  • 783fa797bb SearchController Test: Fix test lain 2020-11-19 16:53:26 +01:00
  • 81b6f02a5e Search Test: linting lain 2020-11-19 16:48:51 +01:00
  • 8b90d62506 Search: Only skip ordering the rum index. lain 2020-11-19 16:29:31 +01:00
  • 3b86ad0744 Changelog: Document breaking change. lain 2020-11-19 16:26:17 +01:00
  • 4a5ab690ef Config: Set search_function to websearch by default lain 2020-11-19 16:17:14 +01:00
  • 1c16c67c21 Cheatsheet: Add info about search_function lain 2020-11-19 16:16:55 +01:00
  • 1bad91cba2 Changelog: Add info about the websearch option lain 2020-11-19 16:13:53 +01:00
  • a60242464e Search: Add option to search with the websearch function lain 2020-11-19 16:12:01 +01:00
  • fcad3e716a [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results. Ivan Tashkinov 2020-11-19 18:08:22 +03:00
  • 46dab37351
         little fix Alexander Strizhakov 2020-11-19 15:29:26 +03:00
  • 2ee0fc194a Changelog: Add info about search fixes. lain 2020-11-19 13:23:58 +01:00
  • 5e2ba57327 Activity search: Fix order of results lain 2020-11-19 13:20:58 +01:00
  • 21eaaf491c Changelog: Add info about reset tokens lain 2020-11-19 12:29:41 +01:00
  • f6c22f4d08 Cheatsheet: Add docs about reset token expiration lain 2020-11-19 12:28:39 +01:00
  • 11e0d5f9ac Password Resets: Don't accept tokens above a certain age. lain 2020-11-19 12:27:06 +01:00
  • 6f9b03384f Merge branch 'hide-muted-reactions' into 'develop' lain 2020-11-19 10:58:28 +00:00
  • 4aaffe3a10
         log capture Alexander Strizhakov 2020-11-18 16:36:24 +03:00
  • 8a8c154b4e
         test fixes Alexander Strizhakov 2020-11-18 10:03:48 +03:00
  • 44f3795b8e
         changelog entries for fixes Alexander Strizhakov 2020-11-17 20:03:28 +03:00
  • be0b874e1d
         fix for mastodon forwarded reports Alexander Strizhakov 2020-11-17 19:57:57 +03:00
  • a840aefda8
         formatting Alexander Strizhakov 2020-11-16 19:41:03 +03:00
  • e2bf6b1f7e
         fix for forwarded reports Alexander Strizhakov 2020-11-16 19:22:32 +03:00
  • 8a7ee9fe74 Merge branch 'revert-da4660d2' into 'develop' feld 2020-11-18 21:16:12 +00:00
  • 3e7642b123 Update AdminFE build to pleroma/admin-fe@c18f167a12 Mark Felder 2020-11-18 14:42:16 -06:00
  • 42ff5ea95e Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" feld 2020-11-18 20:32:30 +00:00
  • 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions' minibikini 2020-11-18 20:22:40 +00:00
  • 1d03ba4ffb Fixed emoji reactions not being filtered from blocked and muted accounts Mark Felder 2020-11-18 20:13:25 +00:00
  • a1056aace1 Merge branch 'fix/mix-task-user-delete_activities' into 'develop' feld 2020-11-18 18:57:47 +00:00
  • aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop' lain 2020-11-18 18:33:48 +00:00
  • 1b63aa0b4f Apply 1 suggestion(s) to 1 file(s) lain 2020-11-18 18:27:30 +00:00
  • 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop' lain 2020-11-18 17:51:57 +00:00
  • d7b63272b8 Changelog: Move api info to api heading. lain 2020-11-18 18:32:13 +01:00
  • 9c5d1cb9ed fix tests Maksim Pechnikov 2020-11-18 09:58:51 +03:00
  • 3c00af82dc Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:37 +00:00
  • 137b7f9e28 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:30 +00:00
  • e91e2399ee Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:22 +00:00
  • ce11f0bc33 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:09 +00:00
  • 25eb222bed Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:01 +00:00
  • fe7008ee39 Merge branch 'update/admin-fe-20201117' into 'develop' feld 2020-11-17 23:16:17 +00:00
  • ad7fc35252 Update AdminFE build to pleroma/admin-fe@5b38aea279 Mark Felder 2020-11-17 17:01:34 -06:00
  • 415481a4d9 Add test for POST when push is disabled Mark Felder 2020-11-17 22:18:22 +00:00
  • 3eaa5335c9 Revert adding extra alert types here Mark Felder 2020-11-17 21:37:17 +00:00
  • d9732fb7d3 Fix incorrect test description Mark Felder 2020-11-17 21:34:18 +00:00
  • ccddedb504 Credo Mark Felder 2020-11-17 20:33:30 +00:00
  • ff7a4b6aa2 Test that we ignore invalid subscription alert types separately. Mark Felder 2020-11-17 20:18:51 +00:00
  • 30f140e570 Ensure all supported push notification subscription alert types are tested Mark Felder 2020-11-17 20:14:38 +00:00
  • 499faa82f6 Synchronize reaction notification text with PleromaFE's style Mark Felder 2020-11-17 19:51:37 +00:00
  • 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription Mark Felder 2020-11-17 20:21:48 +00:00
  • 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions Mark Felder 2020-11-17 19:15:11 +00:00
  • 80e21903d4 Spelling Mark Felder 2020-11-17 19:06:30 +00:00
  • 1433d3c59c Document the API extensions for push subscriptions Mark Felder 2020-11-17 19:05:36 +00:00
  • 83ec2f1384 Allow subscribing for pleroma:emoji_reaction push notifications Mark Felder 2020-11-17 18:33:40 +00:00
  • 3ce11b830e Add capability for emoji reaction push notifications Mark Felder 2020-11-13 17:01:53 -06:00
  • e6d4d62f85 Docs: Add info about frontend install error response lain 2020-11-17 16:44:20 +01:00
  • bb9650f3c2 FrontendController: Return error on installation error. lain 2020-11-17 16:43:07 +01:00
  • 56d95203b5 Document fixing the pleroma.user delete_activities mix task Mark Felder 2020-11-17 15:28:46 +00:00
  • 97201f7e37 Need to start web_resp cache or mix task fails Mark Felder 2020-11-17 15:15:53 +00:00