lambda
|
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 |
|
eal
|
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 |
|
eal
|
4c783e35c0
|
Mastodon API: Fix PUT /api/web/settings
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
cddab5700b
|
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
|
6 years ago |
|
lambda
|
cc6689cc20
|
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
|
6 years ago |
|
Rin Toshaka
|
4a895a46d1
|
Allow port specification in instance.ex
|
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 |
|
lambda
|
b19ee62252
|
Merge branch 'username-underscores' into 'develop'
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
|
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 |
|
link0ff
|
51dd294c48
|
Allow to set both admin and moderator at the same time in mix task User
|
6 years ago |
|
link0ff
|
a40ba3ba57
|
Fix toggle_activated in mix task User
|
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 |
