kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
380e9fba21
add pinned posts
6 years ago
lain
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
36fa5e8802
Check visible_for_user when performing a search using a direct link.
6 years ago
scarlett
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
kaniini
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
scarlett
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
scarlett
6556be344d
Resolve some test failures.
6 years ago
scarlett
3c86d907d4
add some brakets to the emoji list.
6 years ago
scarlett
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
rinpatch
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
6 years ago
William Pitcock
487c00d36d
rich media: disable cachex in test mode
6 years ago
kaniini
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
William Pitcock
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
kaniini
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
Michael Loftis
943211b035
rewrites List.foldl to Enum.each
6 years ago
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
6 years ago
sxsdv1
4e1cc2bab6
Implement delete activity
6 years ago
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
6 years ago
Maxim Filippov
917d48d09b
Better variable name
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
6 years ago
rinpatch
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
lambda
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
6 years ago
lain
400337b0a7
Make Federator options configurable.
6 years ago
lain
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
lain
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
6 years ago
kaniini
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
lambda
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
Rin Toshaka
dec23500d8
Resolve merge conflict
6 years ago
Rin Toshaka
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
Rin Toshaka
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
Rin Toshaka
66d1c31461
Fix some stupid typos
6 years ago
sxsdv1
f40562b4e1
Respond with full activity to outbox post
6 years ago
sxsdv1
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
sxsdv1
569bad8210
Create activity when client posts to outbox
6 years ago
sxsdv1
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
Rin Toshaka
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
Rin Toshaka
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
Rin Toshaka
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
kaniini
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
Maksim Pechnikov
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
kaniini
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
Ivan Tashkinov
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
kaniini
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
6 years ago
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
Maxim Filippov
be70272ab0
Treat only true and "true" as true
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
lain
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
lambda
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
William Pitcock
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
William Pitcock
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
lambda
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
Haelwenn (lanodan) Monnier
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
Karen Konou
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
409ff60bf8
Fix formatting
6 years ago
Karen Konou
92362e1e22
Implement large thread filter
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
Ivan Tashkinov
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
kaniini
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
Ivan Tashkinov
b520d44b58
[ #114 ] `mix format`
6 years ago
Ivan Tashkinov
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov
3371a45884
[ #114 ] Formatting fix.
6 years ago
Ivan Tashkinov
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago