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
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/'
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
rinpatch [Wed, 18 Sep 2019 16:59:23 +0000 (19:59 +0300)]
Do not refetch local objects
rinpatch [Wed, 18 Sep 2019 16:53:51 +0000 (19:53 +0300)]
Preserve internal fields when reinjecting
rinpatch [Wed, 18 Sep 2019 16:24:20 +0000 (19:24 +0300)]
Move object internal fields to a constant
rinpatch [Wed, 18 Sep 2019 16:07:25 +0000 (19:07 +0300)]
Set updated_at even if the object stayed the same
rinpatch [Wed, 18 Sep 2019 15:52:33 +0000 (18:52 +0300)]
Fix wrong argument order when calling NaiveDateTime.diff
rinpatch [Wed, 18 Sep 2019 15:31:24 +0000 (18:31 +0300)]
Capture log in object refetch tests
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
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.
Alex S [Fri, 13 Sep 2019 05:07:29 +0000 (08:07 +0300)]
namings
Alex S [Sat, 7 Sep 2019 05:56:22 +0000 (08:56 +0300)]
docs fix
Alex S [Fri, 6 Sep 2019 14:20:44 +0000 (17:20 +0300)]
little fixes
Alex S [Fri, 6 Sep 2019 14:14:31 +0000 (17:14 +0300)]
post for creating invite tokens in admin api
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
rinpatch [Tue, 17 Sep 2019 21:24:21 +0000 (21:24 +0000)]
Apply suggestion to CHANGELOG.md
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 21:02:24 +0000 (23:02 +0200)]
markdown.ex: put two-spaces before the description-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…
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
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:22:54 +0000 (22:22 +0200)]
markdown.ex: Make suggestion(s) plural only if on >1
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:19:30 +0000 (22:19 +0200)]
description.exs: uncomment type for email logo
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:14:56 +0000 (22:14 +0200)]
description.exs: remove empty strings on descriptions
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:04:21 +0000 (22:04 +0200)]
markdown.ex: do not fail if there is no children
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 20:00:02 +0000 (22:00 +0200)]
docs/markdown.ex: do no print empty suggestions
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:57:13 +0000 (21:57 +0200)]
description.exs: remove empty strings and arrays
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
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
Maxim Filippov [Tue, 17 Sep 2019 20:04:57 +0000 (20:04 +0000)]
Apply suggestion to CHANGELOG.md
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:43:27 +0000 (21:43 +0200)]
docs/markdown.ex: child header as "- key (type): description"
Haelwenn (lanodan) Monnier [Fri, 13 Sep 2019 15:05:19 +0000 (17:05 +0200)]
Remove [true,false] for booleans, it is implicit
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
Maxim Filippov [Tue, 17 Sep 2019 19:36:42 +0000 (22:36 +0300)]
Bump elixir version to ~> 1.8
Maksim Pechnikov [Tue, 17 Sep 2019 19:20:39 +0000 (22:20 +0300)]
Merge branch 'develop' into issue/733
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
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
Maksim Pechnikov [Tue, 17 Sep 2019 19:02:37 +0000 (22:02 +0300)]
fixed ecto version
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.
Maksim Pechnikov [Tue, 17 Sep 2019 18:20:08 +0000 (21:20 +0300)]
Merge branch 'develop' into issue/733
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
Steven Fuchs [Tue, 17 Sep 2019 18:12:27 +0000 (18:12 +0000)]
Fix notification warnings
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
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
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
Steven Fuchs [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
remove remaining errors from tests
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
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`)
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
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
Egor Kislitsyn [Mon, 16 Sep 2019 14:48:01 +0000 (21:48 +0700)]
Set `account_field_value_length` limit to 2048 by default
Egor Kislitsyn [Mon, 16 Sep 2019 12:26:00 +0000 (19:26 +0700)]
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
Maxim Filippov [Mon, 16 Sep 2019 11:40:17 +0000 (14:40 +0300)]
Merge branch 'develop' into feature/return-total-for-reports
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
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.
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
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
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
kaniini [Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)]
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
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
Steven Fuchs [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Streamer refactoring
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
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
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
Egor Kislitsyn [Mon, 16 Sep 2019 05:55:05 +0000 (12:55 +0700)]
Fix a race condition in tests
Egor Kislitsyn [Thu, 12 Sep 2019 12:04:55 +0000 (19:04 +0700)]
Restore tests for `change_password` and `delete_account`
Maksim Pechnikov [Mon, 16 Sep 2019 04:34:22 +0000 (07:34 +0300)]
Merge branch 'develop' into issue/733
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
Maksim Pechnikov [Sun, 15 Sep 2019 11:53:58 +0000 (14:53 +0300)]
added prepare html for RichMedia.Parser
Maksim Pechnikov [Sun, 15 Sep 2019 11:07:07 +0000 (14:07 +0300)]
Merge branch 'develop' into support/tests
Ivan Tashkinov [Sun, 15 Sep 2019 07:15:57 +0000 (10:15 +0300)]
[#1149] Reinstated docs/config.md changes.
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
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
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
Ivan Tashkinov [Sat, 14 Sep 2019 13:28:59 +0000 (16:28 +0300)]
[#1149] Rewritten readme as config/description.exs.
Ivan Tashkinov [Sat, 14 Sep 2019 13:11:44 +0000 (16:11 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
rinpatch [Sat, 14 Sep 2019 12:36:08 +0000 (12:36 +0000)]
Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
Egor Kislitsyn [Sat, 14 Sep 2019 12:31:20 +0000 (19:31 +0700)]
Fix `Activity.all_by_actor_and_id/2` test
rinpatch [Sat, 14 Sep 2019 11:44:34 +0000 (11:44 +0000)]
Merge branch 'security/fav-reblog-access-control' into 'develop'
Mastodon API: Respect post privacy in favourited/reblogged endpoints
See merge request pleroma/pleroma!1667
rinpatch [Sat, 14 Sep 2019 10:50:08 +0000 (10:50 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Sat, 14 Sep 2019 10:46:35 +0000 (10:46 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Fri, 13 Sep 2019 22:50:15 +0000 (01:50 +0300)]
Mastodon API: Respect post privacy in favourited/reblogged endpoints
lain [Fri, 13 Sep 2019 17:07:14 +0000 (17:07 +0000)]
Merge branch 'capture-test-errors' into 'develop'
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
lain [Fri, 13 Sep 2019 17:06:38 +0000 (17:06 +0000)]
Merge branch 'refactor/add_link_headers' into 'develop'
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
rinpatch [Fri, 13 Sep 2019 16:42:53 +0000 (19:42 +0300)]
Merge branch 'develop' into feature/delivery-tracking
rinpatch [Fri, 13 Sep 2019 16:28:35 +0000 (19:28 +0300)]
Disallow NULLs in deliveries
Alex S [Fri, 13 Sep 2019 16:13:04 +0000 (19:13 +0300)]
don't track generated_config.md
Alex S [Fri, 13 Sep 2019 16:03:39 +0000 (19:03 +0300)]
config.md back
Alex S [Fri, 13 Sep 2019 16:02:42 +0000 (19:02 +0300)]
markdown generation to the new file
stwf [Fri, 13 Sep 2019 15:46:41 +0000 (11:46 -0400)]
Capture test error messages where appropriate
rinpatch [Fri, 13 Sep 2019 15:25:15 +0000 (15:25 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 15:23:26 +0000 (15:23 +0000)]
Apply suggestion to lib/pleroma/delivery.ex
projects / akkoma / log