aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
eb0fb73ddb
BBS: Credo fixes.
5 years ago
c58fd4c038
BBS: Fix tests.
5 years ago
4c76f49e60
BBS: small fixes.
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
5 years ago
a53a6c9d64
Add oauth plug tests for url and body parameters
5 years ago
8af55728e4
Fix tests
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
5 years ago
f11e7037c2
test fixes
5 years ago
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
5 years ago
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
5 years ago
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
5 years ago
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
5 years ago
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
5 years ago
501af917b5
add support for bbcode
5 years ago
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
5 years ago
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
5 years ago
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
dfc8425659
Move settings to Source subentity
5 years ago
85953c0836
fixes for tests
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
963d5774af
fix the status notification with special char
5 years ago
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
5 years ago
f5535e5743
html: lock down allowed class attributes to only those related to microformats
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
5 years ago
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
5 years ago
375fd21055
Set correct values in the MastoAPI reblog status view
5 years ago
aef3a3ca46
Fix tests that used finmoji
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
4ef237f26a
Fix my incorrect search test fix
6 years ago
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
2abc09570f
Use the preloaded object in tag queries
6 years ago
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
d1eb578a57
Refactor tests that used ActivityPub.fetch_object_from_id
6 years ago
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
ff8d76c670
Refactor all tests that acessed the embeded object
6 years ago
54b82f236b
Fix note count test
6 years ago
ad681877df
Make credo happy
6 years ago
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
dda4e0e2a8
Fix warnings in object tests
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
6 years ago
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
76999c73a7
Conversation: Add accounts to output.
6 years ago
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
6 years ago
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
27d78dc526
Use User.get_cached_by*
6 years ago
fd2e31af86
oops
6 years ago
5d73dca064
Remove inReplyToStatusId
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
c5d0fffeaf
naming fix
6 years ago
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
d0304b4f92
more tests
6 years ago
dd097a406b
add tests
6 years ago
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
e03d24af96
in_reply_to_id - null
6 years ago
6f880b1627
Conversation: Fix tests.
6 years ago
36ec8d9694
ActivityPub: Fix specs.
6 years ago
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
cf353514fe
Participations: Add last activity.
6 years ago
20d9b90760
Participation: Get for a user.
6 years ago
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lambda