Commit graph

  • eee98aaa73 Pleroma API: Add endpoint to get conversation statuses. lain 2019-08-02 19:53:08 +0200
  • 5eec0abe09 Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop' feld 2019-08-02 17:07:09 +0000
  • d93d777915 Fix/mediaproxy whitelist base url feld 2019-08-02 17:07:09 +0000
  • 9d4f34fbcb Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-08-02 18:16:04 +0300
  • 56b1c3af13 CommonAPI: Extend api with conversation replies. lain 2019-08-02 15:05:27 +0200
  • 5ff8f07ca9 Merge branch 'feature/hide-follows-remote' into 'develop' lain 2019-08-02 11:23:07 +0000
  • f88560accd Conversations: Add recipient list to conversation participation. lain 2019-08-02 11:55:41 +0200
  • 1fe092e03c Merge branch 'fix/semver-violations' into 'develop' kaniini 2019-08-01 16:37:04 +0000
  • fd4b7239cd nothing lain 2019-08-01 17:25:46 +0200
  • 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. Ivan Tashkinov 2019-08-01 17:28:00 +0300
  • 955985fe2c Merge branch 'cleanup-tests' into 'develop' rinpatch 2019-08-01 13:38:15 +0000
  • 81412240e6 Fix Invalid SemVer version generation rinpatch 2019-08-01 14:15:18 +0300
  • f98235f2ad Clean up tests output Egor Kislitsyn 2019-08-01 16:33:36 +0700
  • 9ca4506355 Add configurable length limits for User.bio and User.name Egor Kislitsyn 2019-08-01 15:53:37 +0700
  • cdfd02e904 Merge branch 'chore/changelog-update' into 'develop' kaniini 2019-07-31 20:08:27 +0000
  • def0c49ead Add a changelog entry for disallowing locked accounts follows over OStatus rinpatch 2019-07-31 23:03:06 +0300
  • 6c06529cd4 Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop' kaniini 2019-07-31 19:13:56 +0000
  • 813c686dd7 Disallow following locked accounts over OStatus rinpatch 2019-07-31 22:05:12 +0300
  • b431b565f0 Merge branch 'test/web_common_api_utils' into 'develop' kaniini 2019-07-31 18:35:15 +0000
  • 6eb33e7303 test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id Maksim 2019-07-31 18:35:15 +0000
  • 8980c1c769 Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop' kaniini 2019-07-31 18:30:40 +0000
  • f72e0b7cad ostatus: explicitly disallow protocol downgrade from activitypub Ariadne Conill 2019-07-31 17:23:16 +0000
  • 301ea0dc04 Add tests for counters being updated on follow rinpatch 2019-07-31 19:37:55 +0300
  • 957de9d771 Merge branch 'test/twitter/util_controller' into 'develop' kaniini 2019-07-31 15:14:36 +0000
  • 58443d0cd6 tests for TwitterApi/UtilController Maksim 2019-07-31 15:14:36 +0000
  • 3cc6cb266b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-31 14:23:03 +0100
  • 7483679a7b StatusView: Return direct conversation id. lain 2019-07-31 15:12:29 +0200
  • f42719506c Fix credo issues rinpatch 2019-07-31 14:20:34 +0300
  • c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote rinpatch 2019-07-31 14:12:29 +0300
  • 373a7c6739 Merge branch 'admin-changes' into 'develop' kaniini 2019-07-30 16:36:05 +0000
  • 51b3b6d816 Admin changes Alexander Strizhakov 2019-07-30 16:36:05 +0000
  • 677df5ceb3 Merge branch 'security/remote-follow-commonapi' into 'develop' kaniini 2019-07-29 20:10:59 +0000
  • 3850812503 twitter api: utils: rework do_remote_follow() to use CommonAPI Ariadne Conill 2019-07-29 20:00:57 +0000
  • 6657506185 Merge branch 'revert-83508418' into 'develop' kaniini 2019-07-29 19:42:35 +0000
  • 5835069215 Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" kaniini 2019-07-29 19:42:26 +0000
  • 83508418fb Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop' Haelwenn 2019-07-29 19:24:14 +0000
  • 5795a890e9 markdown: clean up html generated by earmark Ariadne Conill 2019-07-29 19:09:58 +0000
  • 1dfde4151c Merge branch 'refactor/use-constants' into 'develop' lain 2019-07-29 16:30:47 +0000
  • 3b8cd27b05 Merge branch 'mailer-enabled-nodeinfo' into 'develop' kaniini 2019-07-29 16:17:41 +0000
  • 0bee2131ce Add mailerEnabled to the NodeInfo metadata Eugenij 2019-07-29 16:17:40 +0000
  • 8be0154094 Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop' kaniini 2019-07-29 16:17:23 +0000
  • c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances Sergey Suprunenko 2019-07-29 16:17:22 +0000
  • 1f7c8d9615 Merge branch 'tests/ostatus_controller' into 'develop' kaniini 2019-07-29 05:02:20 +0000
  • 159bbec570 added tests for OstatusController Maksim 2019-07-29 05:02:20 +0000
  • b93498eb52 constants: add as_public constant and use it everywhere Ariadne Conill 2019-07-29 02:43:19 +0000
  • 9d78b3b281 mix: add ex_const dependency Ariadne Conill 2019-07-29 02:12:35 +0000
  • b38d21060e Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' kaniini 2019-07-28 21:40:55 +0000
  • 492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Ariadne Conill 2019-07-28 21:29:10 +0000
  • 44bfff22a7 Merge branch 'confirmation-resend' into 'develop' kaniini 2019-07-28 20:30:10 +0000
  • 242f5c585e add account confirmation email resend in mastodon api Sachin Joshi 2019-07-28 20:30:10 +0000
  • 0d05ec3855 Merge branch 'fix/user_update_and_set_cache' into 'develop' kaniini 2019-07-28 20:29:27 +0000
  • 6a4b8b2681 fixed User.update_and_set_cache for stale user Maksim 2019-07-28 20:29:26 +0000
  • 488c06b6f5 Merge branch 'develop' into 'develop' kaniini 2019-07-28 20:25:35 +0000
  • f78390ffdf Merge branch 'feature/hackney-303-redirect' into 'develop' kaniini 2019-07-28 20:24:39 +0000
  • 02dc651828 Handle 303 redirects Sergey Suprunenko 2019-07-28 20:24:39 +0000
  • 961e778531 Fix HTTP sig tweak on KeyId Thomas Sileo 2019-07-28 14:17:56 +0200
  • 08960d5016 Merge branch 'issue/1097' into 'develop' rinpatch 2019-07-26 20:27:38 +0000
  • 6b77a88365 [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ Maksim 2019-07-26 20:27:38 +0000
  • 46e8b68093 Merge branch 'changelog/1484-base_url-remove-media' into 'develop' Haelwenn 2019-07-26 15:27:12 +0000
  • 7c8abbcb1c
    CHANGELOG.md: Add entry for !1484 Haelwenn (lanodan) Monnier 2019-07-26 15:33:25 +0200
  • 41e0304757 Merge branch 'develop' into feature/hide-follows-remote rinpatch 2019-07-25 18:43:30 +0300
  • df10367b35 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-25 12:00:29 +0100
  • d1e891062e Merge branch 'tests/filter_dedupe' into 'develop' kaniini 2019-07-25 03:43:13 +0000
  • 03c386614f fixed test for elixir 1.7.4 Maksim 2019-07-25 03:43:13 +0000
  • 19835be067 Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' kaniini 2019-07-24 19:29:01 +0000
  • 931c4974ee Merge branch 'fix/put-correct-activity-url' into 'develop' kaniini 2019-07-24 19:28:21 +0000
  • b20020da16 Show the url advertised in the Activity in the Status JSON response Sergey Suprunenko 2019-07-24 19:28:21 +0000
  • 8d9f43e1d1
    Add WebFinger test for AP-only account kPherox 2019-07-25 01:27:34 +0900
  • acd20914ec Merge branch 'fix/Upload_base_url' into 'develop' kaniini 2019-07-24 15:35:25 +0000
  • 84fca14c3c Do not prepend /media/ when using base_url feld 2019-07-24 15:35:25 +0000
  • 0e2b5a3e6a WIP Mike Verdone 2019-07-24 17:25:11 +0200
  • ac27b94ffa
    Change to not require magic-public-key on WebFinger kPherox 2019-07-24 23:38:38 +0900
  • 7286cdff7a Merge branch 'tests/web_finger' into 'develop' kaniini 2019-07-24 15:13:11 +0000
  • 55341ac717 tests WebFinger Maksim 2019-07-24 15:13:10 +0000
  • b7fae304d3 Merge branch 'domain-blocking-relationship-api' into 'develop' kaniini 2019-07-24 15:12:27 +0000
  • 4504135894 Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships) Eugenij 2019-07-24 15:12:27 +0000
  • 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" Mike Verdone 2019-07-24 17:09:59 +0200
  • 877575d0da fixup! Update changelog Mike Verdone 2019-07-24 17:07:51 +0200
  • 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor Mike Verdone 2019-07-24 16:51:09 +0200
  • 91d9fdc7de Update changelog to document expiring posts feature Mike Verdone 2019-07-24 13:02:28 +0200
  • d2da3d30f3 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-07-24 16:37:52 +0300
  • 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor Mike Verdone 2019-07-24 12:43:20 +0200
  • 36012ef6c1 Require that ephemeral posts live for at least one hour Mike Verdone 2019-07-23 16:33:45 +0200
  • 704960b3c1 Add support for activity expiration to common and Masto API Mike Verdone 2019-07-22 16:46:20 +0200
  • d6dbcc03ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-24 12:45:16 +0100
  • 53fad36b57 Merge branch 'develop' into 'develop' lain 2019-07-24 11:28:05 +0000
  • 378f5f0fbe Add activity expiration worker Mike Verdone 2019-07-22 14:18:58 +0200
  • 666514194a Add activity expirations table Mike Verdone 2019-07-22 14:16:20 +0200
  • b729402774 Make test.exs read config in the same way as dev.exs Mike Verdone 2019-07-22 09:10:30 +0200
  • 8ba7a151ad Cleanup: fix a comment Mike Verdone 2019-07-22 16:45:54 +0200
  • f5d574f4ed check both item and parent domain blocks sadposter 2019-07-24 11:35:16 +0100
  • 48bd3be9cb move domain block check to with block Sadposter 2019-07-24 11:11:33 +0100
  • 4af4f6166b honour domain blocks on streaming notifications Sadposter 2019-07-24 11:09:06 +0100
  • 0be548b90a Merge branch 'Fix-static-dir-doc' into 'develop' kaniini 2019-07-24 01:59:41 +0000
  • 9638da43e9 Add text about gitignore aries 2019-07-24 01:50:56 +0000
  • 9c6357324e Merge branch 'feature/admin-api-user-statuses' into 'develop' kaniini 2019-07-23 23:59:21 +0000
  • 2ae510ee81 Merge branch 'bugfix/rich-media-splice-url' into 'develop' kaniini 2019-07-23 23:59:06 +0000
  • d3bdb8e704 rich media: parser: splice the given URL into the result Ariadne Conill 2019-07-23 22:58:31 +0000
  • f46805bb40 Merge branch 'develop' into feature/admin-api-user-statuses Maxim Filippov 2019-07-24 02:42:28 +0300
  • 03471151d6 AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) Maxim Filippov 2019-07-24 01:50:09 +0300