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

Commit Graph

  • 572363793f Merge branch 'fix/2579-finger-content-type' into 'develop' rinpatch 2021-03-21 08:25:02 +00:00
  • 72143dd732 Merge branch 'richmedia-workaround' into 'develop' rinpatch 2021-03-21 08:19:42 +00:00
  • e8107cc96a
         pleroma installer and config versioning Alexander Strizhakov 2020-07-16 19:57:27 +03:00
  • 8f78361525 Merge branch 'fix/timex-retired-version' into 'develop' feld 2021-03-20 15:52:01 +00:00
  • 46aa2998a2
         changelog merging fix issue/2190 Alexander Strizhakov 2021-02-28 20:25:22 +03:00
  • 48fb2d0d0b
         using exists instead of join with distinct Alexander Strizhakov 2021-02-23 15:14:37 +03:00
  • b1f9fa5245
         not used Alexander Strizhakov 2021-02-23 14:25:15 +03:00
  • 9514458faa
         resolving comments Alexander Strizhakov 2021-02-20 16:36:58 +03:00
  • dbc3315268
         docs update Alexander Strizhakov 2020-12-18 08:01:25 +03:00
  • 4ebe8cac0f
         route change Alexander Strizhakov 2020-12-18 07:57:05 +03:00
  • 17bf79c44d
         route fix in docs Alexander Strizhakov 2020-12-14 15:51:04 +03:00
  • 9037d7114b
         little refactor Alexander Strizhakov 2020-12-13 17:28:13 +03:00
  • 1c00933953
         added User.tag_names Maksim Pechnikov 2020-11-13 16:05:23 +03:00
  • a4dac51568
         fix migrate Maksim Pechnikov 2020-11-13 15:39:38 +03:00
  • 32c5909686
         update test Maksim Pechnikov 2020-11-13 15:30:37 +03:00
  • a09fae8820
         fix test Maksim Pechnikov 2020-10-31 08:54:29 +03:00
  • 099c5e81c3
         fix migrations Maksim Pechnikov 2020-10-29 11:34:41 +03:00
  • b9f8d3763d
         fix tests Maksim Pechnikov 2020-10-29 11:04:44 +03:00
  • bc83fedfb3
         added api spec Maksim Pechnikov 2020-10-28 11:57:46 +03:00
  • f0eb5cf5b2
         updated user tags Maksim Pechnikov 2020-10-22 10:44:00 +03:00
  • c5e0821a12
         added users_tags table Maksim Pechnikov 2020-10-16 22:33:47 +03:00
  • 34d8ce945f
         added Tag schema Maksim Pechnikov 2020-10-14 09:29:23 +03:00
  • 35e8573483
         added /api/pleroma/admin/users/tag Maksim Pechnikov 2020-10-14 09:26:05 +03:00
  • ef5b0510eb
         updating timex Alexander Strizhakov 2021-03-20 08:29:02 +03:00
  • e2805a3f2d I'm a tard Your New SJW Waifu 2021-03-19 13:10:09 -05:00
  • 47e6e7f61b Elixer is a fuck Your New SJW Waifu 2021-03-19 13:04:09 -05:00
  • 265b00da10 update AntiHellthreadPolicy Your New SJW Waifu 2021-03-19 12:56:39 -05:00
  • 7201fd15ec Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-03-19 12:38:52 -05:00
  • d7e51206a2
         respect content-type header in finger request Alexander Strizhakov 2021-03-18 13:49:03 +03:00
  • a9bc652ab9 Merge branch 'mediaproxy-decode' into 'develop' rinpatch 2021-03-19 08:52:12 +00:00
  • f930e83fa2 Merge branch 'fix/remove_auto_nsfw' into 'develop' rinpatch 2021-03-19 08:48:22 +00:00
  • 67bde35e71 Merge branch 'bugfix/bridgy-user-icon' into 'develop' rinpatch 2021-03-19 08:36:26 +00:00
  • 441443ace2
         not needed feature/installer Alexander Strizhakov 2021-03-17 18:19:11 +03:00
  • 30d3127c8b
         Merge branch 'feature/2145-installer-and-configdb-changes' into feature/installer Alexander Strizhakov 2021-03-17 08:51:18 +03:00
  • 36bd97ba87
         pleroma installer and config versioning Alexander Strizhakov 2020-07-16 19:57:27 +03:00
  • be02684579
         config versioning Alexander Strizhakov 2020-07-16 19:57:27 +03:00
  • a2aa309496 Merge branch 'update_open_api_spex' into 'develop' Haelwenn 2021-03-16 01:54:43 +00:00
  • 5cf99f713a
         fix after rebase feature/dynamic-supervisor Alexander Strizhakov 2021-03-15 16:37:35 +03:00
  • 7e10166065
         start chat deps through supervisor Alexander Strizhakov 2021-03-14 18:10:08 +03:00
  • 90a2b50673
         start PubSub with chat Alexander Strizhakov 2021-03-14 18:00:10 +03:00
  • 12e32e976f
         don't fully restart Pleroma on config update Alexander Strizhakov 2021-03-14 14:51:39 +03:00
  • 8194622a72 Merge branch 'feature/object-hashtags-rework' into 'develop' rinpatch 2021-03-15 09:35:46 +00:00
  • 55bdfb075c
         OpenAPI: TwitterAPI Util Controller Haelwenn (lanodan) Monnier 2021-02-24 23:40:33 +01:00
  • 65cd9cb638
         TwitterAPI: Remove unused read notification function Haelwenn (lanodan) Monnier 2021-02-17 09:41:40 +01:00
  • a22c53810b
         Remove deprecated /api/qvitter/statuses/notifications/read Haelwenn (lanodan) Monnier 2021-02-17 01:19:25 +01:00
  • e4743847a1
         OpenAPI: PleromaAPI UserImport Controller Haelwenn (lanodan) Monnier 2021-02-17 01:07:56 +01:00
  • ef5de5eb39
         OpenAPI: MastodonAPI Status Controller Haelwenn (lanodan) Monnier 2021-02-17 00:45:01 +01:00
  • 0c7c6463d1
         OpenAPI: MastodonAPI Account Controller, excluding OAuth Haelwenn (lanodan) Monnier 2021-02-17 00:35:26 +01:00
  • 3a8404820d
         Verify MastoFE Controller put_settings response Haelwenn (lanodan) Monnier 2021-02-16 23:40:50 +01:00
  • e47f83cfc8
         OpenAPI: MastodonAPI Conversation Controller Haelwenn (lanodan) Monnier 2021-02-16 23:39:07 +01:00
  • 3123ecdd6e
         OpenAPI: MastodonAPI Media Controller Haelwenn (lanodan) Monnier 2021-02-16 23:37:16 +01:00
  • 7eecc3b61d
         OpenAPI: MastodonAPI Timeline Controller Haelwenn (lanodan) Monnier 2021-02-16 23:23:35 +01:00
  • b1d4b2b81e
         Add support for actor icon being a list (Bridgy) Haelwenn (lanodan) Monnier 2021-03-15 06:43:12 +01:00
  • 19fbe5b860 Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2021-03-14 08:09:22 +00:00
  • 7c1f43c089 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-03-13 22:39:29 -06:00
  • b80f868c6b Prefer naming this function build_image_url/2 Mark Felder 2021-03-13 12:27:15 -06:00
  • 2408363e2a Translated using Weblate (Italian) Ben Is 2021-03-11 13:51:22 +00:00
  • cb73456609 [#3213] Code formatting fix. Ivan Tashkinov 2021-03-12 12:25:18 +03:00
  • 3edf45021e [#3213] Background migration infrastructure refactoring. Extracted BaseMigrator and BaseMigratorState. Ivan Tashkinov 2021-03-12 12:18:11 +03:00
  • fbcddd8126 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework Ivan Tashkinov 2021-03-12 08:49:25 +03:00
  • 9de2a5024e Merge branch 'improve-gitlab-ci' into 'develop' rinpatch 2021-03-11 19:14:59 +00:00
  • 884584772b Execute mix deps.get earlier and avoid duplicate invocations if possible Mark Felder 2021-03-11 09:40:40 -06:00
  • 029ff65389 Leverage function pattern matching instead Mark Felder 2021-03-11 09:20:29 -06:00
  • 8246db2a96 Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771 Mark Felder 2021-03-06 12:02:32 -06:00
  • 8e09a3cfa0 Merge branch 'fix/spec-build' into 'develop' feld 2021-03-10 23:14:46 +00:00
  • fa75f11ca1 Revert "See if switching to same image as releases fixes the build" Mark Felder 2021-03-10 16:37:24 -06:00
  • 502d166b7e See if switching to same image as releases fixes the build Mark Felder 2021-03-10 16:19:18 -06:00
  • 8feeb672c8 Ensure we fetch deps during spec-build stage Mark Felder 2021-03-10 13:03:14 -06:00
  • 965f88cfc7
         formatting feature/1820-unify-settings Alexander Strizhakov 2020-11-20 11:01:26 +03:00
  • f1781c14eb
         fixes after rebase Alexander Strizhakov 2020-11-20 10:33:27 +03:00
  • af6725121f
         removing saving settings in mastofe Alexander Strizhakov 2020-06-29 12:07:00 +03:00
  • 5361e40162
         updated difference docs Alexander Strizhakov 2020-06-27 15:42:33 +03:00
  • f6ae86a081
         some clean up Alexander Strizhakov 2020-06-18 10:40:25 +03:00
  • 9f33c5fe63
         Apply suggestion to lib/pleroma/web/masto_fe_controller.ex Alexander Strizhakov 2020-06-17 15:37:27 +00:00
  • 46492a2aee
         set alert types in compile time Alexander Strizhakov 2020-06-17 18:39:20 +03:00
  • a74d0f8b27
         little test change Alexander Strizhakov 2020-06-17 18:07:36 +03:00
  • 16bcffd64a
         unify notification settings Alexander Strizhakov 2020-06-16 08:41:57 +03:00
  • 946e0aab49 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework Ivan Tashkinov 2021-03-10 07:48:50 +03:00
  • 7f413139fb Merge branch 'openapi/admin/user' into 'develop' Haelwenn 2021-03-10 03:24:40 +00:00
  • 48b8efa759
         Fixup OAuth [wip] tests/openapi-oauth Haelwenn (lanodan) Monnier 2021-03-04 02:54:55 +01:00
  • dadeb5c36a
         OpenAPI: OAuth Controllers Haelwenn (lanodan) Monnier 2021-03-01 06:40:03 +01:00
  • a8db1189f2
         OpenAPI: PleromaAPI 2FAController Haelwenn (lanodan) Monnier 2021-03-01 06:41:00 +01:00
  • 0e511d7b80
         OpenAPI: TwitterAPI Util Controller Haelwenn (lanodan) Monnier 2021-02-24 23:40:33 +01:00
  • 3732c51cf7
         TwitterAPI: Remove unused read notification function Haelwenn (lanodan) Monnier 2021-02-17 09:41:40 +01:00
  • 7f0b991ad6
         Remove deprecated /api/qvitter/statuses/notifications/read Haelwenn (lanodan) Monnier 2021-02-17 01:19:25 +01:00
  • b4e0ae8a03
         OpenAPI: PleromaAPI UserImport Controller Haelwenn (lanodan) Monnier 2021-02-17 01:07:56 +01:00
  • 8866551b25
         OpenAPI: MastodonAPI Status Controller Haelwenn (lanodan) Monnier 2021-02-17 00:45:01 +01:00
  • 0d1ee37cd5
         OpenAPI: MastodonAPI Account Controller, excluding OAuth Haelwenn (lanodan) Monnier 2021-02-17 00:35:26 +01:00
  • 510c78028a
         Verify MastoFE Controller put_settings response Haelwenn (lanodan) Monnier 2021-02-16 23:40:50 +01:00
  • 8824286ee8
         OpenAPI: MastodonAPI Conversation Controller Haelwenn (lanodan) Monnier 2021-02-16 23:39:07 +01:00
  • 2bfd727a71
         OpenAPI: MastodonAPI Media Controller Haelwenn (lanodan) Monnier 2021-02-16 23:37:16 +01:00
  • 989cda6509
         OpenAPI: MastodonAPI Timeline Controller Haelwenn (lanodan) Monnier 2021-02-16 23:23:35 +01:00
  • 92526e0230 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework Ivan Tashkinov 2021-03-07 11:34:39 +03:00
  • 7f8785fd9b [#3213] Performance optimization of filtering by hashtags ("any" condition). Ivan Tashkinov 2021-03-07 11:33:21 +03:00
  • 79febf9688 Added assets to the list of the reserved nicknames and static file constants add-assets-to-static-file-constants eugenijm 2021-03-06 23:53:45 +03:00
  • eaaa20e0f1 Make tests use it Mark Felder 2021-03-05 13:21:22 -06:00
  • e97b34f65d Add simple way to decode fully qualified mediaproxy URLs Mark Felder 2021-03-05 13:18:37 -06:00
  • 92ab72dbbb
         Update OpenApiSpex dependency Egor Kislitsyn 2021-03-05 15:51:29 +04:00
  • 9876fa8e90
         Add UserOperation to Redoc Egor Kislitsyn 2021-03-04 21:13:53 +04:00
  • ccffa176e9 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-03-04 07:54:17 -06:00