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
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
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
d3ec09bb38
fix tags
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
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
b19ee62252
Merge branch 'username-underscores' into 'develop'
...
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
6 years ago
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
7214d57463
Extended nicknames: allow dashes.
6 years ago
51dd294c48
Allow to set both admin and moderator at the same time in mix task User
6 years ago
a40ba3ba57
Fix toggle_activated in mix task User
6 years ago
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
89b3729afa
fix warnings
6 years ago
213176c3c3
Add new frontend options to server-side config.
6 years ago
d6bf06ab4f
Fix warnings.
6 years ago
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
6 years ago
8aa646ca31
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
...
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
6 years ago
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
6 years ago
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
6 years ago
bda25b999b
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
...
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
6 years ago
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
e94c3442f4
updates
6 years ago
993c8c8bd4
Keep the shortdoc descriptive
6 years ago
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
6 years ago
074fa790ba
fix compile warnings
6 years ago
068353ac0b
formatting
6 years ago
9442588ae9
fix hashtags in api response
6 years ago
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
5436aaad4f
Merge branch 'fix/add-upload.ex' into 'develop'
...
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
6 years ago
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
8fa5c66eab
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
...
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
6 years ago
4976a8b05f
Merge branch 'fix/typo-relay-ex' into 'develop'
...
[#283 ] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
6 years ago
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
6 years ago
bdc8112e40
Media proxy: fix url encoding
6 years ago
578051809f
Add uploadlimit to Twitter API config
6 years ago
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
6 years ago
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
6 years ago
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
09f20de0d7
Make gopher respect ip
6 years ago
fd5c7b445f
Fix a typo
6 years ago
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
6 years ago
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
3c925e9d88
Emojis: Alphabetical ordering
6 years ago
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
8764f64690
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
...
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
6 years ago
4e2250b1dd
Fix a typo in relay.ex moduledoc
6 years ago
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
f7e23aee90
Oops
6 years ago
f661813807
Add mix pleroma.user unsubscribe to mix doc
6 years ago
08e10a70ec
Rename def to defval
6 years ago
1d11c4cf11
add common.ex
6 years ago
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
71d5cf9ed8
Remove unused vars from user.ex
6 years ago
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
66313cda02
Update instance.ex for web push
6 years ago
88f92693f2
Merge develop
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
ca7b46fb3b
Refactor common functions to common.ex
6 years ago
4a2a7ce636
Refactor common functions to common.ex
6 years ago
3a84511df1
remove migrate_local_uploads.ex
6 years ago
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
6 years ago
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
6f36e903b0
use `User.avatar_url`
6 years ago
79668c08fc
cleanup
6 years ago
3dff61ebec
Harden re: detection.
6 years ago
3d492795b7
clean up
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
bac58b1524
show warning if VAPID is not set
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
04a48286e6
Add web push support
6 years ago
6a6aaa0e1a
Use object.normalize.
6 years ago
a09ed0f5af
avoid mix format bug
6 years ago
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
6 years ago
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
96ba95df2e
remove follow_redirect options
6 years ago
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
194869c7db
added data attrs to twitter scrubber
6 years ago
Maxim Filippov