Alex S
1258128f4f
favourites add bookmark display
5 years ago
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
5 years ago
Alex S
73d01857e3
bookmarks in separate table
5 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 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
5 years ago
Sachin Joshi
963d5774af
fix the status notification with special char
5 years ago
kaniini
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
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
5 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 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
5 years ago
kaniini
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
5 years ago
Alex S
d35246c449
added healthcheck setting to instance config
5 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
rinpatch
952a4ae68e
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
...
task docs
5 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
5 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
5 years ago
Ekaterina Vaartis
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
5 years ago
Ekaterina Vaartis
ba19ba8a88
Formatting
5 years ago
Ekaterina Vaartis
153f5375a6
Replace MD5 with SHA256 for emoji pack verification
5 years ago
Ekaterina Vaartis
d5c0fd35e1
Wrap the docstrings to 70 characters
5 years ago
Roman Chvanikov
4908e0eeee
Fix Credo warning
5 years ago
Roman Chvanikov
eeb093631c
Fix Credo warning
5 years ago
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
5 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
Ekaterina Vaartis
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
6 years ago
Ekaterina Vaartis
31cff7dbca
Document the pleroma.emoji task
6 years ago
Ekaterina Vaartis
1e311d6662
Add a newline at the end of pack in ls-packs
6 years ago
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
Ekaterina Vaartis
9bd5e2dec9
Make emoji default_manifest a config option
6 years ago
Ekaterina Vaartis
98d4b3de53
Treat the manifest path as a file if it doesn't start with http
6 years ago
Ekaterina Vaartis
aaaa428512
mix format
6 years ago
Ekaterina Vaartis
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
Ekaterina Vaartis
eff725c3af
Add a task to generate emoji packs
6 years ago
Ekaterina Vaartis
1e44b5478d
Remove useless comment
6 years ago
Ekaterina Vaartis
c5b7286b5f
Move helper functions of emoji manager task down in the file
6 years ago
Ekaterina Vaartis
06db3ee1a8
Add MD5 verification for emoji pack source
6 years ago
Ekaterina Vaartis
af5494f942
Separate emoji pack file lists in a different file
...
The file should be in the same directory as the manifest file
6 years ago
Ekaterina Vaartis
21b39c54a3
Allow using a custom manfest and getting multiple packs at once
...
A custom manifest can be provided as a command-line options --manifest/-m
6 years ago
Ekaterina Vaartis
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
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
rinpatch
73b8c5387b
Add some logging
6 years ago
rinpatch
945325013a
remove query timeouts
6 years ago
rinpatch
099f89367e
Replace embedded object migration with a mix task
6 years ago
rinpatch
9238dccac1
Add a guard to fetching reply activity
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
a11ca87f40
Add a migration to remove embeded objects
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
4c289e924e
Fix delete-by_ap_id to expect not only embeded objects
6 years ago
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
rinpatch
c3a2052806
If it's an object struct it is already normalized
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
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
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
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
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
lain
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
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
Sadposter
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
.
Because it breaks everything
6 years ago
Sadposter
16d8c8b33b
Assert on the success of enqueue before returning
6 years ago
Sadposter
5e45557751
Always return {atom, _} from try_send_confirmation
6 years ago
Sadposter
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Alex S
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
Alex S
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
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