Commits · a2be420f940fb8f181feeb9b0fb9759d433dcae1 · Pleroma / pleroma

13 May, 2019 6 commits
- differences_in_mastoapi_responses.md: fullname & bio are optionnal · a2be420f
  Alexander Strizhakov authored May 13, 2019
```
[ci skip]
```
  a2be420f
- Merge branch 'filter-irreversible' into 'develop' · 5a4d55cf
  kaniini authored May 13, 2019
```
Make irreversible field, default to false in filters

See merge request !1144
```
  5a4d55cf
- Make irreversible field default to false in filters · 7701a4c8
  Sachin Joshi authored May 13, 2019
  
  7701a4c8
- Merge branch 'mascot/pleroma-tan-shy' into 'develop' · 16cb9e5f
  lain authored May 13, 2019
```
pleroma-fox-tan-shy.png: Add another version of pleroma-tan

See merge request !1139
```
  16cb9e5f
- Merge branch 'fix/unfollows-not-working' into 'develop' · 17f7c5e2
  rinpatch authored May 13, 2019
```
Normalize the object in `create_or_bump_for` only after ensuring the activity type is Create

Closes #874

See merge request !1138
```
  17f7c5e2
- Add a test to ensure create_or_bump_for does not normalize objects before... · 15cda998
  rinpatch authored May 13, 2019
```
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
```
  15cda998
12 May, 2019 4 commits
- Merge branch 'update-changelog' into 'develop' · 3ded9952
  rinpatch authored May 12, 2019
```
Update changelog

See merge request !1141
```
  3ded9952
- update changelog · 2a4e41ac
  Sachin Joshi authored May 12, 2019
  
  2a4e41ac
- pleroma-fox-tan-shy.png: Add another version of pleroma-tan · 566a968a
  Haelwenn authored May 12, 2019
```
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle

Intended to be used when mastofe crashes out and allows to report a bug
among other things.

Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
```
  566a968a
- Normalize the object only after ensuring the activity type is Create · b9f84a38
  rinpatch authored May 12, 2019
  
  b9f84a38
11 May, 2019 7 commits
- Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' · 131f8832
  kaniini authored May 11, 2019
```
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects

See merge request !1129
```
  131f8832
- Merge branch 'fix/readme-release' into 'develop' · 8caea9be
  kaniini authored May 11, 2019
```
Update release info in README.md

See merge request !1133
```
  8caea9be
- Merge branch 'uniform-admin-api-url' into 'develop' · 1cb7a157
  kaniini authored May 11, 2019
```
make user related url uniform in admin api

See merge request !1135
```
  1cb7a157
- make url uniform in admin api · f01f9958
  Sachin Joshi authored May 11, 2019
  
  f01f9958
- Update release info in README.md · 03dc19e7
  Francis Dinh authored May 11, 2019
```
Removed mention that there is no release of Pleroma (there actually has
been a few the last couple of months).
```
  03dc19e7
- Merge branch 'feature/adminfe' into 'develop' · 8d13c429
  Haelwenn authored May 11, 2019
```
Feature/adminfe

See merge request !1116
```
  8d13c429
- Initial bundle of basic AdminFE · c953ae8c
  feld authored May 11, 2019
```
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
```
  c953ae8c
10 May, 2019 2 commits

Remove get_in_reply_to calls in some functions because the result is unused... · 1d78e42f
rinpatch authored May 10, 2019
```
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
```
1d78e42f

Merge branch 'fix/retweet-language' into 'develop' · 17d01869

lain authored May 10, 2019

Use "repeated" instead of "retweeted" for repeated statuses in Twitter API

Closes pleroma-fe#533

See merge request !1130

17d01869

09 May, 2019 4 commits
- Use "repeated" instead of "retweeted" for repeated statuses in Twitter API · 2a54e8c1
  Francis Dinh authored May 09, 2019
```
This makes it consistent with the language used in Pleroma FE (at least
in English).

Resolves pleroma-fe#533
```
  2a54e8c1
- Fix get_in_reply_to in OStatus' activity representer depending on embedded objects · e4523c30
  rinpatch authored May 09, 2019
  
  e4523c30
- Merge branch 'improve/gitignore' into 'develop' · e4bc4408
  Haelwenn authored May 09, 2019
```
Prevent committing code coverage results to the repo

See merge request !1128
```
  e4bc4408
- Prevent committing code coverage results to the repo · c869ec25
  feld authored May 09, 2019
  
  c869ec25
08 May, 2019 6 commits
- Merge branch 'feature/761-add-users-filtration' into 'develop' · c2efc689
  kaniini authored May 08, 2019
```
Feature/761 add users filtration

Closes #761

See merge request !1117
```
  c2efc689
- Merge develop · bfeb33e9
  Alexander Strizhakov authored May 08, 2019
```
Merge conflict in lib/pleroma/activity.ex
```
  bfeb33e9
- Merge branch 'fix/851-emoji-redirect-follow' into 'develop' · 289b8224
  lain authored May 08, 2019
```
emoji dowload follow redirects

Closes #851

See merge request !1126
```
  289b8224
- emoji dowload follow redirects · a76e2622
  Alexander Strizhakov authored May 08, 2019
  
  a76e2622
- Merge branch 'refactor/oauth_scopes' into 'develop' · aa8a6e7b
  lain authored May 08, 2019
```
Refactoring functions for dealing with oauth scopes.

See merge request !1125
```
  aa8a6e7b
- Refactoring functions for dealing with oauth scopes. · 799e1f48
  Maksim authored May 08, 2019
  
  799e1f48
07 May, 2019 11 commits
- Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' · 14deed7f
  kaniini authored May 07, 2019
```
Optimize bookmarks by preloading them with activities

Closes #861

See merge request !1121
```
  14deed7f
- twitterapi: use order constraint to force descending order · d64c3b60
  kaniini authored May 07, 2019
  
  d64c3b60
- activitypub: add optional order constraint to timeline query builder · 6020ff3f
  kaniini authored May 07, 2019
  
  6020ff3f
- Remove `bookmarks` assoc and add a fake `bookmark` assoc instead · 4c5125de
  rinpatch authored May 07, 2019
  
  4c5125de
- Use with_preloaded_bookmark in create_by_object_ap_id_with_object · be067ec2
  rinpatch authored May 04, 2019
  
  be067ec2
- - Actually use preloaded bookmarks in views · 3a7c1464
  rinpatch authored May 04, 2019
```
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
```
  3a7c1464
- Preload bookmarks wherever the object is preloaded · f841eb7c
  rinpatch authored May 04, 2019
  
  f841eb7c
- Remove bookmarks assoc · 06947c91
  rinpatch authored May 03, 2019
  
  06947c91
- Merge branch 'docs/MRF-modules' into 'develop' · a1a0df19
  kaniini authored May 07, 2019
```
Documentation: MRF Modules

See merge request !1122
```
  a1a0df19
- containment: remove pointless moduledoc line · e71ddf23
  kaniini authored May 07, 2019
  
  e71ddf23
- Merge branch 'conversations_three' into 'develop' · 238dd72f
  lain authored May 07, 2019
```
Conversations once more.

See merge request !1119
```
  238dd72f