lain
|
e4763cd459
|
Fix tagging problems for existing instances.
|
2018-12-17 20:12:01 +01:00 |
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
|
2018-12-17 09:19:27 +00:00 |
scarlett
|
8fadc1b6a2
|
Merge branch 'netbsd-script' into 'develop'
Add an rc.d script for NetBSD.
See merge request pleroma/pleroma!558
|
2018-12-16 13:19:27 +00:00 |
scarlett
|
4b40e4188c
|
Simplify the NetBSD rc script.
|
2018-12-16 13:15:37 +00:00 |
scarlett
|
9d3eda1959
|
Add an rc.d script for NetBSD.
|
2018-12-16 12:33:50 +00:00 |
Haelwenn
|
41e3401c5c
|
Merge branch 'develop' into 'develop'
Added init file for OpenBSD
See merge request pleroma/pleroma!549
|
2018-12-16 12:13:32 +00:00 |
eal
|
28478a9c4f
|
Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
|
2018-12-16 11:21:26 +00:00 |
eal
|
4c783e35c0
|
Mastodon API: Fix PUT /api/web/settings
|
2018-12-16 13:15:34 +02:00 |
eal
|
8b279aca5f
|
Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'
Enable unsecure cookies by default in dev.exs
See merge request pleroma/pleroma!556
|
2018-12-16 11:08:34 +00:00 |
Rin Toshaka
|
7c522f38f0
|
Enable unsecure cookies by default in dev.exs
|
2018-12-16 08:49:23 +01:00 |
nonlinear
|
75f2177d5b
|
Update/add OpenBSD config files
|
2018-12-15 14:00:00 -08:00 |
Haelwenn (lanodan) Monnier
|
cddab5700b
|
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
|
2018-12-15 17:56:12 +01:00 |
lambda
|
8cb9580aec
|
Merge branch 'bugfix/webfinger-jrd' into 'develop'
Fix requesting application/jrd+json on webfinger
See merge request pleroma/pleroma!553
|
2018-12-15 15:31:30 +00:00 |
lambda
|
cc6689cc20
|
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
|
2018-12-15 15:23:51 +00:00 |
lambda
|
7281ab0b3c
|
Merge branch 'tests-warning-as-errors' into 'develop'
Enable warnings_as_errors for tests
See merge request pleroma/pleroma!548
|
2018-12-15 15:22:59 +00:00 |
lambda
|
9194e84d95
|
Merge branch 'feature/mix-task-instance-port-specification' into 'develop'
Allow port specification in `instance.ex` config generator
See merge request pleroma/pleroma!552
|
2018-12-15 15:21:40 +00:00 |
Haelwenn (lanodan) Monnier
|
5af91020f8
|
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
|
2018-12-15 16:17:44 +01:00 |
Haelwenn (lanodan) Monnier
|
ff7ce9a9fb
|
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
|
2018-12-15 15:58:51 +01:00 |
Rin Toshaka
|
4a895a46d1
|
Allow port specification in instance.ex
|
2018-12-15 11:00:54 +01:00 |
nonlinear
|
04513a13e0
|
Added init file for OpenBSD
|
2018-12-14 13:13:14 -08:00 |
href
|
e74f384b68
|
Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting
See merge request pleroma/pleroma!545
|
2018-12-14 20:30:35 +00:00 |
href
|
bfe27c1b55
|
Merge branch '114_email_invites' into 'develop'
[#114] Email invites
See merge request pleroma/pleroma!541
|
2018-12-14 20:22:24 +00:00 |
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 |
Maksim Pechnikov
|
bc6262d250
|
fixed typo
|
2018-12-14 21:21:37 +03:00 |
href
|
0ee51992a8
|
Enable warning_as_errors for tests
|
2018-12-14 18:14:40 +01:00 |
href
|
84b9a9d497
|
TwitterAPI.ActivityView: Ignore unhandled activities
|
2018-12-14 18:09:59 +01: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 |
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
2018-12-14 16:03:58 +03: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 |
Ivan Tashkinov
|
69fd63e248
|
[#114] Added `invitesEnabled` to `metadata` of nodeinfo.
|
2018-12-14 14:13:13 +03:00 |
Ivan Tashkinov
|
66380b0641
|
[#114] Removed `confirm_email` action stub (to be addressed in a separate MR).
|
2018-12-14 14:01:00 +03:00 |
Ivan Tashkinov
|
07e93f9940
|
[#114] Improved tests.
|
2018-12-14 13:52:04 +03:00 |
Ivan Tashkinov
|
9666376f5f
|
[#114] Readded `invites_enabled` config setting, updated readme.
|
2018-12-14 12:37:06 +03:00 |
Ivan Tashkinov
|
a89e3b4b60
|
[#114] Moved email_invite action to AdminAPIController, adjusted tests.
|
2018-12-14 12:28:23 +03:00 |
Ivan Tashkinov
|
3cbf16a5fe
|
[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
|
2018-12-14 12:28:22 +03:00 |
Ivan Tashkinov
|
cc83d7ffe7
|
[#114] Naive implementation of email invitations.
|
2018-12-14 12:28:14 +03:00 |