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

Commit Graph

  • 0e1c481a94 [#1149] Added more oban workers. Refactoring. Ivan Tashkinov 2019-08-13 20:20:26 +03:00
  • 984d7be1a4 Merge branch 'feature/remove-disable-blocks' into 'develop' kaniini 2019-08-13 02:45:47 +00:00
  • f46cd7e9c7 config: remove legacy activitypub accept_blocks setting Ariadne Conill 2019-08-13 02:15:21 +00:00
  • b0fad153e1 Merge branch 'update/admin-fe' into 'develop' rinpatch 2019-08-12 21:07:11 +00:00
  • 24a731a9a6 Update AdminFE Mark Felder 2019-08-12 15:00:03 -05:00
  • 2674db14a2 Modify Changelog. lain 2019-08-12 14:26:18 +02:00
  • 511ccea5aa ConversationView: Align parameter names with other views. lain 2019-08-12 14:23:06 +02:00
  • 60231ec7bd Conversation: Add endpoint to get a conversation by id. lain 2019-08-12 13:58:04 +02:00
  • 23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view. lain 2019-08-12 12:51:08 +02:00
  • b9578bb8a0 Merge branch 'chore/changelog-update' into 'develop' rinpatch 2019-08-11 20:25:17 +00:00
  • d4d31ffdc4 Add a changelog entry for !1552 rinpatch 2019-08-11 23:19:20 +03:00
  • 9a8a01837e Merge branch 'fix/fix-type-depth' into 'develop' rinpatch 2019-08-11 20:01:10 +00:00
  • 92479c6f48 Do not fetch the reply object in fix_type unless the object has the name key and use a depth limit when fetching it rinpatch 2019-08-11 22:49:55 +03:00
  • 779e32a879 Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop' kaniini 2019-08-10 21:33:19 +00:00
  • 9cfc289594 MRF: ensure that subdomain_match calls are case-insensitive Ariadne Conill 2019-08-10 21:18:26 +00:00
  • 17d5564a9c Merge branch 'fix/hide-follows-counters' into 'develop' kaniini 2019-08-10 18:59:24 +00:00
  • 84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters' kaniini 2019-08-10 18:49:04 +00:00
  • 708e7f0942 Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop' kaniini 2019-08-10 18:47:40 +00:00
  • af4cf35e20 Strip internal fields including likes from incoming and outgoing activities Sergey Suprunenko 2019-08-10 18:47:40 +00:00
  • 5aa62b8581 Merge branch 'test/pleroma_uploaders' into 'develop' kaniini 2019-08-10 18:46:26 +00:00
  • 11d08c2de0 tests for Pleroma.Uploaders Maksim 2019-08-10 18:46:26 +00:00
  • 390329a303 Merge branch 'fix/mastoapi-threadmute-detection' into 'develop' kaniini 2019-08-10 18:29:16 +00:00
  • 33a5fc4a70 [#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime. Ivan Tashkinov 2019-08-10 20:38:31 +03:00
  • 0802a08871 Mastodon API: Fix thread mute detection rinpatch 2019-08-10 16:27:46 +03:00
  • 337edb3e50 Merge branch 'feature/uploader_s3' into 'develop' rinpatch 2019-08-10 11:28:00 +00:00
  • bb9c539580 Uploader.S3 added support stream uploads Maksim 2019-08-10 11:27:59 +00:00
  • dfae61c25c Fix deactivated user deletion Maxim Filippov 2019-08-09 23:05:28 +03:00
  • 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-08-09 20:09:56 +03:00
  • b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. Ivan Tashkinov 2019-08-09 20:08:01 +03:00
  • 409bcad54b Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled rinpatch 2019-08-09 16:49:09 +03:00
  • 29807ef6a5 Merge branch 'feature/digest-email' into 'develop' lain 2019-08-08 14:38:33 +00:00
  • a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations lain 2019-08-08 16:04:20 +02:00
  • b18234e04c Merge branch 'patch-3' into 'develop' rinpatch 2019-08-07 22:14:02 +00:00
  • 9c0da1009a Return profile URL in MastodonAPI's url field Thibaut Girka 2019-08-07 21:40:53 +00:00
  • 089d53a961 Simplify logic to mention.js url field Thibaut Girka 2019-08-07 20:55:37 +00:00
  • a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL Thibaut Girka 2019-08-07 20:29:30 +00:00
  • aa718ab8f6 Merge branch 'fix/object-reembeds' into 'develop' Haelwenn 2019-08-06 22:14:00 +00:00
  • 4f1b9c54b9 Do not rembed the object after updating it rinpatch 2019-08-07 01:02:29 +03:00
  • 5329e84d62 OStatus tests: stop relying on embedded objects rinpatch 2019-08-07 00:58:48 +03:00
  • 32018a4ee0 ActivityPub tests: remove assertions of embedded object being updated, because the objects are no longer supposed to be embedded rinpatch 2019-08-07 00:36:13 +03:00
  • 03ad31328c OStatus Announce Representer: Do not depend on the object being embedded in the Create activity rinpatch 2019-08-07 00:23:58 +03:00
  • 73d8d5c49f Stop depending on the embedded object in restrict_favorited_by rinpatch 2019-08-07 00:12:42 +03:00
  • dea3bd02ce Merge branch 'issue/1150' into 'develop' kaniini 2019-08-06 20:19:28 +00:00
  • 139b196bc0 [#1150] fixed parser TwitterCard Maksim 2019-08-06 20:19:28 +00:00
  • e4a01d253e Conversation: Rename function to better express what it does. lain 2019-08-06 15:06:19 +02:00
  • a49c92f6ae Participation: Setting recipients will always add the owner. lain 2019-08-06 14:51:17 +02:00
  • 486b474327 Merge branch 'test/common_api_utils.ex' into 'develop' kaniini 2019-08-05 15:37:05 +00:00
  • bdc9a7222c tests for CommonApi/Utils Maksim 2019-08-05 15:37:05 +00:00
  • d6fe220e32 Linting. lain 2019-08-05 16:11:23 +02:00
  • ddabe7784b Pleroma Conversations: Document differences. lain 2019-08-05 15:58:14 +02:00
  • b64b6fee2a CommonAPI: Replies to conversations also get the correct context id. lain 2019-08-05 15:33:22 +02:00
  • 3af6d14da7 Pleroma Conversations API: Add a way to set recipients. lain 2019-08-05 15:09:19 +02:00
  • bbd9ed0257 Update CHANGELOG Egor Kislitsyn 2019-08-05 15:33:34 +07:00
  • fd60fd4713 Merge branch 'report-email-from-remote-user' into 'develop' kaniini 2019-08-04 22:24:50 +00:00
  • 96028cd585 Remove Reply-To from report emails Eugenij 2019-08-04 22:24:50 +00:00
  • f7fc902c29 Merge branch 'feature/relay-list-task' into 'develop' kaniini 2019-08-04 17:14:37 +00:00
  • bedabf7db2 Merge branch 'fix/wrong-next-key-likes-json' into 'develop' kaniini 2019-08-04 17:13:06 +00:00
  • e8ad116c2a Do not add the "next" key to likes.json if there is no more items Sergey Suprunenko 2019-08-04 17:13:06 +00:00
  • 9e7c633b39 Merge branch 'patch-2' into 'develop' kaniini 2019-08-04 17:05:17 +00:00
  • 3411f506b3 Replace "impode" with "implode" for x0rz3q 2019-08-04 14:35:45 +00:00
  • cee0d35566 Merge branch 'remove-longfox-emoji-set' into 'develop' kaniini 2019-08-04 04:32:45 +00:00
  • 39c7bbe18f Remove longfox emoji set Hakaba Hitoyo 2019-08-04 04:32:45 +00:00
  • b9497ead35 Merge branch 'develop' into 'develop' kaniini 2019-08-04 04:32:09 +00:00
  • 9b9453ceaf Fix some typos and rework a few lines in howto_mediaproxy.md Pierce McGoran 2019-08-04 03:12:38 +00:00
  • c10a3e035b Update link in README.md Pierce McGoran 2019-08-04 03:01:21 +00:00
  • cef3af5536 tasks: relay: add list task Ariadne Conill 2019-08-03 23:17:17 +00:00
  • b1fb5b93ae Merge branch 'bugfix/password-reset-link-styling' into 'develop' kaniini 2019-08-03 21:29:39 +00:00
  • a035ab8c1d
         templates/layout/app.html.eex: Style anchors Haelwenn (lanodan) Monnier 2019-08-03 22:56:20 +02:00
  • 86fffe9c27 Merge branch 'patch-2' into 'develop' kaniini 2019-08-03 18:55:09 +00:00
  • 1fce56c7df Refactor Thibaut Girka 2019-08-03 18:37:20 +00:00
  • 16cfb89240 Only add preferredUsername to service actor json when the underlying user actually has a username Thibaut Girka 2019-08-03 18:28:08 +00:00
  • 4ae0a6652f Merge branch 'admin-fixes' into 'develop' kaniini 2019-08-03 18:16:09 +00:00
  • de0f3b73dd Admin fixes Alexander Strizhakov 2019-08-03 18:16:09 +00:00
  • 99ce6d6044 Merge branch 'fix/search-space-error' into 'develop' kaniini 2019-08-03 18:13:21 +00:00
  • 040347b248 Remove spaces from the domain search Sergey Suprunenko 2019-08-03 18:13:20 +00:00
  • 7319b41e34 Merge branch 'fix/with-reject-nil-clause' into 'develop' kaniini 2019-08-03 18:12:39 +00:00
  • 8b2fa31fed Handle MRF rejections of incoming AP activities Sergey Suprunenko 2019-08-03 18:12:38 +00:00
  • ba72d02f86 Merge branch 'official-docker-support' into 'develop' kaniini 2019-08-03 18:12:03 +00:00
  • 4007717534 Run mix format Ashlynn Anderson 2019-08-03 13:42:57 -04:00
  • a187dbb326 Add preferredUsername to service actors so Mastodon can resolve them Thibaut Girka 2019-08-03 17:24:57 +00:00
  • 04327721d7 Add .dockerignore Ashlynn Anderson 2019-08-02 23:33:47 -04:00
  • c86db959cb Optimize Dockerfile Ashlynn Anderson 2019-08-02 22:40:31 -04:00
  • 4a418698db Create docker.exs and docker-entrypoint + round out Dockerfile Ashlynn Anderson 2019-08-02 22:28:48 -04:00
  • 7efca4317b Basic working Dockerfile Ashlynn Anderson 2019-07-31 19:35:14 -04:00
  • e553a17e98 Merge branch 'docfix/mix_task_options' into 'develop' Haelwenn 2019-08-02 21:38:28 +00:00
  • 8815f07058
         tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at Haelwenn (lanodan) Monnier 2019-08-02 23:30:47 +02:00
  • eee98aaa73 Pleroma API: Add endpoint to get conversation statuses. lain 2019-08-02 19:53:08 +02:00
  • 5eec0abe09 Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop' feld 2019-08-02 17:07:09 +00:00
  • d93d777915 Fix/mediaproxy whitelist base url feld 2019-08-02 17:07:09 +00:00
  • 9d4f34fbcb Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-08-02 18:16:04 +03:00
  • 56b1c3af13 CommonAPI: Extend api with conversation replies. lain 2019-08-02 15:05:27 +02:00
  • 5ff8f07ca9 Merge branch 'feature/hide-follows-remote' into 'develop' lain 2019-08-02 11:23:07 +00:00
  • f88560accd Conversations: Add recipient list to conversation participation. lain 2019-08-02 11:55:41 +02:00
  • 9c499435f0 Merge branch 'release/1.0.4' into 'master' v1.0.4 kaniini 2019-08-01 16:41:09 +00:00
  • 455f2934b7 mix: update version to 1.0.4 release/1.0.4 Ariadne Conill 2019-08-01 16:39:59 +00:00
  • 8998620d71 Fix Invalid SemVer version generation rinpatch 2019-08-01 14:15:18 +03:00
  • 1fe092e03c Merge branch 'fix/semver-violations' into 'develop' kaniini 2019-08-01 16:37:04 +00:00
  • fd4b7239cd nothing lain 2019-08-01 17:25:46 +02:00
  • 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. Ivan Tashkinov 2019-08-01 17:28:00 +03:00
  • 955985fe2c Merge branch 'cleanup-tests' into 'develop' rinpatch 2019-08-01 13:38:15 +00:00