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

Commit Graph

  • 48a82c4609 Merge branch 'refactor/user' into 'develop' kaniini 2019-09-26 03:00:38 +00:00
  • 59ae9255fb Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop' kaniini 2019-09-26 02:57:42 +00:00
  • 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context" Hakaba Hitoyo 2019-09-26 02:57:41 +00:00
  • 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop' kaniini 2019-09-26 02:51:54 +00:00
  • beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop' kaniini 2019-09-26 02:49:45 +00:00
  • 4c6e5639d3 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex rinpatch 2019-09-25 13:38:45 +00:00
  • cfd9f73f0d Credo considered harmful rinpatch 2019-09-25 16:36:46 +03:00
  • 9d32f38b39 Remove useless with clause rinpatch 2019-09-25 16:26:47 +03:00
  • 22a16a3e81 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-25 13:20:48 +00:00
  • d4a76b0a6f Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern rinpatch 2019-09-25 15:59:04 +03:00
  • e91f0e2801 mix.lock: Bump hackney to 1.15.2 Haelwenn (lanodan) Monnier 2019-09-25 23:16:35 +02:00
  • 1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' kaniini 2019-09-26 00:03:47 +00:00
  • a15b9cbef1 Merge branch 'hotfix/hackney-1.15.2' into 'develop' rinpatch 2019-09-25 21:28:20 +00:00
  • b057f2ae9e
         mix.lock: Bump hackney to 1.15.2 Haelwenn (lanodan) Monnier 2019-09-25 23:16:35 +02:00
  • 16487716af Merge branch 'support/test' into 'develop' rinpatch 2019-09-25 18:51:45 +00:00
  • dd4263da5a Apply suggestion to test/tasks/instance_test.exs Maksim 2019-09-25 17:47:22 +00:00
  • 98be68e91b Merge branch 'emoji-packs-create-dir' into 'develop' rinpatch 2019-09-25 17:12:22 +00:00
  • f92d7d52c2 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex rinpatch 2019-09-25 13:38:45 +00:00
  • f2880d7d29 Credo considered harmful rinpatch 2019-09-25 16:36:46 +03:00
  • c7d8ccd0c4 Remove useless with clause rinpatch 2019-09-25 16:26:47 +03:00
  • 1ddd403339 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-25 13:20:48 +00:00
  • d87be2ec96 Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern rinpatch 2019-09-25 15:59:04 +03:00
  • 1fd9c60f87 Fix emoji tags for shareable packs to be "pack:{name}" Ekaterina Vaartis 2019-09-24 22:20:48 +03:00
  • 118d6dcdf4 Fix nodeinfo handling Ekaterina Vaartis 2019-09-24 19:38:05 +03:00
  • ba9d35a904 Add an API endpoint for listing remote packs Ekaterina Vaartis 2019-09-24 19:18:07 +03:00
  • a6e85215e1 Credo fix (remove parens on function definition) vaartis 2019-09-24 12:15:52 +00:00
  • f21dbbc021 Move emoji_dir_path & cache_seconds_per_file vaartis 2019-09-24 12:11:25 +00:00
  • cdbe7cd37a When listing emoji packs, be sure to create the directory Ekaterina Vaartis 2019-09-24 09:27:34 +03:00
  • 1b2e4a0ae0 clears robot.txt after tests Maksim Pechnikov 2019-09-25 13:13:35 +03:00
  • a150664a0a Merge branch 'issue/1218' into 'develop' lain 2019-09-25 10:26:41 +00:00
  • b5dfe83433 Replace Pleroma.FlakeId with flake_id hex package Egor Kislitsyn 2019-09-18 21:54:31 +07:00
  • 1a858134ed Merge branch 'develop' into issue/1218 Maksim Pechnikov 2019-09-25 12:24:12 +03:00
  • 60cbea5bb2 Allow activities pagination via limit/offset Maxim Filippov 2019-09-25 01:25:42 +03:00
  • 0dc8f3d6d2
         /api/ap/uploadMedia → /api/ap/upload_media Haelwenn (lanodan) Monnier 2019-09-24 19:03:06 +02:00
  • 5820dc40fc
         litepub-0.1.jsonld: Add uploadMedia Haelwenn (lanodan) Monnier 2019-09-24 19:00:31 +02:00
  • 035f22f784 Fix Credo warnings Egor Kislitsyn 2019-09-24 14:49:02 +07:00
  • 1bea67cb5e Cleanup Pleroma.User Egor Kislitsyn 2019-09-24 14:14:34 +07:00
  • 209395c7e6 Add User.change_info/2 and User.update_info/2 Egor Kislitsyn 2019-09-24 19:50:07 +07:00
  • 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset Maxim Filippov 2019-09-24 13:00:48 +03:00
  • a66a7a328f Extract notification actions from MastodonAPIController into NotificationController Egor Kislitsyn 2019-09-24 15:16:44 +07:00
  • 79b25be4e1 Do not return tuple when unneeded Egor Kislitsyn 2019-09-24 14:16:52 +07:00
  • d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex Maksim Pechnikov 2019-09-24 08:06:04 +03:00
  • 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop' kaniini 2019-09-23 22:42:34 +00:00
  • 19263f30c3 Merge branch 'support-rel-ugc' into 'develop' kaniini 2019-09-23 22:41:31 +00:00
  • 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' kaniini 2019-09-23 22:35:09 +00:00
  • ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' kaniini 2019-09-23 22:34:52 +00:00
  • 05a8242325 Merge branch 'clean-up-views' into 'develop' kaniini 2019-09-23 22:33:59 +00:00
  • e1d2d69c87 Clean up views Steven Fuchs 2019-09-23 22:33:59 +00:00
  • db0c00db8b Merge branch 'emoji-pack-json-pretty' into 'develop' kaniini 2019-09-23 22:30:31 +00:00
  • e63f167f01 Also pretty print pack.json Ekaterina Vaartis 2019-09-24 00:37:27 +03:00
  • f60beecfa7 Merge branch 'develop' into 'develop' rinpatch 2019-09-23 20:38:53 +00:00
  • 63af6951fa add tunable for stream uploads, as needed for jortage to work. Rachel Fae Fox 2019-09-23 20:38:53 +00:00
  • 494bb6bac6 updated tests Maksim Pechnikov 2019-09-23 22:37:30 +03:00
  • ad2ffd7ef1 Merge branch 'update-adminfe/2019-09-23' into 'develop' rinpatch 2019-09-23 19:23:33 +00:00
  • 646bf01608
         Update AdminFE bundle Haelwenn (lanodan) Monnier 2019-09-23 21:13:39 +02:00
  • 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex Maksim Pechnikov 2019-09-23 21:41:57 +03:00
  • 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-23 21:32:50 +03:00
  • fd48bd80eb Merge branch 'better-emoji-packs' into 'develop' rinpatch 2019-09-23 18:20:08 +00:00
  • 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure rinpatch 2019-09-23 21:14:51 +03:00
  • 815b904508
         Add support for AP C2S uploadMedia Haelwenn (lanodan) Monnier 2019-09-23 19:16:36 +02:00
  • 2ad50583f0
         Document and test /api/ap/whoami Haelwenn (lanodan) Monnier 2019-09-23 18:54:23 +02:00
  • cf1960d596 Better changelog wording Maxim Filippov 2019-09-22 23:14:18 +03:00
  • d72d4757a8 Format Maxim Filippov 2019-09-22 23:13:48 +03:00
  • 79c3443b60 Update CHANGELOG Maxim Filippov 2019-09-22 17:00:49 +03:00
  • c8fdf757c1 I did not put these lines in CHANGELOG Maxim Filippov 2019-09-22 16:59:37 +03:00
  • 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset Maxim Filippov 2019-09-22 16:58:39 +03:00
  • f89fe3ac06 Update docs Maxim Filippov 2019-09-22 16:45:38 +03:00
  • 72a01f1350 Use router helper to generate reset password link Maxim Filippov 2019-09-22 16:36:59 +03:00
  • 6f25668215 Admin API: Add ability to force user's password reset Maxim Filippov 2019-09-22 16:08:07 +03:00
  • 7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public) eugenijm 2019-09-20 17:54:38 +03:00
  • 472e7b796c Merge branch 'config/update-mongoose' into 'develop' Haelwenn 2019-09-20 13:21:07 +00:00
  • df3feb9412 Make it obvious how to support dual stack for MongooseIM feld 2019-09-20 13:21:07 +00:00
  • c4da7499a3 Merge branch 'conversation-docs' into 'develop' rinpatch 2019-09-19 19:04:55 +00:00
  • 53b4daa514 Merge branch 'update/admin-fe-stable' into 'maint/1.1' kaniini 2019-09-19 19:04:44 +00:00
  • fe4db3b94e API Docs: Document conversation ids. lain 2019-09-19 21:01:05 +02:00
  • c1e011624d Merge branch 'docs/clients-update' into 'develop' Haelwenn 2019-09-19 18:01:49 +00:00
  • b80c41a14f Merge branch 'outbox_pagination' into 'develop' lain 2019-09-19 16:53:59 +00:00
  • 9aca2cc95d Add test for correct AP outbox pagination D Anzorge 2019-09-19 16:09:24 +02:00
  • 9c8a94bae2 Merge branch 'direct_conversation_id_on_status_creation' into 'develop' rinpatch 2019-09-19 14:34:24 +00:00
  • 0e6085da10 Fix pagination in AP outbox.json D Anzorge 2019-09-19 16:09:07 +02:00
  • 1d285e6fad moving to separate dir Alex S 2019-09-19 14:02:27 +03:00
  • 924d7e6aa6 generating remote activities Alex S 2019-09-19 12:59:36 +03:00
  • 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-19 10:59:09 +03:00
  • ae1d371428 Update CHANGELOG Egor Kislitsyn 2019-09-19 14:53:34 +07:00
  • 95c948110c Add rel="ugc" to hashtags and mentions Egor Kislitsyn 2019-09-19 14:39:52 +07:00
  • d639cdcecb Update "config/description.exs" Egor Kislitsyn 2019-09-19 14:04:13 +07:00
  • cf3041220a Add support for rel="ugc" Egor Kislitsyn 2019-09-17 15:22:46 +07:00
  • fe5e0b7846 Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses) eugenijm 2019-09-19 08:27:55 +03:00
  • d4ed3a35b8 Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-19 07:35:34 +03:00
  • f95a2b2cda Merge branch 'issue/733' into 'develop' Haelwenn 2019-09-18 22:28:10 +00:00
  • b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop' rinpatch 2019-09-18 21:57:49 +00:00
  • 3e972c0456 Add :shared_pack_cache_seconds_per_file to description.exs Ekaterina Vaartis 2019-09-19 00:21:16 +03:00
  • 447514dfa2
         Bump copyright years of files changed in 2019 Haelwenn (lanodan) Monnier 2019-09-18 23:20:54 +02:00
  • c3856bed0c
         docs/clients.md: Update source code urls Haelwenn (lanodan) Monnier 2019-09-18 23:17:15 +02:00
  • b585134c90 Get the nodeinfo address from the well-known Ekaterina Vaartis 2019-09-18 19:48:25 +03:00
  • a1325d5fd9 Change path from nodeinfo to metadata->features Ekaterina Vaartis 2019-09-18 18:09:57 +03:00
  • 86795d5ac2 Document emoji pack listing in the api docs Ekaterina Vaartis 2019-09-13 21:00:28 +03:00
  • 43022c347f Apply suggestion to docs/api/pleroma_api.md vaartis 2019-09-13 12:32:40 +00:00
  • 8aed05ac15 Apply suggestion to docs/api/pleroma_api.md vaartis 2019-09-13 12:32:23 +00:00
  • d51e5e447e Move emoji reloading to admin api Ekaterina Vaartis 2019-09-12 20:38:57 +03:00