Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,919 Commits 1 Branch 0 Tags 222 MiB
eadb674c41
Commit Graph

7919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini
07a6f8b8a3 Merge branch 'fix/readme' into 'develop' 
fix link on docs-develop.pleroma.social

See merge request pleroma/pleroma!1876
 2019-10-24 08:34:35 +00:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maksim Pechnikov
a57f0dbd42 fix link on docs-develop.pleroma.social 2019-10-24 09:58:37 +03:00
Maxim Filippov
b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
feld
17c237ba80 Merge branch '1304-user-info-deprecation' into 'develop' 
[#1304] User.Info deprecation

Closes #1304

See merge request pleroma/pleroma!1851
 2019-10-23 17:34:42 +00:00
Ivan Tashkinov
c0246309a5 [#1304] Extra bullet-proofing. 2019-10-23 19:30:02 +03:00
Ivan Tashkinov
065e9fac12 [#1304] Adjusted User.Info references from Notification. 2019-10-23 17:31:02 +03:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/notification.ex
 2019-10-23 17:22:42 +03:00
Ivan Tashkinov
11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration. 2019-10-23 17:15:48 +03:00
kaniini
54077677ea 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
 2019-10-23 02:25:08 +00:00
Ariadne Conill
3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -05:00
kaniini
894fb806e9 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
 2019-10-23 00:47:28 +00:00
Ariadne Conill
277aea45b9 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.
 2019-10-22 19:43:31 -05:00
kaniini
6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop' 
Direct messages should provide a distinct push notification subject

See merge request pleroma/pleroma!1864
 2019-10-21 23:50:01 +00:00
Mark Felder
0c628fafc5 Spelling 2019-10-21 18:35:43 -05:00
Mark Felder
2cbb3f2364 Add tests for the subject of push notifications 2019-10-21 18:34:20 -05:00
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