Commits · f24087f96ed31a18ed73b6e2d2c7b3a6ec1e6df6 · Pleroma / pleroma

07 Jan, 2019 5 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts · f24087f9
  minibikini authored Jan 07, 2019
  
  f24087f9
- add pinned posts · 380e9fba
  minibikini authored Jan 07, 2019
  
  380e9fba
- Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop' · b640cf0c
  lain authored Jan 07, 2019
```
Scarlett/pleroma search visibility check

See merge request !635
```
  b640cf0c
- MastoAPI: Add test. · 7dcafb48
  lain authored Jan 07, 2019
  
  7dcafb48
- Check visible_for_user when performing a search using a direct link. · 36fa5e88
  scarlett authored Jan 07, 2019
  
  36fa5e88
05 Jan, 2019 13 commits
- Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop' · b0e8e521
  kaniini authored Jan 05, 2019
```
Add check to prevent multiple follow notifications from the same user

Closes #397

See merge request !591
```
  b0e8e521
- Add check to prevent multiple follow notifications from the same user · 042852ec
  Sadposter authored Jan 05, 2019
  
  042852ec
- Merge branch 'fix/user-search-null-name' into 'develop' · 8d047c7a
  kaniini authored Jan 05, 2019
```
fix user search results for users with unset display name

Closes #499

See merge request !625
```
  8d047c7a
- Merge branch 'fix_486' into 'develop' · 0b54c3d6
  kaniini authored Jan 05, 2019
```
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive

See merge request !627
```
  0b54c3d6
- Merge branch 'activitypub-tombstone-fix' into 'develop' · 57636823
  kaniini authored Jan 05, 2019
```
Don't crash on AP request for tombstone

See merge request pleroma/pleroma!630
```
  57636823
- Merge branch 'emoji-in-summary' into 'develop' · 145d6fe6
  scarlett authored Jan 05, 2019
```
Strip HTML in and allow emoji in summaries.

See merge request !631
```
  145d6fe6
- Add tests for emoji and lack of HTML in summaries. · 57df7d6e
  scarlett authored Jan 05, 2019
  
  57df7d6e
- Remove redundant comma. · 096e1218
  scarlett authored Jan 05, 2019
  
  096e1218
- Resolve some test failures. · 6556be34
  scarlett authored Jan 05, 2019
  
  6556be34
- add some brakets to the emoji list. · 3c86d907
  scarlett authored Jan 05, 2019
  
  3c86d907
- Strip HTML in and allow emoji in summaries. · 0787f0df
  scarlett authored Jan 05, 2019
  
  0787f0df
- Don't crash on AP request for tombstone · 2d7da5f4
  sxsdv1 authored Jan 05, 2019
```
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
```
  2d7da5f4
- Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name · a8130725
  cascode authored Jan 04, 2019
  
  a8130725
04 Jan, 2019 12 commits
- Merge branch 'feature/rich-media-cachex' into 'develop' · ba17518a
  rinpatch authored Jan 04, 2019
```
rich media: use cachex to avoid flooding remote servers

See merge request !629
```
  ba17518a
- rich media: disable cachex in test mode · 487c00d3
  kaniini authored Jan 04, 2019
  
  487c00d3
- Merge branch 'fix/html-cache-content-collision' into 'develop' · bf5aaefb
  kaniini authored Jan 04, 2019
```
Different caches based on the module. Remove scrubber version since it is not relevant anymore

See merge request !628
```
  bf5aaefb
- rich media: use cachex to avoid flooding remote servers · 0964c207
  kaniini authored Jan 04, 2019
  
  0964c207
- oopsies · 1e2d5898
  Rin Toshaka authored Jan 05, 2019
  
  1e2d5898
- Different caches based on the module. Remove scrubber version since it is not relevant anymore · 846082e5
  Rin Toshaka authored Jan 05, 2019
  
  846082e5
- fix 486: Add option --assume-yes to allow it to work non-interactive · 4aa977d3
  spctrl authored Jan 04, 2019
  
  4aa977d3
- Merge branch 'feature/rich-media' into 'develop' · 4258dd86
  kaniini authored Jan 04, 2019
```
URL previews in posts

Closes #402

See merge request pleroma/pleroma!617
```
  4258dd86
- Merge branch 'activitypub-c2s-delete-activity' into 'develop' · ffea81b8
  kaniini authored Jan 04, 2019
```
Activitypub c2s delete activity

See merge request pleroma/pleroma!618
```
  ffea81b8
- formatted · 4c5ee4c6
  cascode authored Jan 04, 2019
  
  4c5ee4c6
- added test for #499 · ab6ebbae
  cascode authored Jan 04, 2019
  
  ab6ebbae
- handle null · 5b23dfa1
  cascode authored Jan 04, 2019
  
  5b23dfa1
03 Jan, 2019 6 commits
- Merge branch 'mr/retry-queue-remove-fold' into 'develop' · d9d62a11
  kaniini authored Jan 03, 2019
```
rewrites List.foldl to Enum.each in RetryQueue

See merge request !621
```
  d9d62a11
- Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop' · ccdc916f
  kaniini authored Jan 03, 2019
```
Remove media proxy examples in config/config.exs

See merge request !624
```
  ccdc916f
- Remove media proxy examples in config/config.exs · 53f56039
  href authored Jan 03, 2019
```
1. this was overriding the real defaults
2. it's documented in `config/config.md`
```
  53f56039
- Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' · eaaf7013
  kaniini authored Jan 03, 2019
```
user: check that the follow request actually has an active account associated with it

See merge request !623
```
  eaaf7013
- Merge branch 'captcha' into 'develop' · b73a1a33
  rinpatch authored Jan 03, 2019
```
Make captcha (kocaptcha) stateless

See merge request !585
```
  b73a1a33
- Merge branch 'fix-chat' into 'develop' · 9ef664ff
  rinpatch authored Jan 03, 2019
```
Add handler for Phoenix-style socket.

See merge request !619
```
  9ef664ff
02 Jan, 2019 4 commits
- user: check that the follow request actually has an active account associated with it · eb1a18d2
  kaniini authored Jan 02, 2019
```
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
```
  eb1a18d2
- rewrites List.foldl to Enum.each · 943211b0
  Michael Loftis authored Jan 01, 2019
  
  943211b0
- Merge branch 'fix/reserve-media-username' into 'develop' · d1983ed0
  rinpatch authored Jan 02, 2019
```
Reserve /media

See merge request !620
```
  d1983ed0
- reserve /media · 5142b50f
  Rin Toshaka authored Jan 02, 2019
  
  5142b50f