akkoma
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

5 years agodocs/markdown.ex: child header as "- key (type): description"
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:43:27 +0000 (21:43 +0200)]
docs/markdown.ex: child header as "- key (type): description"

5 years agoRemove [true,false] for booleans, it is implicit
Haelwenn (lanodan) Monnier [Fri, 13 Sep 2019 15:05:19 +0000 (17:05 +0200)]
Remove [true,false] for booleans, it is implicit

5 years agoMerge branch 'deps/update-tesla' into 'develop'
feld [Tue, 17 Sep 2019 19:37:29 +0000 (19:37 +0000)]
Merge branch 'deps/update-tesla' into 'develop'

Update Tesla to 1.3

Closes #1262

See merge request pleroma/pleroma!1684

5 years agoBump elixir version to ~> 1.8
Maxim Filippov [Tue, 17 Sep 2019 19:36:42 +0000 (22:36 +0300)]
Bump elixir version to ~> 1.8

5 years agoMerge branch 'support/package_versions' into 'develop'
rinpatch [Tue, 17 Sep 2019 19:12:24 +0000 (19:12 +0000)]
Merge branch 'support/package_versions' into 'develop'

[#1263] fixed ecto version

See merge request pleroma/pleroma!1685

5 years agoMerge branch 'feature/return-total-for-reports' into 'develop'
rinpatch [Tue, 17 Sep 2019 19:09:56 +0000 (19:09 +0000)]
Merge branch 'feature/return-total-for-reports' into 'develop'

Admin API: Return total for reports

See merge request pleroma/pleroma!1628

5 years agofixed ecto version
Maksim Pechnikov [Tue, 17 Sep 2019 19:02:37 +0000 (22:02 +0300)]
fixed ecto version

5 years agoUpdate Tesla to 1.3
rinpatch [Tue, 17 Sep 2019 18:51:50 +0000 (21:51 +0300)]
Update Tesla to 1.3

This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.

5 years agoMerge branch 'fix-notification-warnings' into 'develop'
rinpatch [Tue, 17 Sep 2019 18:12:27 +0000 (18:12 +0000)]
Merge branch 'fix-notification-warnings' into 'develop'

Fix notification warnings

See merge request pleroma/pleroma!1683

5 years agoFix notification warnings
Steven Fuchs [Tue, 17 Sep 2019 18:12:27 +0000 (18:12 +0000)]
Fix notification warnings

5 years agoMerge branch 'fix/upgrade_user_from_ap_id' into 'develop'
Haelwenn [Tue, 17 Sep 2019 17:16:39 +0000 (17:16 +0000)]
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'

Fix `Transmogrifier.upgrade_user_from_ap_id/1`

See merge request pleroma/pleroma!1677

5 years agoMerge branch 'support/tests' into 'develop'
rinpatch [Tue, 17 Sep 2019 14:47:26 +0000 (14:47 +0000)]
Merge branch 'support/tests' into 'develop'

add tests for activity_pub/utils.ex

See merge request pleroma/pleroma!1627

5 years agoMerge branch 'eliminate-test-errors' into 'develop'
rinpatch [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
Merge branch 'eliminate-test-errors' into 'develop'

remove remaining errors from tests

See merge request pleroma/pleroma!1682

5 years agoremove remaining errors from tests
Steven Fuchs [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
remove remaining errors from tests

5 years agoMerge branch 'deps/update-oban' into 'develop'
rinpatch [Tue, 17 Sep 2019 13:55:01 +0000 (13:55 +0000)]
Merge branch 'deps/update-oban' into 'develop'

Update oban to 0.8.1

Closes #1261

See merge request pleroma/pleroma!1680

5 years agoMastodon API: Add a setting to hide follow/follower count from the user view (`hide_f...
eugenijm [Fri, 13 Sep 2019 14:37:30 +0000 (17:37 +0300)]
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)

5 years agoUpdate oban to 0.8.1
rinpatch [Tue, 17 Sep 2019 10:04:43 +0000 (13:04 +0300)]
Update oban to 0.8.1

This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam

5 years agoMerge branch 'update-fields-limit' into 'develop'
Haelwenn [Mon, 16 Sep 2019 15:11:05 +0000 (15:11 +0000)]
Merge branch 'update-fields-limit' into 'develop'

Set `account_field_value_length` limit to 2048 by default

Closes #1249

See merge request pleroma/pleroma!1678

5 years agoSet `account_field_value_length` limit to 2048 by default
Egor Kislitsyn [Mon, 16 Sep 2019 14:48:01 +0000 (21:48 +0700)]
Set `account_field_value_length` limit to 2048 by default

5 years agoFix `Transmogrifier.upgrade_user_from_ap_id/1`
Egor Kislitsyn [Mon, 16 Sep 2019 12:26:00 +0000 (19:26 +0700)]
Fix `Transmogrifier.upgrade_user_from_ap_id/1`

5 years agoMerge branch 'develop' into feature/return-total-for-reports
Maxim Filippov [Mon, 16 Sep 2019 11:40:17 +0000 (14:40 +0300)]
Merge branch 'develop' into feature/return-total-for-reports

5 years agoMerge branch 'fix/develop' into 'develop'
rinpatch [Mon, 16 Sep 2019 10:59:44 +0000 (10:59 +0000)]
Merge branch 'fix/develop' into 'develop'

Add "Streamer refactoring" back to `develop`

See merge request pleroma/pleroma!1675

5 years agoRevert "Merge branch 'revert-4fabf83a' into 'develop'"
Egor Kislitsyn [Mon, 16 Sep 2019 10:03:37 +0000 (17:03 +0700)]
Revert "Merge branch 'revert-4fabf83a' into 'develop'"

This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.

5 years agoMerge branch 'fix/signed-fetch-inclusion-test' into 'develop'
rinpatch [Mon, 16 Sep 2019 10:34:03 +0000 (10:34 +0000)]
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'

Fix signed fetch inclusion publisher test

See merge request pleroma/pleroma!1676

5 years agoFix signed fetch inclusion publisher test
rinpatch [Mon, 16 Sep 2019 10:23:06 +0000 (13:23 +0300)]
Fix signed fetch inclusion publisher test

Oban branch changed `actor` to `actor_id` and this test was not adjusted for that

5 years agoMerge branch 'revert-4fabf83a' into 'develop'
kaniini [Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)]
Merge branch 'revert-4fabf83a' into 'develop'

Revert "Merge branch 'streamer-refactoring' into 'develop'"

See merge request pleroma/pleroma!1674

5 years agoRevert "Merge branch 'streamer-refactoring' into 'develop'"
kaniini [Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)]
Revert "Merge branch 'streamer-refactoring' into 'develop'"

This reverts merge request !1653

5 years agoMerge branch 'streamer-refactoring' into 'develop'
kaniini [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Merge branch 'streamer-refactoring' into 'develop'

Streamer refactoring

See merge request pleroma/pleroma!1653

5 years agoStreamer refactoring
Steven Fuchs [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Streamer refactoring

5 years agoMerge branch 'feature/delivery-tracking' into 'develop'
kaniini [Mon, 16 Sep 2019 07:39:58 +0000 (07:39 +0000)]
Merge branch 'feature/delivery-tracking' into 'develop'

Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661

5 years agoMerge branch 'feature/optimize_rich_media_parser' into 'develop'
kaniini [Mon, 16 Sep 2019 07:37:54 +0000 (07:37 +0000)]
Merge branch 'feature/optimize_rich_media_parser' into 'develop'

added prepare html for RichMedia.Parser

See merge request pleroma/pleroma!1672

5 years agoMerge branch 'fix/race-in-tests' into 'develop'
kaniini [Mon, 16 Sep 2019 07:36:57 +0000 (07:36 +0000)]
Merge branch 'fix/race-in-tests' into 'develop'

Fix a race condition in tests

See merge request pleroma/pleroma!1673

5 years agoFix a race condition in tests
Egor Kislitsyn [Mon, 16 Sep 2019 05:55:05 +0000 (12:55 +0700)]
Fix a race condition in tests

5 years agoRestore tests for `change_password` and `delete_account`
Egor Kislitsyn [Thu, 12 Sep 2019 12:04:55 +0000 (19:04 +0700)]
Restore tests for `change_password` and `delete_account`

5 years agoMerge branch '1149-oban-job-queue' into 'develop'
rinpatch [Sun, 15 Sep 2019 20:22:17 +0000 (20:22 +0000)]
Merge branch '1149-oban-job-queue' into 'develop'

[#1149] `oban`-based job & retry queues

Closes #1149

See merge request pleroma/pleroma!1518

5 years agoadded prepare html for RichMedia.Parser
Maksim Pechnikov [Sun, 15 Sep 2019 11:53:58 +0000 (14:53 +0300)]
added prepare html for RichMedia.Parser

5 years agoMerge branch 'develop' into support/tests
Maksim Pechnikov [Sun, 15 Sep 2019 11:07:07 +0000 (14:07 +0300)]
Merge branch 'develop' into support/tests

5 years ago[#1149] Reinstated docs/config.md changes.
Ivan Tashkinov [Sun, 15 Sep 2019 07:15:57 +0000 (10:15 +0300)]
[#1149] Reinstated docs/config.md changes.

5 years ago[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
Ivan Tashkinov [Sun, 15 Sep 2019 07:12:24 +0000 (10:12 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# docs/config.md

5 years agoMerge branch 'config-changes' into 'develop'
rinpatch [Sat, 14 Sep 2019 17:26:35 +0000 (17:26 +0000)]
Merge branch 'config-changes' into 'develop'

two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666

5 years agoMerge branch 'fix/truncate-remote-user-fields' into 'develop'
rinpatch [Sat, 14 Sep 2019 16:39:42 +0000 (16:39 +0000)]
Merge branch 'fix/truncate-remote-user-fields' into 'develop'

Truncate remote user fields

See merge request pleroma/pleroma!1619

5 years ago[#1149] Rewritten readme as config/description.exs.
Ivan Tashkinov [Sat, 14 Sep 2019 13:28:59 +0000 (16:28 +0300)]
[#1149] Rewritten readme as config/description.exs.