Ekaterina Vaartis
|
a2399c1c7c
|
Add base CAPTCHA support (currently only kocaptcha)
|
6 years ago |
|
href
|
e74f384b68
|
Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting
See merge request pleroma/pleroma!545
|
6 years ago |
|
href
|
bfe27c1b55
|
Merge branch '114_email_invites' into 'develop'
[#114] Email invites
See merge request pleroma/pleroma!541
|
6 years ago |
|
href
|
acec11626d
|
Merge branch 'fix/issue_272' into 'develop'
[#272] fix tags
See merge request pleroma/pleroma!540
|
6 years ago |
|
Maksim Pechnikov
|
ea72ac549b
|
fix case when tags is invalid
|
6 years ago |
|
Maksim Pechnikov
|
d3ec09bb38
|
fix tags
|
6 years ago |
|
href
|
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 |
|
Maksim Pechnikov
|
bc6262d250
|
fixed typo
|
6 years ago |
|
href
|
84b9a9d497
|
TwitterAPI.ActivityView: Ignore unhandled activities
|
6 years ago |
|
href
|
412df2cd38
|
Warn if push is disabled..
|
6 years ago |
|
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
6 years ago |
|
href
|
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 |
|
href
|
0b4c61e8d5
|
Fix warning
|
6 years ago |
|
href
|
ec0e613eca
|
Pleroma.Activity.mastodon_notification_type/1
|
6 years ago |
|
href
|
331396cbcd
|
Properly disable Web Push if no VAPID key is set
|
6 years ago |
|
href
|
6822916183
|
Typos
|
6 years ago |
|
href
|
b1bcd97a0f
|
Push: respect alerts settings
|
6 years ago |
|
href
|
d8984b7bf8
|
Push: add missing notification_type field
|
6 years ago |
|
href
|
7facbb2b8d
|
Push.Subscription: convert base64 to base64 urlsafe
|
6 years ago |
|
Egor Kislitsyn
|
324933a0ac
|
improve push message format (compatibility with mastodon)
|
6 years ago |
|
Egor Kislitsyn
|
658edb166f
|
fix and improve web push; add configuration docs
|
6 years ago |
|
Ivan Tashkinov
|
69fd63e248
|
[#114] Added `invitesEnabled` to `metadata` of nodeinfo.
|
6 years ago |
|
Ivan Tashkinov
|
66380b0641
|
[#114] Removed `confirm_email` action stub (to be addressed in a separate MR).
|
6 years ago |
|
Ivan Tashkinov
|
07e93f9940
|
[#114] Improved tests.
|
6 years ago |
|
Ivan Tashkinov
|
9666376f5f
|
[#114] Readded `invites_enabled` config setting, updated readme.
|
6 years ago |
|
Ivan Tashkinov
|
a89e3b4b60
|
[#114] Moved email_invite action to AdminAPIController, adjusted tests.
|
6 years ago |
|
Ivan Tashkinov
|
3cbf16a5fe
|
[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
|
6 years ago |
|
Ivan Tashkinov
|
cc83d7ffe7
|
[#114] Naive implementation of email invitations.
|
6 years ago |
|
href
|
30dc81667c
|
Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531
|
6 years ago |
|
Ivan Tashkinov
|
f81213910f
|
[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.
|
6 years ago |
|
lambda
|
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 |
|
eal
|
61ad2ce422
|
TwitterAPI: Include favorited post in json
|
6 years ago |
|
eal
|
1ca080c862
|
Prevent accidental double RTs or favorites
|
6 years ago |
|
Ivan Tashkinov
|
9e689de063
|
[#114] Removed `email_invite` implementation (to be addressed separately).
|
6 years ago |
|
Ivan Tashkinov
|
18b9467d1a
|
[#114] Removed `email_invite` implementation (to be addressed separately).
|
6 years ago |
|
Ivan Tashkinov
|
00744c6b03
|
[#114] Initial implementation of user email invitations.
|
6 years ago |
|
Ivan Tashkinov
|
908943352f
|
[#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
|
6 years ago |
|
href
|
7214d57463
|
Extended nicknames: allow dashes.
|
6 years ago |
|
href
|
7d9ddbe689
|
Allow underscores in usernames.
Fixes #429.
|
6 years ago |
|
Ivan Tashkinov
|
bfff2399ff
|
[#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).
|
6 years ago |
|
Ivan Tashkinov
|
e3a21bcd45
|
[#114] Addressed warnings. Fix of `with` statement clause in `password_reset`.
|
6 years ago |
|
Ivan Tashkinov
|
f5afb11032
|
[#114] Initial implementation of user password reset emails (user-initiated).
|
6 years ago |
|
Ivan Tashkinov
|
12905ce1ad
|
[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
|
6 years ago |
|
Ivan Tashkinov
|
10c156d98f
|
[#114] SMTP deps and config.
|
6 years ago |
|
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
6 years ago |
|
scarlett
|
213176c3c3
|
Add new frontend options to server-side config.
|
6 years ago |
|
lain
|
d6bf06ab4f
|
Fix warnings.
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
ff10b9927b
|
Merge branch 'support/bugfix_272' into 'develop'
[#272] fix hashtags in api
See merge request pleroma/pleroma!510
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
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 |
|
lain
|
c81c74d847
|
Treat warnings as errors outside of tests.
|
6 years ago |
|
Maksim Pechnikov
|
e94c3442f4
|
updates
|
6 years ago |
|
raeno
|
9ba4a1c5fe
|
Fixes #415. Properly handle nil and empty string by User.parse_bio
|
6 years ago |
|
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
6 years ago |
|
Maksim Pechnikov
|
068353ac0b
|
formatting
|
6 years ago |
|
Maksim Pechnikov
|
9442588ae9
|
fix hashtags in api response
|
6 years ago |
|
Rin Toshaka
|
15616eda5e
|
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
|
6 years ago |
|
lambda
|
beadeaffa1
|
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
|
6 years ago |
|
href
|
bdc8112e40
|
Media proxy: fix url encoding
|
6 years ago |
|
Rin Toshaka
|
578051809f
|
Add uploadlimit to Twitter API config
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
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 |
|
href
|
134cc94cbd
|
Nodeinfo: remove null features; relay feature.
|
6 years ago |
|
href
|
d8fcf7c5cf
|
Media proxy: follow HTTP redirects by default
|
6 years ago |
|
lambda
|
94d8f1ab30
|
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
|
6 years ago |
|
Rin Toshaka
|
09f20de0d7
|
Make gopher respect ip
|
6 years ago |
|
href
|
3b27f61ffa
|
AnonymizeFilename: allow for a pre-defined text instead of random string
Improve docs
|
6 years ago |
|
href
|
3c925e9d88
|
Emojis: Alphabetical ordering
|
6 years ago |
|
Ivan Tashkinov
|
1cea97df64
|
[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
|
6 years ago |
|
Ivan Tashkinov
|
6ed5044c4e
|
[#394] Refactoring (using Ecto.Multi; "untag" route change).
|
6 years ago |
|
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
6 years ago |
|
Ivan Tashkinov
|
7bcb6a183a
|
[#394] Refactoring.
|
6 years ago |
|
Ivan Tashkinov
|
7b19487389
|
[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
|
6 years ago |
|
kaniini
|
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 |
|
kaniini
|
abead01ab6
|
Merge branch 'correct-and-improve-http-options' into 'develop'
Correct and improve http options
See merge request pleroma/pleroma!505
|
6 years ago |
|
kaniini
|
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 |
|
rinpatch
|
2ae1128d9f
|
MastoAPI: Fix put_settings
|
6 years ago |
|
scarlett
|
d27e3f269f
|
Rename regular expression 'have_re' to 'reply_prefix'.
|
6 years ago |
|
Egor Kislitsyn
|
6f36e903b0
|
use `User.avatar_url`
|
6 years ago |
|
Egor Kislitsyn
|
79668c08fc
|
cleanup
|
6 years ago |
|
scarlett
|
3dff61ebec
|
Harden re: detection.
|
6 years ago |
|
Egor Kislitsyn
|
3d492795b7
|
clean up
|
6 years ago |
|
Egor Kislitsyn
|
4944498133
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
6 years ago |
|
Egor Kislitsyn
|
bac58b1524
|
show warning if VAPID is not set
|
6 years ago |
|
Egor Kislitsyn
|
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 |
|
Egor Kislitsyn
|
04a48286e6
|
Add web push support
|
6 years ago |
|
scarlett
|
6a6aaa0e1a
|
Use object.normalize.
|
6 years ago |
|
Hakaba Hitoyo
|
a09ed0f5af
|
avoid mix format bug
|
6 years ago |
|
kaniini
|
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 |
|
Ivan Tashkinov
|
3e90f688f1
|
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
|
6 years ago |
|
Hakaba Hitoyo
|
96ba95df2e
|
remove follow_redirect options
|
6 years ago |
|
Hakaba Hitoyo
|
27792b2d77
|
remove pool and timeout options which duplicate with the default
|
6 years ago |
|
Hakaba Hitoyo
|
505d820827
|
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
|
6 years ago |
|
kaniini
|
48a0315646
|
Merge branch 'follower-hiding' into 'develop'
Network hiding
Closes #356
See merge request pleroma/pleroma!490
|
6 years ago |
|
Vald
|
194869c7db
|
added data attrs to twitter scrubber
|
6 years ago |
|
lain
|
7d5720f2e4
|
Fix merge.
|
6 years ago |
|
lain
|
76d6b1c6ab
|
Merge remote-tracking branch 'origin' into follower-hiding
|
6 years ago |
|
lain
|
3ea4476445
|
MastodonAPI: Show users their own network.
|
6 years ago |
|
lain
|
fdac215091
|
TwitterAPI: Show users their own network.
|
6 years ago |
