href
|
acec11626d
|
Merge branch 'fix/issue_272' into 'develop'
[#272] fix tags
See merge request pleroma/pleroma!540
|
2018-12-14 20:20:30 +00:00 |
Maksim Pechnikov
|
ea72ac549b
|
fix case when tags is invalid
|
2018-12-14 23:16:12 +03:00 |
Maksim Pechnikov
|
d3ec09bb38
|
fix tags
|
2018-12-14 22:09:04 +03:00 |
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
|
2018-12-14 18:50:44 +00:00 |
href
|
412df2cd38
|
Warn if push is disabled..
|
2018-12-14 16:19:28 +01:00 |
Haelwenn
|
ef10e08efe
|
Update config.md
|
2018-12-14 15:06:04 +00:00 |
href
|
91236c60c7
|
Merge branch 'feature/file-size-checking' into 'develop'
[#36] Add warnings when file upload fails
See merge request pleroma/pleroma!523
|
2018-12-14 13:00:24 +00:00 |
href
|
0b4c61e8d5
|
Fix warning
|
2018-12-14 13:56:42 +01:00 |
href
|
ec0e613eca
|
Pleroma.Activity.mastodon_notification_type/1
|
2018-12-14 13:22:10 +01:00 |
href
|
331396cbcd
|
Properly disable Web Push if no VAPID key is set
|
2018-12-14 13:05:51 +01:00 |
href
|
6822916183
|
Typos
|
2018-12-14 13:05:51 +01:00 |
href
|
b1bcd97a0f
|
Push: respect alerts settings
|
2018-12-14 13:05:49 +01:00 |
href
|
d8984b7bf8
|
Push: add missing notification_type field
|
2018-12-14 13:05:48 +01:00 |
href
|
7facbb2b8d
|
Push.Subscription: convert base64 to base64 urlsafe
|
2018-12-14 13:05:47 +01:00 |
Egor Kislitsyn
|
324933a0ac
|
improve push message format (compatibility with mastodon)
|
2018-12-14 13:05:46 +01:00 |
lambda
|
3b65f31606
|
Update config.md
|
2018-12-14 13:05:44 +01:00 |
Egor Kislitsyn
|
658edb166f
|
fix and improve web push; add configuration docs
|
2018-12-14 13:05:29 +01:00 |
href
|
30dc81667c
|
Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531
|
2018-12-14 09:16:03 +00:00 |
Ivan Tashkinov
|
f81213910f
|
[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.
|
2018-12-14 12:09:55 +03:00 |
lambda
|
262cc6d44b
|
Merge branch 'fix/double-rt-or-fav' into 'develop'
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
|
2018-12-14 08:26:08 +00:00 |
lambda
|
82dbd2d64f
|
Merge branch 'fix/qvitter-fav-object' into 'develop'
TwitterAPI: Include favorited post in json
Closes #405
See merge request pleroma/pleroma!543
|
2018-12-14 08:25:02 +00:00 |
lambda
|
36b0af7601
|
Merge branch '2018-12-13-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!544
|
2018-12-14 08:23:56 +00:00 |
eal
|
61ad2ce422
|
TwitterAPI: Include favorited post in json
|
2018-12-14 08:24:18 +02:00 |
eal
|
1ca080c862
|
Prevent accidental double RTs or favorites
|
2018-12-14 07:56:49 +02:00 |
lain
|
72945b5b32
|
update frontend
|
2018-12-13 21:04:39 +01:00 |
lambda
|
b19ee62252
|
Merge branch 'username-underscores' into 'develop'
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
|
2018-12-13 15:13:24 +00:00 |
lambda
|
a5a10988e8
|
Merge branch 'fix/mix-tasks-set-user-info' into 'develop'
Fix mix task User
See merge request pleroma/pleroma!539
|
2018-12-13 15:10:50 +00:00 |
Ivan Tashkinov
|
9e689de063
|
[#114] Removed `email_invite` implementation (to be addressed separately).
|
2018-12-13 16:24:30 +03:00 |
Ivan Tashkinov
|
18b9467d1a
|
[#114] Removed `email_invite` implementation (to be addressed separately).
|
2018-12-13 16:22:42 +03:00 |
Ivan Tashkinov
|
00744c6b03
|
[#114] Initial implementation of user email invitations.
|
2018-12-13 14:30:48 +03:00 |
Ivan Tashkinov
|
908943352f
|
[#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
|
2018-12-13 13:17:49 +03:00 |
href
|
7214d57463
|
Extended nicknames: allow dashes.
|
2018-12-12 21:48:54 +01:00 |
link0ff
|
51dd294c48
|
Allow to set both admin and moderator at the same time in mix task User
|
2018-12-12 22:45:40 +02:00 |
lambda
|
9208868821
|
Merge branch 'fix/nginx-safari' into 'develop'
Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS
See merge request pleroma/pleroma!538
|
2018-12-12 20:38:03 +00:00 |
link0ff
|
a40ba3ba57
|
Fix toggle_activated in mix task User
|
2018-12-12 22:30:16 +02:00 |
href
|
7d9ddbe689
|
Allow underscores in usernames.
Fixes #429.
|
2018-12-12 18:57:33 +01:00 |
Mark Felder
|
d56772c813
|
proxy buffering still needs to be off
|
2018-12-12 17:36:00 +00:00 |
Mark Felder
|
48c4f88ffd
|
Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS
|
2018-12-12 17:31:47 +00:00 |
Ivan Tashkinov
|
bfff2399ff
|
[#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).
|
2018-12-12 20:15:43 +03:00 |
Ivan Tashkinov
|
e3a21bcd45
|
[#114] Addressed warnings. Fix of `with` statement clause in `password_reset`.
|
2018-12-12 17:14:31 +03:00 |
Ivan Tashkinov
|
4e7d98922e
|
[#114] Added tests for "POST /api/account/password_reset".
|
2018-12-12 17:04:52 +03:00 |
Ivan Tashkinov
|
f5afb11032
|
[#114] Initial implementation of user password reset emails (user-initiated).
|
2018-12-12 17:04:39 +03:00 |
Ivan Tashkinov
|
12905ce1ad
|
[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
|
2018-12-12 17:02:41 +03:00 |
Ivan Tashkinov
|
10c156d98f
|
[#114] SMTP deps and config.
|
2018-12-12 17:01:34 +03:00 |
kaniini
|
2592b3c81a
|
Merge branch 'support/issue_442' into 'develop'
[#442] fix warnings
See merge request pleroma/pleroma!536
|
2018-12-12 07:28:47 +00:00 |
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
2018-12-12 09:09:19 +03:00 |
scarlett
|
2999a08e35
|
Merge branch 'new-fe-options' into 'develop'
Add new frontend options to server-side config.
See merge request pleroma/pleroma!535
|
2018-12-10 23:32:29 +00:00 |
scarlett
|
e1cbb18327
|
Document the new frontend options.
|
2018-12-10 23:23:10 +00:00 |
scarlett
|
213176c3c3
|
Add new frontend options to server-side config.
|
2018-12-10 23:15:01 +00:00 |
lambda
|
37bd32e58b
|
Merge branch '2018-12-10-update-frontend' into 'develop'
2018 12 10 update frontend
See merge request pleroma/pleroma!534
|
2018-12-10 19:55:32 +00:00 |