c42ded13a2
Credo fixes.
5 years ago
027ded0df7
Merge branch 'fix/replace-ws' into 'develop'
...
Standardize construction of websocket URL
See merge request pleroma/pleroma!1115
5 years ago
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
5 years ago
a0c755cc4a
MastodonApi: Bump api level.
5 years ago
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
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
dff6afc7c8
fix: Add mix deps.get before unit-testing
5 years ago
533d8cd581
Parse access_token from body parameters and URL parameters
5 years ago
8af55728e4
Fix tests
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
d107919b3d
Merge branch 'support/oauth' into 'develop'
...
Refactored Pleroma.Web.Auth.Authenticator
See merge request pleroma/pleroma!1108
5 years ago
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
622c804c9a
Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'
...
Remove redundant ensure_scrubbed_html
See merge request pleroma/pleroma!1114
5 years ago
51e26f14f7
Remove redundant ensure_scrubbed_html
...
It is never used as handling for fake and non-fake activities was merged
into one function above it
5 years ago
a58813e7a1
Merge branch 'features/download-mastofe-build' into 'develop'
...
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download
See merge request pleroma/pleroma!1052
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
297596ce48
Merge branch 'harmonize_return_types_in_user_module' into 'develop'
...
Harmonize return types in user module
Closes #718
See merge request pleroma/pleroma!1112
5 years ago
a7c9e3b242
Merge branch 'docs/fix-config.md' into 'develop'
...
[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration
See merge request pleroma/pleroma!1110
5 years ago
7c5f1ef327
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker`
See merge request pleroma/pleroma!1111
5 years ago
f11e7037c2
test fixes
5 years ago
04fd7cf817
Update `auto_linker`
5 years ago
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
5 years ago
85fa2fbce4
add scrubber for html special char
5 years ago
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
77690b9d03
Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'
...
Do not normalize objects in stream_out unless the activity type is Create
See merge request pleroma/pleroma!1109
5 years ago
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
5 years ago
32a4501d2d
Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'
...
Fix MigrateOldBookmarks migration crashing on deleted activities
See merge request pleroma/pleroma!1106
5 years ago
f8f6af4cc1
Fix MigrateOldBookmarks migration crashing on deleted activities
5 years ago
41d78f9108
Merge branch 'fix-webpush' into 'develop'
...
WebPush: Use Object.normalize, rewrite tests so they test reality.
See merge request pleroma/pleroma!1105
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
8e266e02da
Merge branch 'fix/uploads-folder-issues' into 'develop'
...
fix issues with the uploads directory
See merge request pleroma/pleroma!1101
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
31852f906e
fix issues with the uploads directory
5 years ago
f2a4156d49
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'
...
Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL
See merge request pleroma/pleroma!1099
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
81bc274930
Merge branch 'update/pleroma-fe-20190426' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!1098
5 years ago
52bdfced32
update pleroma frontend
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
2bd880be88
mix: add bbcode dependency
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
fd45c74e6f
Merge branch 'chore/update-changelog' into 'develop'
...
update Changelog
See merge request pleroma/pleroma!1096
5 years ago
lain