lambda
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
5 years ago
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
William Pitcock
9bec891eb4
kill @httpoison
5 years ago
Aaron Tinio
9415932af5
Keep nodeinfo available when not federating
5 years ago
feld
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
rinpatch
8b2d39c1ec
Change the order of preloading when fetching activities for context
5 years ago
Sachin Joshi
0c53d91f3b
fix merge conflict
5 years ago
rinpatch
e6b175ed6c
Fix credo issues
5 years ago
William Pitcock
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
5 years ago
William Pitcock
60f882b09f
activitypub: run user objects through MRF filters
5 years ago
William Pitcock
75b6c4b004
mrf: defang policy modules for filtering user profile objects
5 years ago
rinpatch
ac7702f800
Exclude Answers from fetching by default
5 years ago
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
5 years ago
William Pitcock
1344c85e2f
salmon: fix credo
5 years ago
rinpatch
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
5 years ago
Haelwenn (lanodan) Monnier
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
5 years ago
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
5 years ago
rinpatch
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch
5f67c26baf
Accept strings in expires_in because sasuga javascript
5 years ago
rinpatch
0407ffe75f
Change validation error status codes to be more appropriate
5 years ago
rinpatch
ee68244141
Do not stream out poll replies
5 years ago
rinpatch
d7c4d029c8
Restrict poll replies when fetching activiites for context
5 years ago
rinpatch
f28747858b
Actual vote count in poll view
5 years ago
rinpatch
a53d062730
Fix posting non-polls from mastofe
5 years ago
rinpatch
aafe30d94e
Handle poll votes
5 years ago
rinpatch
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
5 years ago
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
5 years ago
Sadposter
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Sadposter
e81f0fc6d4
Add mascot get/set tests
5 years ago
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch
6430cb1bf7
Restrict poll replies from fetch queries by default
5 years ago
rinpatch
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
5 years ago
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch
fd920c8973
Mastodon API: Add support for posting polls
5 years ago
William Pitcock
c4a55e167a
add Changelog entry
5 years ago
William Pitcock
dc08159538
also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
5 years ago
William Pitcock
78588dbd80
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
5 years ago
Egor Kislitsyn
3b71612d3d
Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3
5 years ago
lain
075eecec90
Linting.
5 years ago
lain
f959bf7aa6
MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
f2936e0a07
Add `ap_id` to List
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
lambda
1dcdcd8871
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
...
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
5 years ago
lambda
46684db84d
Update account_view.ex
5 years ago
rinpatch
642a67dd44
Render polls in statuses
5 years ago
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
5 years ago
Sachin Joshi
5c028b8f92
user creation admin api will create multiple users
5 years ago
Haelwenn (lanodan) Monnier
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
5 years ago
Aaron Tinio
70235ce840
Fix typo: s/"tags"/"tag"/g
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
feld
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
5 years ago
Mark Felder
ebb0482116
Merge branch 'develop' into conversations-import
5 years ago
lambda
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
5 years ago
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
William Pitcock
c31026423c
publisher: use the correct queue name for outgoing federation
5 years ago
Aaron Tinio
793f1834d2
Use named binding to conditionally join object
5 years ago
Aaron Tinio
2b6119dfbf
Restrict reblogs of activities from blocked domains
5 years ago
rinpatch
62e42b03ab
Handle incoming Question objects
5 years ago
William Pitcock
a591ab6112
activity pub: remove Ecto SQL query dumps
5 years ago
William Pitcock
31db31c587
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
5 years ago
William Pitcock
de114ffbb0
activitypub: remove contain_timeline()
5 years ago
William Pitcock
0387f52138
activitypub: add restrict_thread_visibility()
5 years ago
lain
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini
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
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
lain
7a92e701b9
CommonAPI: Visibility refactor.
5 years ago
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
William Pitcock
071f78733a
switch to pleroma/http_signatures library
5 years ago
lambda
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
William Pitcock
ac3a3abf6b
clean up follow/block imports a little
5 years ago
Maksim
52297920e7
Refactoring oauth response.
5 years ago
Egor Kislitsyn
e82e73478e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Mark Felder
bbacdf2352
Bump Mastodon API level
5 years ago
Mark Felder
498bfdf403
Switch to Jason over Poison
5 years ago
William Pitcock
69a9e0563c
user: migrate follow/blocks import to job queue
5 years ago
William Pitcock
57d11ac9db
activitypub: move post rich media fetching to job queue
5 years ago
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
Egor Kislitsyn
23276e8d68
Use pseudo ap id of a list in BCC
5 years ago
William Pitcock
44b182732e
nodeinfo: gather supported protocol names from federation modules
5 years ago
William Pitcock
28f7f4c6de
webfinger: build the response based on enabled federation modules
5 years ago
William Pitcock
55fa4b812a
federator: websub removal
5 years ago
William Pitcock
c23276a59a
activitypub: publisher: fixups
5 years ago
William Pitcock
fedaca15a3
websub: adapt to work as a federator publishing module
5 years ago
William Pitcock
179293e51c
salmon: refactor to work as a federator publishing module
5 years ago
William Pitcock
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
5 years ago
William Pitcock
69158f1065
ostatus: only as:Public activities are representable
5 years ago
William Pitcock
85377c0b67
federator: move activitypub relaying to the AP publisher module
5 years ago
William Pitcock
676752bb83
federator: hook up Publisher.publish()
5 years ago
William Pitcock
f7a6a37c4e
federator: remove no longer used :publish_single_ap
5 years ago
William Pitcock
10695a28d2
federator: publisher: add publish() wrapper
5 years ago
William Pitcock
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
5 years ago
William Pitcock
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
5 years ago
William Pitcock
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
5 years ago
kaniini
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
lain
01c45ddc9e
Search: Use RUM index.
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
feld
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
rinpatch
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
Francis Dinh
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
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain
a33bec7d58
Conversations: Import order, import as read.
5 years ago
lain
e6d7f8d223
Credo fixes.
5 years ago
lain
a4598b5e8b
Visibility: Make it more resilient.
5 years ago
lain
920bd47055
ActivityPub: Remove leftover printf debugging.
5 years ago
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
kaniini
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
William Pitcock
d64c3b604e
twitterapi: use order constraint to force descending order
5 years ago
William Pitcock
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
rinpatch
06947c9147
Remove bookmarks assoc
5 years ago
kaniini
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
5 years ago
rinpatch
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
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier
46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
lain
c42ded13a2
Credo fixes.
5 years ago
feld
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
5 years ago
lain
a0c755cc4a
MastodonApi: Bump api level.
5 years ago
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
rinpatch
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
Mark Felder
3c4cab9be1
Merge branch 'develop' into update-oauth-template
5 years ago
Mark Felder
9a98f48ec3
Remove incorrect statement about valid characters
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
Egor Kislitsyn
a3dc02d282
Add addressable lists
5 years ago
Alex S
f11e7037c2
test fixes
5 years ago
Alex S
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
rinpatch
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
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch
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
kaniini
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
rinpatch
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
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
5 years ago
William Pitcock
501af917b5
add support for bbcode
6 years ago
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
6 years ago
kaniini
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
6 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Alex S
a825056d4d
test fixes
6 years ago
Alex S
85953c0836
fixes for tests
6 years ago
Alex S
3c2ae80008
unused
6 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
6 years ago
Alex S
1258128f4f
favourites add bookmark display
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
6 years ago
rinpatch
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
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
kaniini
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
6 years ago
kaniini
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
6 years ago
Alex S
d35246c449
added healthcheck setting to instance config
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
6 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
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
6 years ago
Roman Chvanikov
4908e0eeee
Fix Credo warning
6 years ago
Roman Chvanikov
eeb093631c
Fix Credo warning
6 years ago
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
6 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
6 years ago
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
6 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
Roman Chvanikov
24073f829f
Refactor query to return only 1 message instead of 20
6 years ago
Roman Chvanikov
724311e151
Fix Credo warnings
6 years ago
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
64a2c6a041
Digest emails
6 years ago
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
eugenijm
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
rinpatch
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
Haelwenn
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
Mark Felder
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
rinpatch
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch
ac04311b3f
Fix search in TwitterAPI
6 years ago
rinpatch
6069d0fd36
Fix object search depending on embeded object
6 years ago
rinpatch
e31a22043b
Fix media timeline depending on embeded object and add some guards
6 years ago
rinpatch
2abc09570f
Use the preloaded object in tag queries
6 years ago
William Pitcock
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
rinpatch
a53b917e7f
oof
6 years ago
rinpatch
ad681877df
Make credo happy
6 years ago
rinpatch
e641651e2b
Fix unbookmarking
6 years ago
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch
462028688b
Fix pinned posts relying on embded objects
6 years ago
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
Ivan Tashkinov
128aae05f3
[ #923 ] Minor semantic adjustment.
6 years ago
kaniini
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
Haelwenn
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
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
William Pitcock
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
Hakurei Reimu
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
lain
76999c73a7
Conversation: Add accounts to output.
6 years ago
lain
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
lambda
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
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
eugenijm
27d78dc526
Use User.get_cached_by*
6 years ago
rinpatch
5d73dca064
Remove inReplyToStatusId
6 years ago
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Egor
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
lambda
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
lambda
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
lambda
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
6 years ago
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
6 years ago
kaniini
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
Roman Chvanikov
4615e56219
Add `with_body: true` to requests relying on `max_body: val`
6 years ago
Mark Felder
d6d5f46bae
Update OAuth web template
6 years ago
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
6 years ago
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Ivan Tashkinov
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
lain
c352a0aba6
Conversations: Make tests run.
6 years ago
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lambda
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
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda
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
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
Haelwenn (lanodan) Monnier
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
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Sadposter
589629cf3e
Used cached user resources in subscriptions
6 years ago
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
Alexander Strizhakov
36c0a10fdf
adding language tag
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Sadposter
76fdfd1c7f
Add check on activity visibility in sub notification
6 years ago
Alex S
56c75aec12
credo fix
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
Ivan Tashkinov
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
6 years ago
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
feld
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
Alex S
a53d591ac5
code style
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Alex S
dcc54f8cfa
admin api endpoints for invites
6 years ago
Alex S
47b07cec49
token -> invite renaming
6 years ago
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
Sadposter
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
Sadposter
23c4f49494
Fix subscription endpoint return formats
6 years ago
Sadposter
007762e767
Add notification checks
6 years ago
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
Egor Kislitsyn
1c2e4f88d1
fix credo
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
rinpatch
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
href
bc3618a38d
Set up telemetry and prometheus
6 years ago
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
rinpatch
79cb34a4b0
Fix preview not being usable in form data
6 years ago
Haelwenn
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
lain
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
lain
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
6 years ago
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
Ivan Tashkinov
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
6 years ago
lambda
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
6 years ago
Ivan Tashkinov
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Egor Kislitsyn
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Egor Kislitsyn
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats
6 years ago
Sachin Joshi
f20e8d28de
add support for all status type (ostatus) and replase case with if
6 years ago
Ivan Tashkinov
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint
6 years ago
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
6 years ago
Sachin Joshi
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
Ivan Tashkinov
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
6 years ago
Ivan Tashkinov
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
rinpatch
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
6 years ago
rinpatch
975482f091
insert object defaults for fake activities and make credo happy
6 years ago
rinpatch
d866b59eea
oof
6 years ago
rinpatch
45ba10bf47
Fix the issue with HTML scrubber
6 years ago
Ivan Tashkinov
804173fc92
[ #923 ] Minor code readability fix.
6 years ago
Ivan Tashkinov
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
rinpatch
cd387f8693
Add a fake option to lazy_put_actvity_defaults
6 years ago
rinpatch
1bb4d5d65b
Implement fake status submit
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
Alex S
3ca6c4f443
password reset page labels align
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
rinpatch
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
6 years ago
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
rinpatch
406d19331f
Remove ActivityRepresenter
6 years ago
Ivan Tashkinov
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov
b0759f821b
Comments split.
6 years ago
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
Mark Felder
c410296120
Try sending an empty map
6 years ago
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
kaniini
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
6 years ago
rinpatch
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
rinpatch
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
6 years ago
Haelwenn (lanodan) Monnier
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
William Pitcock
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
William Pitcock
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
William Pitcock
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
William Pitcock
07cdd9ed02
streamer: use the preloaded object if possible
6 years ago
William Pitcock
c62220c500
rich media: helpers: only crawl Create activities
6 years ago
William Pitcock
4cedf45423
relay: use preloaded object since we always have it
6 years ago
William Pitcock
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
6 years ago
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
William Pitcock
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
William Pitcock
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
William Pitcock
a6973a668e
formatting
6 years ago
William Pitcock
b3bf523c09
rich media: use optimized Object.normalize()
6 years ago
William Pitcock
e75e43b949
common api: use the optimized Object.normalize whenever possible
6 years ago
William Pitcock
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
rinpatch
1b33986bfa
Fix text being nullable in TwitterAPI
6 years ago
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
William Pitcock
fea3696799
common api: move context functions from twitterapi
6 years ago
rinpatch
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
6 years ago
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
Zachary Dunn
5ba14c664b
Fix missing end brace
6 years ago
Zachary Dunn
a2e03d4f3c
Initial attempt at updating return type
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
Haelwenn (lanodan) Monnier
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
William Pitcock
e0edc706cf
oauth: add me property to token responses
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
Karen Konou
d8244c2a1b
remove unused function
6 years ago
Karen Konou
dfeb3aec44
fix credo warning
6 years ago
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
6 years ago
Karen Konou
be465c762b
formatting
6 years ago
Karen Konou
15b21d1983
refactor filtering mechanism
6 years ago
Karen Konou
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
6 years ago
Karen Konou
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
6 years ago
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
William Pitcock
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
William Pitcock
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
William Pitcock
64b0120d67
activitypub: add support for forwarding reports
6 years ago
William Pitcock
3b48d5f0c2
common api: add support for forwarding reports
6 years ago
William Pitcock
379442ad17
activitypub: utils: also match Activity objects
6 years ago
William Pitcock
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
William Pitcock
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
rinpatch
e630e5e135
Fix delete activities not federating
6 years ago
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
kaniini
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
6 years ago
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
6 years ago
Maxim Filippov
257d8e78e5
Add tags
6 years ago
kaniini
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
6 years ago
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
6 years ago
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed
6 years ago
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency
6 years ago
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
6 years ago
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
6 years ago
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
link0ff
9338f061a3
Support LDAP method start_tls
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
kaniini
4aa285e6ce
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
...
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
6 years ago
lain
07277879e5
Linting.
6 years ago
lain
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
6 years ago
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
lambda
d9ae2d00a1
Merge branch 'feat/style-oauth-login-page' into 'develop'
...
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
6 years ago
Shpuld Shpuldson
50edead11c
Remove chromium input hilight that clashes with our own
6 years ago
Shpuld Shpuldson
8ddbedcd9a
Style again the login page to fit pleroma more
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
William Pitcock
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
kaniini
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
eugenijm
2827dfea50
Allow an admin to delete a user status
6 years ago
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
William Pitcock
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
rinpatch
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
Karen Konou
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
Karen Konou
6a69ece437
Revert existing object check
6 years ago
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Karen Konou
28d5b40d0a
Add handling of objects not in database
6 years ago
rinpatch
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
6 years ago
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
6 years ago
eugenijm
d1de0a30cc
Include admins in nodeinfo
6 years ago
Maxim Filippov
2d30fc279f
Typo
6 years ago