Commits · cc878804880137740afc37a0c5d3f7e4d64d014a · Pleroma / pleroma

17 Dec, 2018 2 commits
- Support both OAuth token record and token string in UserView · cc878804
  raeno authored Dec 17, 2018
  
  cc878804
- Merge branch 'testfix/webfinger-jrd' into 'develop' · 56735979
  lain authored Dec 17, 2018
```
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request !554
```
  56735979
16 Dec, 2018 8 commits
- Merge branch 'netbsd-script' into 'develop' · 8fadc1b6
  scarlett authored Dec 16, 2018
```
Add an rc.d script for NetBSD.

See merge request pleroma/pleroma!558
```
  8fadc1b6
- Simplify the NetBSD rc script. · 4b40e418
  scarlett authored Dec 16, 2018
  
  4b40e418
- Add an rc.d script for NetBSD. · 9d3eda19
  scarlett authored Dec 16, 2018
  
  9d3eda19
- Merge branch 'develop' into 'develop' · 41e3401c
  Haelwenn authored Dec 16, 2018
```
Added init file for OpenBSD

See merge request pleroma/pleroma!549
```
  41e3401c
- Merge branch 'fix/masto-put-settings' into 'develop' · 28478a9c
  eal authored Dec 16, 2018
```
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
```
  28478a9c
- Mastodon API: Fix PUT /api/web/settings · 4c783e35
  eal authored Dec 16, 2018
  
  4c783e35
- Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop' · 8b279aca
  eal authored Dec 16, 2018
```
Enable unsecure cookies by default in dev.exs

See merge request pleroma/pleroma!556
```
  8b279aca
- Enable unsecure cookies by default in dev.exs · 7c522f38
  Rin Toshaka authored Dec 16, 2018
  
  7c522f38
15 Dec, 2018 9 commits
- Update/add OpenBSD config files · 75f2177d
  nonlinear authored Dec 15, 2018
  
  75f2177d
- WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test · cddab570
  Haelwenn authored Dec 15, 2018
  
  cddab570
- Merge branch 'bugfix/webfinger-jrd' into 'develop' · 8cb9580a
  lain authored Dec 15, 2018
```
Fix requesting application/jrd+json on webfinger

See merge request !553
```
  8cb9580a
- Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' · cc6689cc
  lain authored Dec 15, 2018
```
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request !547
```
  cc6689cc
- Merge branch 'tests-warning-as-errors' into 'develop' · 7281ab0b
  lain authored Dec 15, 2018
```
Enable warnings_as_errors for tests

See merge request !548
```
  7281ab0b
- Merge branch 'feature/mix-task-instance-port-specification' into 'develop' · 9194e84d
  lain authored Dec 15, 2018
```
Allow port specification in `instance.ex` config generator

See merge request !552
```
  9194e84d
- Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints · 5af91020
  Haelwenn authored Dec 15, 2018
  
  5af91020
- config/config.exs: Add application/jrd+json => jrd+json to fix webfinger · ff7ce9a9
  Haelwenn authored Dec 15, 2018
```
Closes: !551
```
  ff7ce9a9
- Allow port specification in instance.ex · 4a895a46
  Rin Toshaka authored Dec 15, 2018
  
  4a895a46
14 Dec, 2018 21 commits
- Added init file for OpenBSD · 04513a13
  nonlinear authored Dec 14, 2018
  
  04513a13
- Merge branch 'fix/issue_433' into 'develop' · e74f384b
  href authored Dec 14, 2018
```
[#433] fix markdown formatting

See merge request !545
```
  e74f384b
- Merge branch '114_email_invites' into 'develop' · bfe27c1b
  href authored Dec 14, 2018
```
[#114] Email invites

See merge request !541
```
  bfe27c1b
- Merge branch 'fix/issue_272' into 'develop' · acec1162
  href authored Dec 14, 2018
```
[#272] fix tags

See merge request !540
```
  acec1162
- fix case when tags is invalid · ea72ac54
  Maksim authored Dec 14, 2018
  
  ea72ac54
- fix tags · d3ec09bb
  Maksim authored Dec 13, 2018
  
  d3ec09bb
- Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' · 980131b4
  href authored Dec 14, 2018
```
Improve web push

Closes #393, #422, and #452

See merge request !524
```
  980131b4
- fixed typo · bc6262d2
  Maksim authored Dec 14, 2018
  
  bc6262d2
- Enable warning_as_errors for tests · 0ee51992
  href authored Dec 14, 2018
  
  0ee51992
- TwitterAPI.ActivityView: Ignore unhandled activities · 84b9a9d4
  href authored Dec 14, 2018
  
  84b9a9d4
- Warn if push is disabled.. · 412df2cd
  href authored Dec 14, 2018
  
  412df2cd
- Update config.md · ef10e08e
  Haelwenn authored Dec 14, 2018
  
  ef10e08e
- fix markdown formatting · baead4ea
  Maksim authored Dec 14, 2018
  
  baead4ea
- Merge branch 'feature/file-size-checking' into 'develop' · 91236c60
  href authored Dec 14, 2018
```
[#36] Add warnings when file upload fails

See merge request !523
```
  91236c60
- Fix warning · 0b4c61e8
  href authored Dec 14, 2018
  
  0b4c61e8
- Pleroma.Activity.mastodon_notification_type/1 · ec0e613e
  href authored Dec 10, 2018
  
  ec0e613e
- Properly disable Web Push if no VAPID key is set · 331396cb
  href authored Dec 09, 2018
  
  331396cb
- Typos · 68229161
  href authored Dec 08, 2018
  
  68229161
- Push: respect alerts settings · b1bcd97a
  href authored Dec 08, 2018
  
  b1bcd97a
- Push: add missing notification_type field · d8984b7b
  href authored Dec 08, 2018
  
  d8984b7b
- Push.Subscription: convert base64 to base64 urlsafe · 7facbb2b
  href authored Dec 08, 2018
  
  7facbb2b