f09c3afdf5
chase test failures
5 years ago
0aada88b55
bbs: chase timeline containment patch
5 years ago
31db31c587
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
5 years ago
de114ffbb0
activitypub: remove contain_timeline()
5 years ago
0387f52138
activitypub: add restrict_thread_visibility()
5 years ago
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
5 years ago
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
7a92e701b9
CommonAPI: Visibility refactor.
5 years ago
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
5 years ago
071f78733a
switch to pleroma/http_signatures library
5 years ago
1caa6331ea
Group def perform() together to fix the build
5 years ago
fa4bd898f1
Merge branch 'fix/gopher' into 'develop'
...
gopher: fix rendering of post content (closes #895 )
Closes #895
See merge request pleroma/pleroma!1150
5 years ago
51325fd60c
gopher: fix rendering of post content ( closes #895 )
5 years ago
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
5 years ago
ac3a3abf6b
clean up follow/block imports a little
5 years ago
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
5 years ago
52297920e7
Refactoring oauth response.
5 years ago
b92c004ea8
Reuse query from User.restrict_deactivated/1
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
bbacdf2352
Bump Mastodon API level
5 years ago
498bfdf403
Switch to Jason over Poison
5 years ago
69a9e0563c
user: migrate follow/blocks import to job queue
5 years ago
57d11ac9db
activitypub: move post rich media fetching to job queue
5 years ago
32d4630c9c
user: move initial post fetching to job queue
5 years ago
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
7701a4c841
Make irreversible field default to false in filters
5 years ago
44b182732e
nodeinfo: gather supported protocol names from federation modules
5 years ago
28f7f4c6de
webfinger: build the response based on enabled federation modules
5 years ago
55fa4b812a
federator: websub removal
5 years ago
c23276a59a
activitypub: publisher: fixups
5 years ago
fedaca15a3
websub: adapt to work as a federator publishing module
5 years ago
179293e51c
salmon: refactor to work as a federator publishing module
5 years ago
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
5 years ago
69158f1065
ostatus: only as:Public activities are representable
5 years ago
85377c0b67
federator: move activitypub relaying to the AP publisher module
5 years ago
676752bb83
federator: hook up Publisher.publish()
5 years ago
f7a6a37c4e
federator: remove no longer used :publish_single_ap
5 years ago
10695a28d2
federator: publisher: add publish() wrapper
5 years ago
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
5 years ago
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
5 years ago
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
5 years ago
b9f84a382a
Normalize the object only after ensuring the activity type is Create
5 years ago
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
5 years ago
01c45ddc9e
Search: Use RUM index.
5 years ago
f01f995816
make url uniform in admin api
5 years ago
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
5 years ago
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
5 years ago
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
5 years ago
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
a33bec7d58
Conversations: Import order, import as read.
5 years ago
e6d7f8d223
Credo fixes.
5 years ago
6d19bb4eae
Conversations: Add mix task to 'import' old DMs.
5 years ago
a4598b5e8b
Visibility: Make it more resilient.
5 years ago
920bd47055
ActivityPub: Remove leftover printf debugging.
5 years ago
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
5 years ago
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
799e1f48b5
Refactoring functions for dealing with oauth scopes.
5 years ago
14deed7f7d
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
...
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
5 years ago
d64c3b604e
twitterapi: use order constraint to force descending order
5 years ago
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
5 years ago
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
5 years ago
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
06947c9147
Remove bookmarks assoc
5 years ago
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
5 years ago
e71ddf23ba
containment: remove pointless moduledoc line
5 years ago
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
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
69a5074893
Remove H1 in @moduledoc
5 years ago
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
5 years ago
af62ace954
Add short documentation on every MRF Policy
5 years ago
eb0fb73ddb
BBS: Credo fixes.
5 years ago
c9d1cb2dce
BBS: Use cached user fetcher.
5 years ago
4c76f49e60
BBS: small fixes.
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
5 years ago
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
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
c42ded13a2
Credo fixes.
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
533d8cd581
Parse access_token from body parameters and URL parameters
5 years ago
3c4cab9be1
Merge branch 'develop' into update-oauth-template
5 years ago
9a98f48ec3
Remove incorrect statement about valid characters
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
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
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
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
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
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
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
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
a825056d4d
test fixes
5 years ago
85953c0836
fixes for tests
5 years ago
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
5 years ago
3c2ae80008
unused
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
1258128f4f
favourites add bookmark display
5 years ago
324c9c8ab5
migrate user.bookmarks to separate table
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
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
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
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
5 years ago
ba19ba8a88
Formatting
5 years ago
4908e0eeee
Fix Credo warning
5 years ago
eeb093631c
Fix Credo warning
5 years ago
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
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
6 years ago
24073f829f
Refactor query to return only 1 message instead of 20
6 years ago
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
aaaa428512
mix format
6 years ago
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
6 years ago
1e44b5478d
Remove useless comment
6 years ago
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
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
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
9238dccac1
Add a guard to fetching reply activity
6 years ago
eba3db0966
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
...
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
6 years ago
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
ac04311b3f
Fix search in TwitterAPI
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
e31a22043b
Fix media timeline depending on embeded object and add some guards
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
4c289e924e
Fix delete-by_ap_id to expect not only embeded objects
6 years ago
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
c3a2052806
If it's an object struct it is already normalized
6 years ago
a53b917e7f
oof
6 years ago
ad681877df
Make credo happy
6 years ago
e641651e2b
Fix unbookmarking
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
462028688b
Fix pinned posts relying on embded objects
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
128aae05f3
[ #923 ] Minor semantic adjustment.
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
02a53d00c9
Merge branch 'fix/remote-follow-auth' into 'develop'
...
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
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
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
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
5d73dca064
Remove inReplyToStatusId
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
6 years ago
16d8c8b33b
Assert on the success of enqueue before returning
6 years ago
5e45557751
Always return {atom, _} from try_send_confirmation
6 years ago
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
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
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
6 years ago
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
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
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
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
e03d24af96
in_reply_to_id - null
6 years ago
31c06dba5a
Merge branch 'fix/hackney_max_body_param' into 'develop'
...
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
6 years ago
4615e56219
Add `with_body: true` to requests relying on `max_body: val`
6 years ago
d6d5f46bae
Update OAuth web template
6 years ago
46bd5c1d87
fix format
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
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
d115d2a27e
Conversations: Tidying up.
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
6 years ago
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
6 years ago
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
6 years ago
07afb9b537
update the follower count when a follower is blocked
6 years ago
589629cf3e
Used cached user resources in subscriptions
6 years ago
fee50636d0
removing not needed invite update
6 years ago
d0696fdfd6
fix for elixir 1.7.4
6 years ago
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
6 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
13ff312c48
Sever subscription in case of block
6 years ago
William Pitcock