Commits · bfeb33e951c8997f33a0242fe69b8e669e3afe07 · Pleroma / pleroma

08 May, 2019 5 commits
- 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 pleroma/pleroma!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 pleroma/pleroma!1125
```
  aa8a6e7b
- Refactoring functions for dealing with oauth scopes. · 799e1f48
  Maksim authored May 08, 2019
  
  799e1f48
07 May, 2019 15 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 pleroma/pleroma!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
- Merge branch 'unused-config-parameter' into 'develop' · 6518644d
  rinpatch authored May 07, 2019
```
unused config paramater

See merge request !1124
```
  6518644d
- unused config paramater · f46295fa
  Alexander Strizhakov authored May 07, 2019
  
  f46295fa
- Merge branch 'fix/ex_doc-source-links' into 'develop' · d26998c2
  rinpatch authored May 07, 2019
```
Fix/ex_doc source links

See merge request !1123
```
  d26998c2
- Fix/ex_doc source links · c81b7070
  xse authored May 07, 2019
  
  c81b7070
06 May, 2019 8 commits
- Merge branch 'issue_800' into 'develop' · 6b79be4a
  lain authored May 06, 2019
```
[#800] added ability renew access_token by refresh_token

See merge request !1045
```
  6b79be4a
- fix format · 1040caf0
  Maksim authored May 06, 2019
```
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
```
  1040caf0
- Merge branch 'feature/bbs' into 'develop' · aacac9da
  lain authored May 06, 2019
```
BBS / SSH

See merge request !997
```
  aacac9da
- Merge branch 'feature/845-improve-status-deletion' into 'develop' · 4dabf64a
  lain authored May 06, 2019
```
Improve status deletion

Closes #845

See merge request !1104
```
  4dabf64a
- Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into... · ce6ca0fe
  Alexander Strizhakov authored May 06, 2019
```
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
```
  ce6ca0fe
- Remove H1 in @moduledoc · 69a50748
  Haelwenn authored May 06, 2019
  
  69a50748
- mrf/tag_policy.ex: Add some documentation · e41a2f98
  Haelwenn authored May 06, 2019
```
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
```
  e41a2f98
- Add short documentation on every MRF Policy · af62ace9
  Haelwenn authored May 06, 2019
  
  af62ace9
04 May, 2019 5 commits
- BBS: Credo fixes. · eb0fb73d
  lain authored May 04, 2019
  
  eb0fb73d
- BBS: Fix tests. · c58fd4c0
  lain authored May 04, 2019
  
  c58fd4c0
- BBS: Use cached user fetcher. · c9d1cb2d
  lain authored May 04, 2019
  
  c9d1cb2d
- BBS: small fixes. · 4c76f49e
  lain authored May 04, 2019
  
  4c76f49e
- Merge remote-tracking branch 'origin/develop' into feature/bbs · 6ad8ddfd
  lain authored May 04, 2019
  
  6ad8ddfd
03 May, 2019 7 commits
- Merge branch 'fix/embeded-relationship-in-follows' into 'develop' · d089ff24
  rinpatch authored May 03, 2019
```
Fix embeded relationships in Mastodon API

See merge request !1118
```
  d089ff24
- Merge branch 'fix-search-speed' into 'develop' · 9907e974
  rinpatch authored May 03, 2019
```
Search: Add fts index on objects table.

See merge request !1120
```
  9907e974
- Just have Benchee in all environments. · a23206a4
  lain authored May 03, 2019
  
  a23206a4
- Mix: Also have benchee in test. · a7709cc2
  lain authored May 03, 2019
  
  a7709cc2
- Merge branch 'bugfix/emoji-size' into 'develop' · 4948a73e
  lain authored May 03, 2019
```
Bugfix: emoji size in profile

Closes #269

See merge request !792
```
  4948a73e
- Search: Add fts index on objects table. · 0e37fddd
  lain authored May 03, 2019
  
  0e37fddd
- MastoAPI: profile update with emoji_map · b5ad1715
  Haelwenn authored Feb 23, 2019
  
  b5ad1715