dec23500d8
Resolve merge conflict
6 years ago
ab3089d6a7
Fix comment in object.ex
6 years ago
c50353e6ae
shame on me for not testing after revert
6 years ago
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
6 years ago
62af23bd26
Revert some changes in html.ex
6 years ago
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
66d1c31461
Fix some stupid typos
6 years ago
f40562b4e1
Respond with full activity to outbox post
6 years ago
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
569bad8210
Create activity when client posts to outbox
6 years ago
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
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
816db3f494
Remove the debugging IO.inspect
6 years ago
f5d7b0003e
Merge branch 'fix_485' into 'develop'
...
Change 'name' to 'instance_name' so option is used when running non-interactive
See merge request pleroma/pleroma!607
6 years ago
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
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
ab9cda315f
Change 'name' to 'instance_name' so option is used when running non-interactive
6 years ago
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
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
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
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
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
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
be70272ab0
Treat only true and "true" as true
6 years ago
708a228919
Set ttl_interval to the seconds_valid time
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
ca2e9ce9cc
Revert unneeded changes
6 years ago
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
2bbec33c71
Fix failing tests
6 years ago
18a4cbb244
Capitalize "tombstone"
6 years ago
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
69ad1039ba
mix tasks: add legal boilerplate
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
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
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
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
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
c76179419d
Renamed the things
6 years ago
409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
6 years ago
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
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
501ce34d7f
[ #114 ] Stylistic adjustments.
6 years ago
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
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
652f49d176
Remove extra bracket
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
a532ad5d72
[ #114 ] User.register/1 tweak.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
6 years ago
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
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
e4763cd459
Fix tagging problems for existing instances.
6 years ago
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
6 years ago
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
5dcb7aecea
More put_view.
6 years ago
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
23549d3952
Formatting fixes
6 years ago
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
4a895a46d1
Allow port specification in instance.ex
6 years ago
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
30812f8451
Remove domain from sample_config template
6 years ago
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
d3ec09bb38
fix tags
6 years ago
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
6 years ago
bc6262d250
fixed typo
6 years ago
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
412df2cd38
Warn if push is disabled..
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
0b4c61e8d5
Fix warning
6 years ago
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
6822916183
Typos
6 years ago
b1bcd97a0f
Push: respect alerts settings
6 years ago
d8984b7bf8
Push: add missing notification_type field
6 years ago
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
07e93f9940
[ #114 ] Improved tests.
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
Rin Toshaka