akkoma
5 years agoMerge branch 'develop' into test/activity_pub/transmogrifier.ex
Maksim Pechnikov [Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex

5 years agoMerge branch 'better-emoji-packs' into 'develop'
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

5 years agoEmoji API Controller: Follow phoenix directory structure
rinpatch [Mon, 23 Sep 2019 18:14:51 +0000 (21:14 +0300)]
Emoji API Controller: Follow phoenix directory structure

5 years agoMerge branch 'config/update-mongoose' into 'develop'
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

5 years agoMake it obvious how to support dual stack for MongooseIM
feld [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Make it obvious how to support dual stack for MongooseIM

5 years agoMerge branch 'conversation-docs' into 'develop'
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

5 years agoAPI Docs: Document conversation ids.
lain [Thu, 19 Sep 2019 19:01:05 +0000 (21:01 +0200)]
API Docs: Document conversation ids.

5 years agoMerge branch 'docs/clients-update' into 'develop'
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

5 years agoMerge branch 'outbox_pagination' into 'develop'
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

5 years agoAdd test for correct AP outbox pagination
D Anzorge [Thu, 19 Sep 2019 14:09:24 +0000 (16:09 +0200)]
Add test for correct AP outbox pagination

5 years agoMerge branch 'direct_conversation_id_on_status_creation' into 'develop'
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

5 years agoFix pagination in AP outbox.json
D Anzorge [Thu, 19 Sep 2019 14:09:07 +0000 (16:09 +0200)]
Fix pagination in AP outbox.json

5 years agoMastodon API: Return `pleroma.direct_conversation_id` when creating direct messages...
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`)

5 years agoMerge branch 'develop' into test/activity_pub/transmogrifier.ex
Maksim Pechnikov [Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex

5 years agoMerge branch 'issue/733' into 'develop'
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

5 years agoMerge branch 'chores/bump-copyright-year' into 'develop'
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

5 years agoAdd :shared_pack_cache_seconds_per_file to description.exs
Ekaterina Vaartis [Wed, 18 Sep 2019 21:21:16 +0000 (00:21 +0300)]
Add :shared_pack_cache_seconds_per_file to description.exs

5 years agoBump copyright years of files changed in 2019
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/'

5 years agodocs/clients.md: Update source code urls
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:17:15 +0000 (23:17 +0200)]
docs/clients.md: Update source code urls

5 years agoGet the nodeinfo address from the well-known
Ekaterina Vaartis [Wed, 18 Sep 2019 16:48:25 +0000 (19:48 +0300)]
Get the nodeinfo address from the well-known

5 years agoChange path from nodeinfo to metadata->features
Ekaterina Vaartis [Wed, 18 Sep 2019 15:09:57 +0000 (18:09 +0300)]
Change path from nodeinfo to metadata->features

5 years agoDocument emoji pack listing in the api docs
Ekaterina Vaartis [Fri, 13 Sep 2019 18:00:28 +0000 (21:00 +0300)]
Document emoji pack listing in the api docs

5 years agoApply suggestion to docs/api/pleroma_api.md
vaartis [Fri, 13 Sep 2019 12:32:40 +0000 (12:32 +0000)]
Apply suggestion to docs/api/pleroma_api.md

5 years agoApply 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

5 years agoMove emoji reloading to admin api
Ekaterina Vaartis [Thu, 12 Sep 2019 17:38:57 +0000 (20:38 +0300)]
Move emoji reloading to admin api

5 years agoMove emoji api to pleroma api dir
Ekaterina Vaartis [Wed, 11 Sep 2019 21:00:28 +0000 (00:00 +0300)]
Move emoji api to pleroma api dir

5 years agoA feature for shareable emoji packs, use it in download_from & tests
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

5 years agoMove EmojiAPIController from EmojiAPI to PleromaAPI
Ekaterina Vaartis [Wed, 11 Sep 2019 19:43:00 +0000 (22:43 +0300)]
Move EmojiAPIController from EmojiAPI to PleromaAPI

5 years agoAdd documentation for the emoji endpoints
Ekaterina Vaartis [Wed, 11 Sep 2019 19:39:26 +0000 (22:39 +0300)]
Add documentation for the emoji endpoints

5 years agoMake the emoji controller api more RESTy
Ekaterina Vaartis [Wed, 11 Sep 2019 18:50:55 +0000 (21:50 +0300)]
Make the emoji controller api more RESTy

5 years agoChange :sha to :checksum
Ekaterina Vaartis [Wed, 11 Sep 2019 18:43:16 +0000 (21:43 +0300)]
Change :sha to :checksum

5 years agoChange emoji api responses to JSON
Ekaterina Vaartis [Wed, 11 Sep 2019 16:39:47 +0000 (19:39 +0300)]
Change emoji api responses to JSON

5 years agoMove emoji pack list from /list to /
Ekaterina Vaartis [Wed, 11 Sep 2019 16:01:21 +0000 (19:01 +0300)]
Move emoji pack list from /list to /

5 years agoApply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
vaartis [Wed, 11 Sep 2019 16:00:48 +0000 (16:00 +0000)]
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex

5 years agoUse with w/ pack_info_res
Ekaterina Vaartis [Wed, 11 Sep 2019 15:59:31 +0000 (18:59 +0300)]
Use with w/ pack_info_res

5 years agoRemove unused variable
Ekaterina Vaartis [Wed, 11 Sep 2019 15:52:21 +0000 (18:52 +0300)]
Remove unused variable

5 years agoSplit list_packs
vaartis [Wed, 11 Sep 2019 15:48:51 +0000 (15:48 +0000)]
Split list_packs

5 years agoApply suggestions to emoji_api_controller.ex
vaartis [Wed, 11 Sep 2019 15:32:54 +0000 (15:32 +0000)]
Apply suggestions to emoji_api_controller.ex

5 years agoFixed a typo in create_archive_and_cache
vaartis [Wed, 11 Sep 2019 09:12:22 +0000 (09:12 +0000)]
Fixed a typo in create_archive_and_cache

5 years agoApply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
vaartis [Wed, 11 Sep 2019 09:07:19 +0000 (09:07 +0000)]
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex

5 years agoFix credo warnings
Ekaterina Vaartis [Tue, 10 Sep 2019 19:09:20 +0000 (22:09 +0300)]
Fix credo warnings

5 years agoAdd documentation for the emoji api endpoints
Ekaterina Vaartis [Tue, 10 Sep 2019 18:34:57 +0000 (21:34 +0300)]
Add documentation for the emoji api endpoints

5 years agoAllow importing old (emoji.txt / plain) packs from the filesystem
Ekaterina Vaartis [Tue, 10 Sep 2019 18:16:30 +0000 (21:16 +0300)]
Allow importing old (emoji.txt / plain) packs from the filesystem

5 years agoUse && insted of "and" for checking shared-files for packs
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

5 years agoAdd a way to create emoji packs via an endpoint
Ekaterina Vaartis [Wed, 28 Aug 2019 16:29:01 +0000 (19:29 +0300)]
Add a way to create emoji packs via an endpoint

5 years agoRemove unused yaml dependency from mix.lock
vaartis [Sat, 24 Aug 2019 21:58:21 +0000 (21:58 +0000)]
Remove unused yaml dependency from mix.lock

5 years agoAllow uploading new emojis to packs from URLs
Ekaterina Vaartis [Tue, 20 Aug 2019 11:52:36 +0000 (14:52 +0300)]
Allow uploading new emojis to packs from URLs

5 years agoHandle empty shortcode/filename/new_shortcode/new_filename
Ekaterina Vaartis [Mon, 19 Aug 2019 16:26:15 +0000 (19:26 +0300)]
Handle empty shortcode/filename/new_shortcode/new_filename

5 years agoImplememt emoji pack file updating + write tests
Ekaterina Vaartis [Sun, 18 Aug 2019 19:05:38 +0000 (22:05 +0300)]
Implememt emoji pack file updating + write tests

5 years agoUpdate the pack fallback-src sha generation condition
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

5 years agoAdd tests for pack metadata updating
Ekaterina Vaartis [Fri, 16 Aug 2019 10:22:14 +0000 (13:22 +0300)]
Add tests for pack metadata updating

5 years agoAdd an endpoint for emoji pack metadata updating
Ekaterina Vaartis [Thu, 15 Aug 2019 16:55:58 +0000 (19:55 +0300)]
Add an endpoint for emoji pack metadata updating

5 years agoAdd tests for downloading from fallback url
Ekaterina Vaartis [Thu, 15 Aug 2019 09:07:51 +0000 (12:07 +0300)]
Add tests for downloading from fallback url

5 years agofallback can't have pack.json, reflect that in code
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

5 years agoChange YAML to JSON
Ekaterina Vaartis [Thu, 15 Aug 2019 08:39:39 +0000 (11:39 +0300)]
Change YAML to JSON

5 years agoClean out old emojis on reload
Ekaterina Vaartis [Mon, 12 Aug 2019 15:28:05 +0000 (18:28 +0300)]
Clean out old emojis on reload

5 years agoAdd an endpoint for deleting emoji packs
Ekaterina Vaartis [Mon, 12 Aug 2019 15:03:59 +0000 (18:03 +0300)]
Add an endpoint for deleting emoji packs

5 years agoFix responses for emoji pack controlller
Ekaterina Vaartis [Mon, 12 Aug 2019 14:35:25 +0000 (17:35 +0300)]
Fix responses for emoji pack controlller

5 years agoSend ok for emoji reloading as text, not as json
Ekaterina Vaartis [Mon, 12 Aug 2019 13:43:28 +0000 (16:43 +0300)]
Send ok for emoji reloading as text, not as json

5 years agoAdd caching for emoji pack sharing
Ekaterina Vaartis [Mon, 12 Aug 2019 10:13:01 +0000 (13:13 +0300)]
Add caching for emoji pack sharing

5 years agoAdd tests for emoji pack sharing
Ekaterina Vaartis [Mon, 12 Aug 2019 07:35:34 +0000 (10:35 +0300)]
Add tests for emoji pack sharing

5 years agoOnly find SHA256 for packs that are shared
Ekaterina Vaartis [Sun, 11 Aug 2019 20:24:23 +0000 (23:24 +0300)]
Only find SHA256 for packs that are shared

5 years agoSwap TOML for YAML to get YAML generation for packs from fallbacks
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

5 years agoImplement API actions on packs
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

5 years agoAdd pack.toml loading
Ekaterina Vaartis [Sat, 10 Aug 2019 18:46:36 +0000 (21:46 +0300)]
Add pack.toml loading

5 years agoMerge branch 'hide-follower-following-count' into 'develop'
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

5 years agoMerge branch 'admin_api_invite_tokens' into 'develop'
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

5 years agoMerge branch 'restore-tests' into 'develop'
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

5 years agoMerge branch 'chore/refetch-poll-changelog-update' into 'develop'
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

5 years agoMerge branch 'fix/test-upload-cleanup' into 'develop'
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

5 years agoAdd a changelog entry for poll refetching
rinpatch [Wed, 18 Sep 2019 21:00:05 +0000 (00:00 +0300)]
Add a changelog entry for poll refetching

5 years agoMerge branch 'feature/poll-refresh' into 'develop'
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

5 years agoCleanup uploads after the tests are finished
rinpatch [Wed, 18 Sep 2019 20:34:13 +0000 (23:34 +0300)]
Cleanup uploads after the tests are finished

5 years agoFix credo issues
rinpatch [Wed, 18 Sep 2019 19:09:03 +0000 (22:09 +0300)]
Fix credo issues

5 years agoDo not refetch local objects
rinpatch [Wed, 18 Sep 2019 16:59:23 +0000 (19:59 +0300)]
Do not refetch local objects

5 years agoPreserve internal fields when reinjecting
rinpatch [Wed, 18 Sep 2019 16:53:51 +0000 (19:53 +0300)]
Preserve internal fields when reinjecting

5 years agoMove object internal fields to a constant
rinpatch [Wed, 18 Sep 2019 16:24:20 +0000 (19:24 +0300)]
Move object internal fields to a constant

5 years agoSet updated_at even if the object stayed the same
rinpatch [Wed, 18 Sep 2019 16:07:25 +0000 (19:07 +0300)]
Set updated_at even if the object stayed the same

5 years agoFix wrong argument order when calling NaiveDateTime.diff
rinpatch [Wed, 18 Sep 2019 15:52:33 +0000 (18:52 +0300)]
Fix wrong argument order when calling NaiveDateTime.diff

5 years agoCapture log in object refetch tests
rinpatch [Wed, 18 Sep 2019 15:31:24 +0000 (18:31 +0300)]
Capture log in object refetch tests

5 years agoMerge branch 'bugfix/docs-formatting' into 'develop'
Haelwenn [Wed, 18 Sep 2019 15:31:03 +0000 (15:31 +0000)]
Merge branch 'bugfix/docs-formatting' into 'develop'

Improve generated docs formatting

See merge request pleroma/pleroma!1688

5 years agoInitial poll refresh support
rinpatch [Wed, 18 Sep 2019 15:13:21 +0000 (18:13 +0300)]
Initial poll refresh support

Implement refreshing the object with an interval and call the function
when getting the poll.

5 years agonamings
Alex S [Fri, 13 Sep 2019 05:07:29 +0000 (08:07 +0300)]
namings

5 years agodocs fix
Alex S [Sat, 7 Sep 2019 05:56:22 +0000 (08:56 +0300)]
docs fix

5 years agolittle fixes
Alex S [Fri, 6 Sep 2019 14:20:44 +0000 (17:20 +0300)]
little fixes

5 years agopost for creating invite tokens in admin api
Alex S [Fri, 6 Sep 2019 14:14:31 +0000 (17:14 +0300)]
post for creating invite tokens in admin api

5 years agoMerge branch 'chore/changelog-separate-1.1' into 'develop'
Haelwenn [Tue, 17 Sep 2019 21:30:58 +0000 (21:30 +0000)]
Merge branch 'chore/changelog-separate-1.1' into 'develop'

Sync develop changelog with master and create a new section for post-1.1 changes

See merge request pleroma/pleroma!1689

5 years agoApply suggestion to CHANGELOG.md
rinpatch [Tue, 17 Sep 2019 21:24:21 +0000 (21:24 +0000)]
Apply suggestion to CHANGELOG.md

5 years agomarkdown.ex: put two-spaces before the description-newline
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 21:02:24 +0000 (23:02 +0200)]
markdown.ex: put two-spaces before the description-newline

5 years agomarkdown.ex: end suggestions list with a newline
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:55:29 +0000 (22:55 +0200)]
markdown.ex: end suggestions list with a newline

Otherwise we end up with suggestion on the same level as the childs

Markdown is a fuckā€¦

5 years agomarkdown.ex: \n\n on >1 suggestions, 2-spaces on one
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:33:32 +0000 (22:33 +0200)]
markdown.ex: \n\n on >1 suggestions, 2-spaces on one

5 years agomarkdown.ex: Make suggestion(s) plural only if on >1
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:22:54 +0000 (22:22 +0200)]
markdown.ex: Make suggestion(s) plural only if on >1

5 years agodescription.exs: uncomment type for email logo
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:19:30 +0000 (22:19 +0200)]
description.exs: uncomment type for email logo

5 years agodescription.exs: remove empty strings on descriptions
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:14:56 +0000 (22:14 +0200)]
description.exs: remove empty strings on descriptions

5 years agomarkdown.ex: do not fail if there is no children
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:04:21 +0000 (22:04 +0200)]
markdown.ex: do not fail if there is no children

5 years agodocs/markdown.ex: do no print empty suggestions
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:00:02 +0000 (22:00 +0200)]
docs/markdown.ex: do no print empty suggestions

5 years agodescription.exs: remove empty strings and arrays
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:57:13 +0000 (21:57 +0200)]
description.exs: remove empty strings and arrays

5 years agoSync develop changelog with master and create a new section for post-1.1
rinpatch [Tue, 17 Sep 2019 20:48:26 +0000 (23:48 +0300)]
Sync develop changelog with master and create a new section for post-1.1
changes

5 years agoMerge branch 'feature/bump-elixir-verstion' into 'develop'
rinpatch [Tue, 17 Sep 2019 20:09:26 +0000 (20:09 +0000)]
Merge branch 'feature/bump-elixir-verstion' into 'develop'

Bump elixir version to ~> 1.8

See merge request pleroma/pleroma!1686

5 years agoApply suggestion to CHANGELOG.md
Maxim Filippov [Tue, 17 Sep 2019 20:04:57 +0000 (20:04 +0000)]
Apply suggestion to CHANGELOG.md