Commits · d008f2d69c96616f8d665851994414d1b42f8761 · Pleroma / pleroma

27 Aug, 2018 9 commits
- [Pleroma.Web.MastodonAPI.AccountView]: Add bot field · d008f2d6
  Haelwenn authored Aug 10, 2018
  
  d008f2d6
- [MastodonAPI] the tag field isn’t fixed to a static type in pleroma · 97e20d29
  Haelwenn authored Aug 07, 2018
  
  97e20d29
- [MastodonAPI] Add streaming of hashtags · 83efaa3a
  Haelwenn authored Aug 07, 2018
  
  83efaa3a
- Revert "enable scope options and such" · 5ffaa2bf
  kaniini authored Aug 27, 2018
```
This reverts commit e5642d75.
```
  5ffaa2bf
- enable scope options and such · e5642d75
  kaniini authored Aug 20, 2018
  
  e5642d75
- formatting · 5dd6542d
  kaniini authored Aug 14, 2018
  
  5dd6542d
- user: fix up notification last calculation [NOT related to upstream] · 1089d365
  kaniini authored Aug 06, 2018
  
  1089d365
- Merge branch 'feature/relay' into 'develop' · 46c7c238
  lain authored Aug 27, 2018
```
message relay

Closes #144

See merge request !264
```
  46c7c238
- Merge branch 'bugfix/announce-timeline-flooding' into 'develop' · 440b459c
  lain authored Aug 27, 2018
```
activitypub: filter destination list for announce activities differently than normal (closes #164)

Closes #164

See merge request !227
```
  440b459c
26 Aug, 2018 17 commits
- Merge branch 'feature/emoji-in-local-users' into 'develop' · 63094cfd
  kaniini authored Aug 26, 2018
```
Add emoji to local user profiles.

Closes #202

See merge request !271
```
  63094cfd
- tests: fix formatting · 86dca396
  kaniini authored Aug 26, 2018
  
  86dca396
- Merge branch 'bugfix/formatting' into 'develop' · 927be2c6
  kaniini authored Aug 26, 2018
```
fix formatting

See merge request !301
```
  927be2c6
- fix formatting · bc3c3043
  kaniini authored Aug 26, 2018
  
  bc3c3043
- Merge branch 'tests/notification-smoketests' into 'develop' · e394e594
  kaniini authored Aug 26, 2018
```
tests: add notification smoketests (ref #265)

See merge request !300
```
  e394e594
- tests: add notification smoketests (ref #265 ) · 504a25f8
  kaniini authored Aug 26, 2018
  
  504a25f8
- Merge branch 'bugfix/common-api-visibility-orphan' into 'develop' · 1ad5cbed
  kaniini authored Aug 26, 2018
```
common api: properly handle replying to orphaned threads

See merge request !299
```
  1ad5cbed
- common api: handle replying to orphaned threads · 741c6ad6
  kaniini authored Aug 26, 2018
  
  741c6ad6
- Merge branch 'login-with-email' into 'develop' · c9e4c45e
  kaniini authored Aug 26, 2018
```
When logging in, try treating the login as an email

Closes #245

See merge request !295
```
  c9e4c45e
- Merge branch 'develop' into 'feature/relay' · 0f5bff8c
  kaniini authored Aug 26, 2018
```
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
```
  0f5bff8c
- Merge branch 'update-pleroma-frontend' into 'develop' · 3448b434
  kaniini authored Aug 26, 2018
```
update pleroma frontend

See merge request !298
```
  3448b434
- Merge branch 'improve-example-caddyfile' into 'develop' · 7faed994
  kaniini authored Aug 26, 2018
```
Improve example Caddyfile

See merge request !296
```
  7faed994
- Merge branch 'remove-unused-settings' into 'develop' · d802903c
  kaniini authored Aug 26, 2018
```
Remove unused settings

See merge request pleroma/pleroma!297
```
  d802903c
- update pleroma frontend · ce8c7e77
  hakabahitoyo authored Aug 26, 2018
  
  ce8c7e77
- remove unused settings from /api/statusnet/config · 946a0769
  hakabahitoyo authored Aug 26, 2018
  
  946a0769
- remove unused settings · 89e2cb08
  hakabahitoyo authored Aug 26, 2018
  
  89e2cb08
- Improve example Caddyfile · bff5ed15
  shibayashi authored Aug 26, 2018
  
  bff5ed15
25 Aug, 2018 3 commits
- When logging in, try treating the login as an email · 540cce5d
  vaartis authored Aug 25, 2018
```
Closes #245
```
  540cce5d
- Merge branch 'feature/twitterapi-object-description' into 'develop' · ffa552f1
  kaniini authored Aug 25, 2018
```
twitter api: provide object descriptions as attachment description field

See merge request !293
```
  ffa552f1
- twitter api: provide object descriptions as attachment description field · aab2bddd
  kaniini authored Aug 25, 2018
  
  aab2bddd
24 Aug, 2018 11 commits
- Merge branch 'update/pleroma-fe-20180824' into 'develop' · 66bc3792
  kaniini authored Aug 24, 2018
```
update pleroma frontend

See merge request !292
```
  66bc3792
- update pleroma frontend · 47661ce4
  kaniini authored Aug 24, 2018
  
  47661ce4
- Merge branch 'feature/tls-sni-support' into 'develop' · ae0e41fd
  kaniini authored Aug 24, 2018
```
http: fix TLS server name indication

Closes #261

See merge request !291
```
  ae0e41fd
- http: fix TLS server name indication · 290798b8
  kaniini authored Aug 24, 2018
```
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.

since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.

closes #261
```
  290798b8
- Merge branch 'bugfix/formatter-single-char-nicks' into 'develop' · be7a6db1
  kaniini authored Aug 24, 2018
```
formatter: fix single char local nicknames

Closes #163

See merge request !290
```
  be7a6db1
- tests: formatting · a8bd120e
  kaniini authored Aug 24, 2018
  
  a8bd120e
- Merge branch 'config/fe-collapse-subject' into 'develop' · 9ded0ee1
  kaniini authored Aug 24, 2018
```
fe config: add collapse_message_with_subject fe option

See merge request !289
```
  9ded0ee1
- formatter: adjust regexp captures to match local users with single character... · 3e10d139
  kaniini authored Aug 24, 2018
```
formatter: adjust regexp captures to match local users with single character nicknames (closes #163)
```
  3e10d139
- test: add testcase for formatter issue #163 · 14d11877
  kaniini authored Aug 24, 2018
  
  14d11877
- fe config: add collapse_message_with_subject fe option · 09cb4022
  kaniini authored Aug 24, 2018
  
  09cb4022
- Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'" · cac0bd6d
  kaniini authored Aug 24, 2018
```
This reverts merge request !288
```
  cac0bd6d