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

Commit Graph

  • bfdd90f6d7 AuthenticationPlug: Also update crypt passwords. lain 2020-05-17 11:40:25 +02:00
  • baef35bcc8 Authentication Plug: Update bcrypt password on login. lain 2020-05-17 10:31:01 +02:00
  • b0ccdb5af4 Merge branch 'weblate-pleroma-pleroma' into 'develop' lain 2020-05-17 07:58:24 +00:00
  • 4b6190baec Translated using Weblate (Polish) Jędrzej Tomaszewski 2020-05-16 14:06:36 +00:00
  • 5725e03f55 Added translation using Weblate (Dutch) Fristi 2020-05-15 09:37:44 +00:00
  • 64b3d81e50 Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop' lain 2020-05-17 07:48:52 +00:00
  • 21c85a106c Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop' lain 2020-05-17 07:26:56 +00:00
  • 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop' lain 2020-05-17 07:26:51 +00:00
  • af9dfdce6b MediaController OAuth scope assignments fix. Typo fix (def get_media instead of def show). Ivan Tashkinov 2020-05-17 08:46:43 +03:00
  • 3f8d68bdf3 added example cache purge script Maksim Pechnikov 2020-05-16 15:16:33 +03:00
  • ce0aed60c3 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-16 13:37:48 -05:00
  • 4a925b964a Remove description of the settings that should't be altered Angelina Filippova 2020-05-16 20:39:42 +03:00
  • d96f8f17e8 Merge branch 'features/mastoapi_v2_media' into 'develop' lain 2020-05-16 17:13:38 +00:00
  • d15aa9d950 Merge branch 'develop' into 'remove-twitter-api' lain 2020-05-16 17:07:09 +00:00
  • 978ccf8f97 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-05-16 16:14:50 +03:00
  • 3bc1138dd9 Merge branch '1757-fix-unblocks-too' into 'develop' rinpatch 2020-05-16 11:17:14 +00:00
  • 2dcb26a6e5 CommonAPI: Unblock a user even if we don't have an activity. lain 2020-05-16 12:28:24 +02:00
  • cb40602a16 added media proxy invalidation Maksim Pechnikov 2020-05-15 21:34:46 +03:00
  • ed2ef3a249 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-15 10:13:49 -05:00
  • aeacfb2479 Merge branch 'chore/update-fe-settings-and-docs' into 'develop' lain 2020-05-15 14:37:38 +00:00
  • 5633637862 Merge branch 'fix/digest-task-otp' into 'develop' lain 2020-05-15 14:22:59 +00:00
  • fee3aa82e8 Merge branch 'fix/database-config' into 'develop' lain 2020-05-15 13:45:02 +00:00
  • 3c29f4f957
         returning partial chain Alexander Strizhakov 2020-05-15 16:16:02 +03:00
  • f012c3a202 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-15 13:33:04 +02:00
  • 1d18721a3c Chats: Add updated_at to Schema and docs. lain 2020-05-15 13:18:41 +02:00
  • 081d1d3f48 Merge branch 'openapi/nullable-request-fields' into 'develop' rinpatch 2020-05-15 11:13:08 +00:00
  • e090191d03
         [OpenAPI] Mark all not required request fields as nullable Egor Kislitsyn 2020-05-15 14:55:41 +04:00
  • 907acbf62b Merge branch 'weblate-pleroma-pleroma' into 'develop' rinpatch 2020-05-15 05:06:29 +00:00
  • ba2409f19c Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-14 13:08:54 -05:00
  • e4b12494d7 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-05-14 20:19:56 +03:00
  • f1f588fd52 [#2497] Added support for :eimp for image resizing. Ivan Tashkinov 2020-05-14 20:18:31 +03:00
  • 0d074751b5 Translated using Weblate (Polish) Michał Sidor 2020-05-14 11:19:12 +00:00
  • 08f5e49395 Translated using Weblate (Polish) Michał Sidor 2020-05-13 16:49:25 +00:00
  • c2e57f2981 Added translation using Weblate (Polish) Michał Sidor 2020-05-13 16:37:17 +00:00
  • e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop' rinpatch 2020-05-14 16:07:37 +00:00
  • 80308c5c26
         Add config migration disclaimer to config whitelist documentation Stephanie Wilde-Hobbs 2020-05-14 15:56:14 +01:00
  • 4157c459b8 Merge branch 'bcrypt-auth' into 'develop' lain 2020-05-14 14:36:56 +00:00
  • 5b0f27d23d
         Pbkdf2.verify_pass --> AuthenticationPlug.checkpw Alex Gleason 2020-05-14 08:42:27 -05:00
  • bb03dfdb03
         Do not require description in update action Egor Kislitsyn 2020-05-14 16:29:32 +04:00
  • 0f885b4b86
         Fix OpenAPI spec Egor Kislitsyn 2020-05-14 16:18:30 +04:00
  • 15495ad712 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-14 07:07:47 -05:00
  • 3eff542678
         Add Changelog entry Stephanie Wilde-Hobbs 2020-05-14 12:36:49 +01:00
  • 20cbfb5cb5
         Allow whitelisting whole groups Stephanie Wilde-Hobbs 2020-05-14 12:34:46 +01:00
  • 3342846ac2 ChatView: Add update_at field. lain 2020-05-14 13:20:28 +02:00
  • 5c6f575315
         Style fixes Steph 2020-05-14 09:50:53 +00:00
  • 099e314a1b
         Add OpenAPISpex for MediaController Haelwenn (lanodan) Monnier 2020-05-14 10:50:12 +02:00
  • a2a8c8e9e0 Merge branch 'features/openrc-console' into 'develop' lain 2020-05-14 09:27:33 +00:00
  • 39ec1af993 Merge branch 'openapi/pleroma-api/accounts' into 'develop' lain 2020-05-14 09:25:18 +00:00
  • 41db52729e Apply suggestion to docs/configuration/storing_remote_media.md lain 2020-05-14 09:14:59 +00:00
  • 359d7b0a6d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex lain 2020-05-14 09:09:11 +00:00
  • 1c2629328d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex lain 2020-05-14 09:07:09 +00:00
  • 4134bfbbb2 Merge branch 'pleroma_internal' into 'develop' lain 2020-05-14 08:22:53 +00:00
  • cb363f0183
         MastodonAPI: /api/v2/media endpoints Haelwenn (lanodan) Monnier 2020-04-29 17:38:14 +02:00
  • e688d4ee69
         MRF.StealEmojiPolicy: New Policy Haelwenn (lanodan) Monnier 2020-04-14 18:59:04 +02:00
  • 3755c6e440 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-13 21:40:27 -05:00
  • 54b4824186 Lint Mark Felder 2020-05-13 17:07:14 -05:00
  • 6f53d8815e Clarify where the Features panel is Mark Felder 2020-05-13 16:57:33 -05:00
  • 2560a4aa56 Formatting Mark Felder 2020-05-13 16:51:23 -05:00
  • 0c82a967ec Add missing showFeaturesPanel setting Mark Felder 2020-05-13 16:49:56 -05:00
  • 5131149056 add postContentType setting Mark Felder 2020-05-13 16:45:16 -05:00
  • 52a95a0265 Add missing nsfwCensorImage option Mark Felder 2020-05-13 16:40:04 -05:00
  • 923ab78807 Add missing hideSitename setting Mark Felder 2020-05-13 16:36:33 -05:00
  • c86cdb76a7 Add hideFilteredStatuses and hideMutedPosts settings Mark Felder 2020-05-13 16:35:12 -05:00
  • 7f00698c3b Add greentext option Mark Felder 2020-05-13 16:32:38 -05:00
  • 38fb5eaf6a formattingOptionsEnabled no longer exists Mark Felder 2020-05-13 16:31:15 -05:00
  • 4bdde143f9 Add disableChat option Mark Felder 2020-05-13 16:30:24 -05:00
  • 2420d7f439 Spelling/grammar Mark Felder 2020-05-13 16:26:49 -05:00
  • 4aad764c1d enableEmojiPicker is not a setting Mark Felder 2020-05-13 16:24:37 -05:00
  • 2e28b50132 scopeOptionsEnabled has been replaced with minimalScopesMode Mark Felder 2020-05-13 16:23:42 -05:00
  • e2c80e62f1 Stickers setting does not exist Mark Felder 2020-05-13 16:19:17 -05:00
  • 1e48aee50e Alpha sort FE config descriptions Mark Felder 2020-05-13 16:18:26 -05:00
  • 249e009c5e
         Add pleroma_internal as an internal field Alex Gleason 2020-05-13 16:14:24 -05:00
  • 1b93581162 Synchronize suggestions with all available static/config.json settings Mark Felder 2020-05-13 16:03:42 -05:00
  • 3525400eb2 Sync FE static/config.json Mark Felder 2020-05-13 15:57:39 -05:00
  • 8a383707ae Merge develop Roman Chvanikov 2020-05-13 19:56:40 +03:00
  • d7d352b869 Merge branch 'weblate-pleroma-pleroma' into 'develop' rinpatch 2020-05-13 16:26:34 +00:00
  • 74912dd9ee PleromaFE bundle supporting with_relationships param. https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49 Ivan Tashkinov 2020-05-13 19:20:21 +03:00
  • 8062d590dd [#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search. Ivan Tashkinov 2020-05-13 18:56:45 +03:00
  • 9cbf17d59f
         Handle bcrypt passwords for Mastodon migration Alex Gleason 2020-05-12 16:57:01 -05:00
  • df2b7a6909 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-13 10:16:32 -05:00
  • 6802dc28ba
         Add OpenAPI spec for PleromaAPI.AccountController Egor Kislitsyn 2020-05-13 19:06:25 +04:00
  • 5f5681282e Translated using Weblate (French) Haelwenn (lanodan) Monnier 2020-05-11 23:08:20 +00:00
  • da550be066 Merge branch 'fix/1742-random-failing-tests' into 'develop' lain 2020-05-13 13:38:32 +00:00
  • 0f0acc740d Chat: Allow posting without content if an attachment is present. lain 2020-05-13 15:31:28 +02:00
  • 59b6d5f2aa [#2456] Changed embed_relationships param to with_relationships. Ivan Tashkinov 2020-05-13 15:08:07 +03:00
  • 06cad239e5 InstanceView: Add pleroma chat messages to nodeinfo lain 2020-05-13 14:05:22 +02:00
  • ae3b0b4c0d
         Fix digest mix task on OTP releases Michael Weiss 2020-05-13 13:08:10 +02:00
  • 3cff4e24cd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-13 12:44:16 +02:00
  • 6706cdce65 Merge branch 'openapi/suggestions' into 'develop' lain 2020-05-13 10:34:04 +00:00
  • bcadbf964a
         Add OpenAPI spec for SuggestionController Egor Kislitsyn 2020-05-13 14:15:24 +04:00
  • 33b798425f [#2456] Post-merge fix. Ivan Tashkinov 2020-05-13 12:50:52 +03:00
  • fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding Ivan Tashkinov 2020-05-13 12:42:36 +03:00
  • 156c8a5088 Merge branch 'openapi/statuses' into 'develop' lain 2020-05-13 09:34:30 +00:00
  • 1307d6ca3c Merge branch 'openapi/timelines' into 'develop' lain 2020-05-13 09:33:37 +00:00
  • fbe3d3aa5f
         ignore order Alexander Strizhakov 2020-05-13 10:17:47 +03:00
  • 2c356a4bac
         don't use async with global mocks Alexander Strizhakov 2020-05-13 09:29:41 +03:00
  • 12635bc156
         don't use global mocks in setup callbacks Alexander Strizhakov 2020-05-13 09:20:25 +03:00
  • b962b24e6f
         don't run in async if tests depend on env config Alexander Strizhakov 2020-05-13 08:00:17 +03:00
  • ec27f346ee
         correct order for publised in assert Alexander Strizhakov 2020-05-12 12:12:10 +03:00
  • e0944dee99
         make test fail everytime Alexander Strizhakov 2020-05-11 15:22:52 +03:00