Maxim Filippov [Tue, 24 Sep 2019 10:00:48 +0000 (13:00 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset
kaniini [Mon, 23 Sep 2019 22:42:34 +0000 (22:42 +0000)]
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
kaniini [Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)]
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
kaniini [Mon, 23 Sep 2019 22:35:09 +0000 (22:35 +0000)]
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
kaniini [Mon, 23 Sep 2019 22:34:52 +0000 (22:34 +0000)]
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
kaniini [Mon, 23 Sep 2019 22:33:59 +0000 (22:33 +0000)]
Merge branch 'clean-up-views' into 'develop'
Clean up views
See merge request pleroma/pleroma!1709
Steven Fuchs [Mon, 23 Sep 2019 22:33:59 +0000 (22:33 +0000)]
Clean up views
kaniini [Mon, 23 Sep 2019 22:30:31 +0000 (22:30 +0000)]
Merge branch 'emoji-pack-json-pretty' into 'develop'
Also pretty print pack.json
See merge request pleroma/pleroma!1710
Ekaterina Vaartis [Mon, 23 Sep 2019 21:37:27 +0000 (00:37 +0300)]
Also pretty print pack.json
rinpatch [Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)]
Merge branch 'develop' into 'develop'
add tunable for stream uploads, as needed for jortage to work.
See merge request pleroma/pleroma!1708
Rachel Fae Fox [Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)]
add tunable for stream uploads, as needed for jortage to work.
rinpatch [Mon, 23 Sep 2019 19:23:33 +0000 (19:23 +0000)]
Merge branch 'update-adminfe/2019-09-23' into 'develop'
Update AdminFE bundle
See merge request pleroma/pleroma!1707
Haelwenn (lanodan) Monnier [Mon, 23 Sep 2019 19:13:39 +0000 (21:13 +0200)]
Update AdminFE bundle
Maksim Pechnikov [Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
rinpatch [Mon, 23 Sep 2019 18:20:08 +0000 (18:20 +0000)]
Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
rinpatch [Mon, 23 Sep 2019 18:14:51 +0000 (21:14 +0300)]
Emoji API Controller: Follow phoenix directory structure
Maxim Filippov [Sun, 22 Sep 2019 20:14:18 +0000 (23:14 +0300)]
Better changelog wording
Maxim Filippov [Sun, 22 Sep 2019 20:13:48 +0000 (23:13 +0300)]
Format
Maxim Filippov [Sun, 22 Sep 2019 14:00:49 +0000 (17:00 +0300)]
Update CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 13:59:37 +0000 (16:59 +0300)]
I did not put these lines in CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 13:58:39 +0000 (16:58 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset
Maxim Filippov [Sun, 22 Sep 2019 13:45:38 +0000 (16:45 +0300)]
Update docs
Maxim Filippov [Sun, 22 Sep 2019 13:36:59 +0000 (16:36 +0300)]
Use router helper to generate reset password link
Maxim Filippov [Sun, 22 Sep 2019 13:08:07 +0000 (16:08 +0300)]
Admin API: Add ability to force user's password reset
eugenijm [Fri, 20 Sep 2019 14:54:38 +0000 (17:54 +0300)]
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
Haelwenn [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Merge branch 'config/update-mongoose' into 'develop'
Make it obvious how to support dual stack for MongooseIM
See merge request pleroma/pleroma!1702
feld [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Make it obvious how to support dual stack for MongooseIM
rinpatch [Thu, 19 Sep 2019 19:04:55 +0000 (19:04 +0000)]
Merge branch 'conversation-docs' into 'develop'
API Docs: Document conversation ids.
See merge request pleroma/pleroma!1701
lain [Thu, 19 Sep 2019 19:01:05 +0000 (21:01 +0200)]
API Docs: Document conversation ids.
Haelwenn [Thu, 19 Sep 2019 18:01:49 +0000 (18:01 +0000)]
Merge branch 'docs/clients-update' into 'develop'
docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697
lain [Thu, 19 Sep 2019 16:53:59 +0000 (16:53 +0000)]
Merge branch 'outbox_pagination' into 'develop'
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
D Anzorge [Thu, 19 Sep 2019 14:09:24 +0000 (16:09 +0200)]
Add test for correct AP outbox pagination
rinpatch [Thu, 19 Sep 2019 14:34:24 +0000 (14:34 +0000)]
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'
Return `pleroma.direct_conversation_id` when creating a direct message
See merge request pleroma/pleroma!1699
D Anzorge [Thu, 19 Sep 2019 14:09:07 +0000 (16:09 +0200)]
Fix pagination in AP outbox.json
Egor Kislitsyn [Thu, 19 Sep 2019 07:53:34 +0000 (14:53 +0700)]
Update CHANGELOG
Egor Kislitsyn [Thu, 19 Sep 2019 07:39:52 +0000 (14:39 +0700)]
Add `rel="ugc"` to hashtags and mentions
Egor Kislitsyn [Thu, 19 Sep 2019 07:04:13 +0000 (14:04 +0700)]
Update "config/description.exs"
Egor Kislitsyn [Tue, 17 Sep 2019 08:22:46 +0000 (15:22 +0700)]
Add support for `rel="ugc"`
eugenijm [Thu, 19 Sep 2019 05:27:55 +0000 (08:27 +0300)]
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
Maksim Pechnikov [Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Haelwenn [Wed, 18 Sep 2019 22:28:10 +0000 (22:28 +0000)]
Merge branch 'issue/733' into 'develop'
[#733] added test for Ostatus
See merge request pleroma/pleroma!1657
rinpatch [Wed, 18 Sep 2019 21:57:49 +0000 (21:57 +0000)]
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
Ekaterina Vaartis [Wed, 18 Sep 2019 21:21:16 +0000 (00:21 +0300)]
Add :shared_pack_cache_seconds_per_file to description.exs
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:20:54 +0000 (23:20 +0200)]
Bump copyright years of files changed in 2019
Done via the following command:
git diff
1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:17:15 +0000 (23:17 +0200)]
docs/clients.md: Update source code urls
Ekaterina Vaartis [Wed, 18 Sep 2019 16:48:25 +0000 (19:48 +0300)]
Get the nodeinfo address from the well-known
Ekaterina Vaartis [Wed, 18 Sep 2019 15:09:57 +0000 (18:09 +0300)]
Change path from nodeinfo to metadata->features
Ekaterina Vaartis [Fri, 13 Sep 2019 18:00:28 +0000 (21:00 +0300)]
Document emoji pack listing in the api docs
vaartis [Fri, 13 Sep 2019 12:32:40 +0000 (12:32 +0000)]
Apply suggestion to docs/api/pleroma_api.md
vaartis [Fri, 13 Sep 2019 12:32:23 +0000 (12:32 +0000)]
Apply suggestion to docs/api/pleroma_api.md
Ekaterina Vaartis [Thu, 12 Sep 2019 17:38:57 +0000 (20:38 +0300)]
Move emoji reloading to admin api
Ekaterina Vaartis [Wed, 11 Sep 2019 21:00:28 +0000 (00:00 +0300)]
Move emoji api to pleroma api dir
Ekaterina Vaartis [Wed, 11 Sep 2019 19:58:55 +0000 (22:58 +0300)]
A feature for shareable emoji packs, use it in download_from & tests
Ekaterina Vaartis [Wed, 11 Sep 2019 19:43:00 +0000 (22:43 +0300)]
Move EmojiAPIController from EmojiAPI to PleromaAPI
Ekaterina Vaartis [Wed, 11 Sep 2019 19:39:26 +0000 (22:39 +0300)]
Add documentation for the emoji endpoints
Ekaterina Vaartis [Wed, 11 Sep 2019 18:50:55 +0000 (21:50 +0300)]
Make the emoji controller api more RESTy
Ekaterina Vaartis [Wed, 11 Sep 2019 18:43:16 +0000 (21:43 +0300)]
Change :sha to :checksum
Ekaterina Vaartis [Wed, 11 Sep 2019 16:39:47 +0000 (19:39 +0300)]
Change emoji api responses to JSON
Ekaterina Vaartis [Wed, 11 Sep 2019 16:01:21 +0000 (19:01 +0300)]
Move emoji pack list from /list to /
vaartis [Wed, 11 Sep 2019 16:00:48 +0000 (16:00 +0000)]
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
Ekaterina Vaartis [Wed, 11 Sep 2019 15:59:31 +0000 (18:59 +0300)]
Use with w/ pack_info_res
Ekaterina Vaartis [Wed, 11 Sep 2019 15:52:21 +0000 (18:52 +0300)]
Remove unused variable
vaartis [Wed, 11 Sep 2019 15:48:51 +0000 (15:48 +0000)]
Split list_packs
vaartis [Wed, 11 Sep 2019 15:32:54 +0000 (15:32 +0000)]
Apply suggestions to emoji_api_controller.ex
vaartis [Wed, 11 Sep 2019 09:12:22 +0000 (09:12 +0000)]
Fixed a typo in create_archive_and_cache
vaartis [Wed, 11 Sep 2019 09:07:19 +0000 (09:07 +0000)]
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
Ekaterina Vaartis [Tue, 10 Sep 2019 19:09:20 +0000 (22:09 +0300)]
Fix credo warnings
Ekaterina Vaartis [Tue, 10 Sep 2019 18:34:57 +0000 (21:34 +0300)]
Add documentation for the emoji api endpoints
Ekaterina Vaartis [Tue, 10 Sep 2019 18:16:30 +0000 (21:16 +0300)]
Allow importing old (emoji.txt / plain) packs from the filesystem
Ekaterina Vaartis [Sun, 1 Sep 2019 12:38:45 +0000 (15:38 +0300)]
Use && insted of "and" for checking shared-files for packs
share-files can be nil and "and" does not like that
Ekaterina Vaartis [Wed, 28 Aug 2019 16:29:01 +0000 (19:29 +0300)]
Add a way to create emoji packs via an endpoint
vaartis [Sat, 24 Aug 2019 21:58:21 +0000 (21:58 +0000)]
Remove unused yaml dependency from mix.lock
Ekaterina Vaartis [Tue, 20 Aug 2019 11:52:36 +0000 (14:52 +0300)]
Allow uploading new emojis to packs from URLs
Ekaterina Vaartis [Mon, 19 Aug 2019 16:26:15 +0000 (19:26 +0300)]
Handle empty shortcode/filename/new_shortcode/new_filename
Ekaterina Vaartis [Sun, 18 Aug 2019 19:05:38 +0000 (22:05 +0300)]
Implememt emoji pack file updating + write tests
Ekaterina Vaartis [Fri, 16 Aug 2019 10:30:14 +0000 (13:30 +0300)]
Update the pack fallback-src sha generation condition
The old one would not regenerate sha when fallback src changed
Ekaterina Vaartis [Fri, 16 Aug 2019 10:22:14 +0000 (13:22 +0300)]
Add tests for pack metadata updating
Ekaterina Vaartis [Thu, 15 Aug 2019 16:55:58 +0000 (19:55 +0300)]
Add an endpoint for emoji pack metadata updating
Ekaterina Vaartis [Thu, 15 Aug 2019 09:07:51 +0000 (12:07 +0300)]
Add tests for downloading from fallback url
Ekaterina Vaartis [Thu, 15 Aug 2019 08:46:03 +0000 (11:46 +0300)]
fallback can't have pack.json, reflect that in code
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
Ekaterina Vaartis [Thu, 15 Aug 2019 08:39:39 +0000 (11:39 +0300)]
Change YAML to JSON
Ekaterina Vaartis [Mon, 12 Aug 2019 15:28:05 +0000 (18:28 +0300)]
Clean out old emojis on reload
Ekaterina Vaartis [Mon, 12 Aug 2019 15:03:59 +0000 (18:03 +0300)]
Add an endpoint for deleting emoji packs
Ekaterina Vaartis [Mon, 12 Aug 2019 14:35:25 +0000 (17:35 +0300)]
Fix responses for emoji pack controlller
Ekaterina Vaartis [Mon, 12 Aug 2019 13:43:28 +0000 (16:43 +0300)]
Send ok for emoji reloading as text, not as json
Ekaterina Vaartis [Mon, 12 Aug 2019 10:13:01 +0000 (13:13 +0300)]
Add caching for emoji pack sharing
Ekaterina Vaartis [Mon, 12 Aug 2019 07:35:34 +0000 (10:35 +0300)]
Add tests for emoji pack sharing
Ekaterina Vaartis [Sun, 11 Aug 2019 20:24:23 +0000 (23:24 +0300)]
Only find SHA256 for packs that are shared
Ekaterina Vaartis [Sun, 11 Aug 2019 19:32:15 +0000 (22:32 +0300)]
Swap TOML for YAML to get YAML generation for packs from fallbacks
If fallback url doesn't have a pack.yml file, one from the source will
be used
Ekaterina Vaartis [Sat, 10 Aug 2019 21:39:21 +0000 (00:39 +0300)]
Implement API actions on packs
That incldues listing them and downloading them from other instances
or from the remote url
Ekaterina Vaartis [Sat, 10 Aug 2019 18:46:36 +0000 (21:46 +0300)]
Add pack.toml loading
feld [Wed, 18 Sep 2019 21:13:15 +0000 (21:13 +0000)]
Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
feld [Wed, 18 Sep 2019 21:11:37 +0000 (21:11 +0000)]
Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
feld [Wed, 18 Sep 2019 21:05:18 +0000 (21:05 +0000)]
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
rinpatch [Wed, 18 Sep 2019 21:00:51 +0000 (21:00 +0000)]
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'
Add a changelog entry for poll refetching
See merge request pleroma/pleroma!1696
Haelwenn [Wed, 18 Sep 2019 21:00:09 +0000 (21:00 +0000)]
Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
rinpatch [Wed, 18 Sep 2019 21:00:05 +0000 (00:00 +0300)]
Add a changelog entry for poll refetching
Haelwenn [Wed, 18 Sep 2019 20:58:53 +0000 (20:58 +0000)]
Merge branch 'feature/poll-refresh' into 'develop'
Poll refetching
See merge request pleroma/pleroma!1694
rinpatch [Wed, 18 Sep 2019 20:34:13 +0000 (23:34 +0300)]
Cleanup uploads after the tests are finished
rinpatch [Wed, 18 Sep 2019 19:09:03 +0000 (22:09 +0300)]
Fix credo issues
projects / akkoma / log