rinpatch
|
6712b6e4de
|
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
|
2019-10-21 16:44:17 +00:00 |
|
rinpatch
|
2dbee29cf5
|
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.
|
2019-10-21 19:27:38 +03:00 |
|
kaniini
|
ce750dbab5
|
Merge branch 'feature/masto_api_markers' into 'develop'
[#1275] Markers /api/v1/markers
See merge request pleroma/pleroma!1852
|
2019-10-21 09:26:17 +00:00 |
|
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged develop, handled User.Info.invisible.
|
2019-10-21 11:58:22 +03:00 |
|
Egor Kislitsyn
|
478f0883eb
|
Fix benchmarks
|
2019-10-21 15:55:28 +07:00 |
|
Maksim Pechnikov
|
31d6ef6f92
|
update changelog
|
2019-10-21 11:53:11 +03:00 |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
2019-10-21 11:32:28 +03:00 |
|
Ivan Tashkinov
|
a11a7176d5
|
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
|
2019-10-21 11:05:09 +03:00 |
|
Egor Kislitsyn
|
f726d953d5
|
Fix typos
|
2019-10-21 14:56:39 +07:00 |
|
kaniini
|
2ebe8c416a
|
Merge branch 'feature/activitypub-semantics' into 'develop'
activitypub semantics
See merge request pleroma/pleroma!1798
|
2019-10-21 07:54:48 +00:00 |
|
Egor Kislitsyn
|
e37d4b2ddf
|
Revert "Skip deactivated users in followers import"
This reverts commit 8ad015ef64.
|
2019-10-21 14:52:52 +07:00 |
|
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
2019-10-21 14:47:07 +07:00 |
|
Ivan Tashkinov
|
75da202ab7
|
[#1304] Typo fix.
|
2019-10-21 10:20:28 +03:00 |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
2019-10-21 14:19:15 +07:00 |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#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
|
2019-10-20 22:29:56 +03:00 |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
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
|
2019-10-20 20:43:18 +03:00 |
|
kaniini
|
62e3d76a45
|
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'
add missing migration to drop websub table
See merge request pleroma/pleroma!1868
|
2019-10-20 11:04:22 +00:00 |
|
Ivan Tashkinov
|
b4cbf0568b
|
[#1304] Analysis issue fix.
|
2019-10-20 13:58:27 +03:00 |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
2019-10-20 13:42:42 +03:00 |
|
Ariadne Conill
|
34754938ba
|
add missing migration to drop websub table
|
2019-10-20 10:39:03 +00:00 |
|
Ariadne Conill
|
05c58eaece
|
change Maksim's test description
|
2019-10-19 23:23:13 +00:00 |
|
Ariadne Conill
|
ba92522c69
|
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
52d56ed705
|
tests: add test verifying the relay user is invisible
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
c9280b9730
|
rework to use properties instead of compound typing, per SocialCG
|
2019-10-19 23:21:37 +00:00 |
|
Maksim Pechnikov
|
189a288925
|
fix test
|
2019-10-19 23:21:37 +00:00 |
|
Maksim Pechnikov
|
9694d51437
|
added test fo Pleroma.Web.MastodonAPI.StatusController
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
80d3912a56
|
test: activitypub: use User.invisible?/1 for testing invisibility
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
95871cb462
|
user: implement User.invisible?/1
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
1469a084d4
|
relay: set invisible to true
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
e7333db72a
|
user info: add invisible field
|
2019-10-19 23:21:37 +00:00 |
|
kaniini
|
1311884a1d
|
Merge branch 'chore/fixup-testsuite-import' into 'develop'
tests: ostatus controller tests: fix sporadic compilation failure
See merge request pleroma/pleroma!1867
|
2019-10-19 23:20:38 +00:00 |
|
Ariadne Conill
|
cd90735a4b
|
tests: ostatus controller tests: fix sporadic compilation failure
|
2019-10-19 23:16:15 +00:00 |
|
Haelwenn
|
f01dbc450c
|
Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
|
2019-10-19 20:11:58 +00:00 |
|
Haelwenn
|
cec4b00140
|
Merge branch 'mark-all-conversations-as-read' into 'develop'
Pleroma API: `POST /api/v1/pleroma/conversations/read`
See merge request pleroma/pleroma!1830
|
2019-10-19 19:55:16 +00:00 |
|
rinpatch
|
289f011e0a
|
Merge branch 'develop-version-bump' into 'develop'
mix.exs: Bump version for develop builds
See merge request pleroma/pleroma!1866
|
2019-10-19 19:13:00 +00:00 |
|
rinpatch
|
f94e28e8b6
|
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.
|
2019-10-19 22:00:35 +03:00 |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
|
2019-10-19 15:24:06 +03:00 |
|
KokaKiwi
|
df3c2dfd8b
|
Add documentation for PWA manifest configuration.
|
2019-10-19 12:15:16 +02:00 |
|
KokaKiwi
|
638457ba94
|
MastoFE: Add PWA manifest.
|
2019-10-19 12:15:14 +02:00 |
|
rinpatch
|
fd6d05dc45
|
Merge branch 'mix-emoji-task-pack-json' into 'develop'
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
|
2019-10-19 08:51:03 +00:00 |
|
Mark Felder
|
dcb23a85b6
|
Merge branch 'develop' into feature/push-subject-for-dm
|
2019-10-18 17:56:15 -05:00 |
|
Mark Felder
|
152caef51d
|
Direct messages should provide a distinct push notification subject
|
2019-10-18 17:51:34 -05:00 |
|
rinpatch
|
5c6c3026ea
|
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
|
2019-10-18 22:29:04 +00:00 |
|
rinpatch
|
9b26d1608f
|
Merge branch 'release/1.1.2' into 'stable'
1.1.2 Release
See merge request pleroma/pleroma!1863
|
2019-10-18 21:44:14 +00:00 |
|
rinpatch
|
59d447d555
|
pleroma_ctl: Fix attempting to use RPC for config generation
|
2019-10-19 00:41:26 +03:00 |
|
rinpatch
|
1a063c92ab
|
Bump version to 1.1.2 in mix.exs
|
2019-10-19 00:40:23 +03:00 |
|
rinpatch
|
0341f6f779
|
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
|
2019-10-18 21:40:07 +00:00 |
|
rinpatch
|
901bf0fb8c
|
pleroma_ctl: Fix attempting to use RPC for config generation
|
2019-10-19 00:37:39 +03:00 |
|
kaniini
|
c25a81b173
|
Merge branch 'feature/relay-list' into 'develop'
Admin API: Ability to list all followed relays
See merge request pleroma/pleroma!1835
|
2019-10-18 16:51:04 +00:00 |
|