kaniini [Sun, 27 Oct 2019 05:29:05 +0000 (05:29 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895
kaniini [Sun, 27 Oct 2019 05:28:45 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894
kaniini [Sun, 27 Oct 2019 05:28:32 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893
kaniini [Sun, 27 Oct 2019 05:28:18 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892
kaniini [Sun, 27 Oct 2019 05:28:03 +0000 (05:28 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891
kaniini [Sun, 27 Oct 2019 05:27:43 +0000 (05:27 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890
kaniini [Sun, 27 Oct 2019 05:27:24 +0000 (05:27 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889
kaniini [Sun, 27 Oct 2019 05:26:31 +0000 (05:26 +0000)]
Merge branch 'refactor/db-not-null-constraints-for-activities' into 'develop'
Add NOT NULL constraints for activities table
See merge request pleroma/pleroma!1888
kaniini [Sun, 27 Oct 2019 04:40:06 +0000 (04:40 +0000)]
Merge branch 'readme-pg-contrib' into 'develop'
Clarify that postgres contrib modules are required, not just postgres.
See merge request pleroma/pleroma!1911
Phil Hagelberg [Sat, 26 Oct 2019 23:19:58 +0000 (16:19 -0700)]
Clarify that postgres contrib modules are required, not just postgres.
Roman Chvanikov [Sat, 26 Oct 2019 19:39:24 +0000 (22:39 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:38:07 +0000 (22:38 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:37:30 +0000 (22:37 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:36:43 +0000 (22:36 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:33:18 +0000 (22:33 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:32:31 +0000 (22:32 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:31:25 +0000 (22:31 +0300)]
Add migration
Roman Chvanikov [Sat, 26 Oct 2019 19:28:18 +0000 (22:28 +0300)]
Add migration
kaniini [Sat, 26 Oct 2019 10:37:27 +0000 (10:37 +0000)]
Merge branch 'conversation-read-status-for-blocking-user' into 'develop'
Count only visible conversations in the user's unread_conversation_count
See merge request pleroma/pleroma!1886
eugenijm [Fri, 25 Oct 2019 18:29:23 +0000 (21:29 +0300)]
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
rinpatch [Fri, 25 Oct 2019 14:51:02 +0000 (14:51 +0000)]
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
Egor Kislitsyn [Fri, 25 Oct 2019 09:48:01 +0000 (16:48 +0700)]
Remove unused Pleroma.User.info_fields/0
kaniini [Fri, 25 Oct 2019 00:24:01 +0000 (00:24 +0000)]
Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'
pleroma_ctl: fix crashes due to different shift(1) behavior on dash
See merge request pleroma/pleroma!1880
kaniini [Fri, 25 Oct 2019 00:22:50 +0000 (00:22 +0000)]
Merge branch 'object-fetch-errors' into 'develop'
Object fetch errors
See merge request pleroma/pleroma!1881
rinpatch [Thu, 24 Oct 2019 20:28:59 +0000 (23:28 +0300)]
pleroma_ctl: fix crashes due to different shift(1) behavior on dash
stwf [Thu, 24 Oct 2019 16:48:17 +0000 (12:48 -0400)]
fix test
stwf [Thu, 24 Oct 2019 16:08:34 +0000 (12:08 -0400)]
object fetcher error handling
kaniini [Thu, 24 Oct 2019 08:34:35 +0000 (08:34 +0000)]
Merge branch 'fix/readme' into 'develop'
fix link on docs-develop.pleroma.social
See merge request pleroma/pleroma!1876
Maksim Pechnikov [Thu, 24 Oct 2019 06:58:37 +0000 (09:58 +0300)]
fix link on docs-develop.pleroma.social
feld [Wed, 23 Oct 2019 17:34:42 +0000 (17:34 +0000)]
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation
Closes #1304
See merge request pleroma/pleroma!1851
Ivan Tashkinov [Wed, 23 Oct 2019 16:30:02 +0000 (19:30 +0300)]
[#1304] Extra bullet-proofing.
Ivan Tashkinov [Wed, 23 Oct 2019 14:31:02 +0000 (17:31 +0300)]
[#1304] Adjusted User.Info references from Notification.
Ivan Tashkinov [Wed, 23 Oct 2019 14:22:42 +0000 (17:22 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
Ivan Tashkinov [Wed, 23 Oct 2019 14:15:48 +0000 (17:15 +0300)]
[#1304] Fixed null::jsonb handling in User.Info migration.
kaniini [Wed, 23 Oct 2019 02:25:08 +0000 (02:25 +0000)]
Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
Closes #1326
See merge request pleroma/pleroma!1874
Ariadne Conill [Wed, 23 Oct 2019 01:50:25 +0000 (20:50 -0500)]
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
kaniini [Wed, 23 Oct 2019 00:47:28 +0000 (00:47 +0000)]
Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery
See merge request pleroma/pleroma!1873
Ariadne Conill [Wed, 23 Oct 2019 00:43:31 +0000 (19:43 -0500)]
tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD. It can, and we will add regression tests to prove that it can handle
this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
kaniini [Mon, 21 Oct 2019 23:50:01 +0000 (23:50 +0000)]
Merge branch 'feature/push-subject-for-dm' into 'develop'
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
Mark Felder [Mon, 21 Oct 2019 23:35:43 +0000 (18:35 -0500)]
Spelling
Mark Felder [Mon, 21 Oct 2019 23:34:20 +0000 (18:34 -0500)]
Add tests for the subject of push notifications
rinpatch [Mon, 21 Oct 2019 16:44:17 +0000 (16:44 +0000)]
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
rinpatch [Mon, 21 Oct 2019 09:38:35 +0000 (12:38 +0300)]
Do not include notifications from blocked users when with_muted is set
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
kaniini [Mon, 21 Oct 2019 09:26:17 +0000 (09:26 +0000)]
Merge branch 'feature/masto_api_markers' into 'develop'
[#1275] Markers /api/v1/markers
See merge request pleroma/pleroma!1852
Ivan Tashkinov [Mon, 21 Oct 2019 08:58:22 +0000 (11:58 +0300)]
[#1304] Merged `develop`, handled User.Info.invisible.
Maksim Pechnikov [Mon, 21 Oct 2019 08:53:11 +0000 (11:53 +0300)]
update changelog
Maksim Pechnikov [Mon, 21 Oct 2019 08:32:28 +0000 (11:32 +0300)]
Merge branch 'develop' into feature/masto_api_markers
Ivan Tashkinov [Mon, 21 Oct 2019 08:05:09 +0000 (11:05 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
kaniini [Mon, 21 Oct 2019 07:54:48 +0000 (07:54 +0000)]
Merge branch 'feature/activitypub-semantics' into 'develop'
activitypub semantics
See merge request pleroma/pleroma!1798
Ivan Tashkinov [Mon, 21 Oct 2019 07:20:28 +0000 (10:20 +0300)]
[#1304] Typo fix.
Ivan Tashkinov [Sun, 20 Oct 2019 19:29:56 +0000 (22:29 +0300)]
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
Ivan Tashkinov [Sun, 20 Oct 2019 17:43:18 +0000 (20:43 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
kaniini [Sun, 20 Oct 2019 11:04:22 +0000 (11:04 +0000)]
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'
add missing migration to drop websub table
See merge request pleroma/pleroma!1868
Ivan Tashkinov [Sun, 20 Oct 2019 10:58:27 +0000 (13:58 +0300)]
[#1304] Analysis issue fix.
Ivan Tashkinov [Sun, 20 Oct 2019 10:42:42 +0000 (13:42 +0300)]
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
Ariadne Conill [Sun, 20 Oct 2019 10:39:03 +0000 (10:39 +0000)]
add missing migration to drop websub table
Ariadne Conill [Sat, 19 Oct 2019 23:23:13 +0000 (23:23 +0000)]
change Maksim's test description
Ariadne Conill [Sat, 19 Oct 2019 17:53:52 +0000 (17:53 +0000)]
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
Ariadne Conill [Sat, 19 Oct 2019 17:50:17 +0000 (17:50 +0000)]
tests: add test verifying the relay user is invisible
Ariadne Conill [Sat, 19 Oct 2019 17:46:24 +0000 (17:46 +0000)]
rework to use properties instead of compound typing, per SocialCG
Maksim Pechnikov [Mon, 14 Oct 2019 06:31:08 +0000 (09:31 +0300)]
fix test
Maksim Pechnikov [Mon, 14 Oct 2019 06:09:32 +0000 (09:09 +0300)]
added test fo Pleroma.Web.MastodonAPI.StatusController
Ariadne Conill [Tue, 8 Oct 2019 20:59:43 +0000 (20:59 +0000)]
test: activitypub: use User.invisible?/1 for testing invisibility
Ariadne Conill [Sat, 5 Oct 2019 20:41:33 +0000 (20:41 +0000)]
implement invisible support for remote users
Ariadne Conill [Sat, 5 Oct 2019 20:11:43 +0000 (20:11 +0000)]
user: implement User.invisible?/1
Ariadne Conill [Sat, 5 Oct 2019 20:06:31 +0000 (20:06 +0000)]
relay: set invisible to true
Ariadne Conill [Sat, 5 Oct 2019 20:06:03 +0000 (20:06 +0000)]
user info: add invisible field
kaniini [Sat, 19 Oct 2019 23:20:38 +0000 (23:20 +0000)]
Merge branch 'chore/fixup-testsuite-import' into 'develop'
tests: ostatus controller tests: fix sporadic compilation failure
See merge request pleroma/pleroma!1867
Ariadne Conill [Sat, 19 Oct 2019 23:16:15 +0000 (23:16 +0000)]
tests: ostatus controller tests: fix sporadic compilation failure
Haelwenn [Sat, 19 Oct 2019 20:11:58 +0000 (20:11 +0000)]
Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
Haelwenn [Sat, 19 Oct 2019 19:55:16 +0000 (19:55 +0000)]
Merge branch 'mark-all-conversations-as-read' into 'develop'
Pleroma API: `POST /api/v1/pleroma/conversations/read`
See merge request pleroma/pleroma!1830
rinpatch [Sat, 19 Oct 2019 19:13:00 +0000 (19:13 +0000)]
Merge branch 'develop-version-bump' into 'develop'
mix.exs: Bump version for develop builds
See merge request pleroma/pleroma!1866
rinpatch [Sat, 19 Oct 2019 18:59:04 +0000 (21:59 +0300)]
mix.exs: Bump version for develop builds
As per discussion on irc, we already used GNU-style versioning system
for release candidates, so it makes sense to use it for develop builds as well.
eugenijm [Fri, 11 Oct 2019 03:40:58 +0000 (06:40 +0300)]
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
KokaKiwi [Sat, 19 Oct 2019 10:11:25 +0000 (12:11 +0200)]
Add documentation for PWA manifest configuration.
KokaKiwi [Fri, 11 Oct 2019 12:48:01 +0000 (14:48 +0200)]
MastoFE: Add PWA manifest.
rinpatch [Sat, 19 Oct 2019 08:51:03 +0000 (08:51 +0000)]
Merge branch 'mix-emoji-task-pack-json' into 'develop'
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
Mark Felder [Fri, 18 Oct 2019 22:56:15 +0000 (17:56 -0500)]
Merge branch 'develop' into feature/push-subject-for-dm
Mark Felder [Fri, 18 Oct 2019 22:51:34 +0000 (17:51 -0500)]
Direct messages should provide a distinct push notification subject
rinpatch [Fri, 18 Oct 2019 22:29:04 +0000 (22:29 +0000)]
Merge branch 'patch-1' into 'develop'
Fix a typo in default static directory configuration for OTP releases
Closes #1289
See merge request pleroma/pleroma!1829
rinpatch [Fri, 18 Oct 2019 21:40:07 +0000 (21:40 +0000)]
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
rinpatch [Fri, 18 Oct 2019 21:37:39 +0000 (00:37 +0300)]
pleroma_ctl: Fix attempting to use RPC for config generation
kaniini [Fri, 18 Oct 2019 16:51:04 +0000 (16:51 +0000)]
Merge branch 'feature/relay-list' into 'develop'
Admin API: Ability to list all followed relays
See merge request pleroma/pleroma!1835
Maxim Filippov [Fri, 18 Oct 2019 16:35:58 +0000 (18:35 +0200)]
Merge branch 'develop' into feature/relay-list
kaniini [Fri, 18 Oct 2019 16:04:57 +0000 (16:04 +0000)]
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
Ariadne Conill [Fri, 18 Oct 2019 15:46:46 +0000 (15:46 +0000)]
tests: mastodon api: fix broken test that used OStatus
Ariadne Conill [Fri, 18 Oct 2019 15:39:15 +0000 (15:39 +0000)]
object: containment: simplify the pattern match for OStatus testsuite hack
Ariadne Conill [Fri, 18 Oct 2019 15:34:36 +0000 (15:34 +0000)]
object: containment: only allow OStatus references in test suite environment
Ariadne Conill [Fri, 18 Oct 2019 04:14:26 +0000 (04:14 +0000)]
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
Ariadne Conill [Fri, 18 Oct 2019 04:08:25 +0000 (04:08 +0000)]
object: fetcher: fix up formatting
Ariadne Conill [Fri, 18 Oct 2019 03:58:28 +0000 (03:58 +0000)]
add some missing tesla fixtures
Ariadne Conill [Fri, 18 Oct 2019 03:57:32 +0000 (03:57 +0000)]
activitypub: tag containment checks for better error tracing
Ariadne Conill [Fri, 18 Oct 2019 03:56:31 +0000 (03:56 +0000)]
object: containment: also allow OStatus object IDs through when comparing origins
Ariadne Conill [Fri, 18 Oct 2019 03:41:38 +0000 (03:41 +0000)]
object: fetcher: improve error reporting
Ariadne Conill [Fri, 18 Oct 2019 03:26:50 +0000 (03:26 +0000)]
object: containment: don't try to contain ostatus objects
Ariadne Conill [Fri, 18 Oct 2019 02:56:02 +0000 (02:56 +0000)]
tests: fix up signature tests
Ariadne Conill [Fri, 18 Oct 2019 02:52:08 +0000 (02:52 +0000)]
tests: fix relay tests
Ariadne Conill [Fri, 18 Oct 2019 02:42:25 +0000 (02:42 +0000)]
object fetcher: fix up error handling
Ariadne Conill [Fri, 18 Oct 2019 00:51:53 +0000 (00:51 +0000)]
tests: simplify object fetching and containment tests
Ariadne Conill [Fri, 18 Oct 2019 00:37:13 +0000 (00:37 +0000)]
tests: remove some more ostatus tests
projects / akkoma / log