Commits · mfc-develop · mfc / pleroma

21 Jul, 2020 1 commit
- Update frontend for socialdev via chore/fixes branch: pleroma-fe@580294c6 · 6cf38c53
  feld authored Jul 21, 2020
  
  6cf38c53
20 Jul, 2020 2 commits
- Update frontend for socialdev via mfc-develop branch: pleroma-fe@739e3d87 · c38975df
  feld authored Jul 20, 2020
  
  c38975df
- Merge branch 'merge/develop-20200703' into 'mfc-develop' · 3d960c2d
  feld authored Jul 20, 2020
```
Merge/develop 20200713

See merge request mfc/pleroma!81
```
  3d960c2d
14 Jul, 2020 2 commits
- Fix failing tests due to not matching empty map value in the user's avatar · 2d39d48c
  Eugenij authored Jul 14, 2020
  
  2d39d48c
- Added a note about update_nickname being used by other remote BE services · 070a3ab0
  Eugenij authored Jul 14, 2020
  
  070a3ab0
13 Jul, 2020 9 commits
- Merge branch 'develop' into merge/develop-20200703 · 50fe3d00
  feld authored Jul 13, 2020
  
  50fe3d00
- Merge branch 'config-behaviours-runtime' into 'develop' · 5d215fd8
  feld authored Jul 13, 2020
```
Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request pleroma/pleroma!2755
```
  5d215fd8
- Merge branch 'features/profile-fields-emojo' into 'develop' · 8f9ee694
  feld authored Jul 13, 2020
```
user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741
```
  8f9ee694
- Merge branch 'chore/improve-database-config-docs' into 'develop' · 63fef0c0
  feld authored Jul 13, 2020
```
Improve database config migration and add documentation

See merge request pleroma/pleroma!2756
```
  63fef0c0
- Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop' · db529d45
  feld authored Jul 13, 2020
```
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http

See merge request pleroma/pleroma!2735
```
  db529d45
- Lint · d1cd3f4e
  feld authored Jul 13, 2020
  
  d1cd3f4e
- Show examples for both OTP and source · 442fe3cd
  feld authored Jul 13, 2020
  
  442fe3cd
- Pick up env for both source and OTP installs · e1908a52
  feld authored Jul 13, 2020
  
  e1908a52
- Merge branch '1937-renaming' into 'develop' · f918b6f8
  Haelwenn authored Jul 13, 2020
```
ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748
```
  f918b6f8
12 Jul, 2020 4 commits
- Still allow passing the arg, but fallback to MIX_ENV · 46b123cd
  feld authored Jul 12, 2020
  
  46b123cd
- Make the query more precise · 0871e8b8
  feld authored Jul 12, 2020
  
  0871e8b8
- Improve database config migration and add documentation · 133004e2
  feld authored Jul 12, 2020
  
  133004e2
- Config/Docs: Expand behaviour suggestions at runtime · 4347d2de
  href authored Jul 12, 2020
  
  4347d2de
11 Jul, 2020 6 commits
- Update types in MRF Keyword group · 0eeeaa37
  Angelina Filippova authored Jul 12, 2020
  
  0eeeaa37
- Merge branch 'feature/upload-filter-exiftool' into 'develop' · 11dd29ef
  lain authored Jul 11, 2020
```
Add Pleroma.Upload.Filter.Exiftool

Closes #1935

See merge request pleroma/pleroma!2744
```
  11dd29ef
- Merge branch 'patch-3' into 'develop' · c409a064
  lain authored Jul 11, 2020
```
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths

See merge request pleroma/pleroma!2752
```
  c409a064
- docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths · d8855405
  Alibek Omarov authored Jul 11, 2020
  
  d8855405
- Remove :regex from types · 98c56ff4
  Angelina Filippova authored Jul 11, 2020
  
  98c56ff4
- Update types for :params, :match_actor and :replace settings · 02b2747d
  Angelina Filippova authored Jul 11, 2020
  
  02b2747d
10 Jul, 2020 16 commits
- Remove unused @types · b329f05e
  feld authored Jul 10, 2020
  
  b329f05e
- Add a moduledoc · 9e456726
  feld authored Jul 10, 2020
  
  9e456726
- Support Exiftool for stripping EXIF data · 61675938
  feld authored Jul 10, 2020
```
We really only want to strip location data anyway, and mogrify strips color profiles.
```
  61675938
- Merge branch 'issue/1790-updated-oban' into 'develop' · d6f67fa9
  feld authored Jul 10, 2020
```
[#1790] updated oban to 2.0.0

See merge request pleroma/pleroma!2674
```
  d6f67fa9
- Merge branch 'fix/1924-s3-descriptions' into 'develop' · 167a6194
  feld authored Jul 10, 2020
```
docs and descriptions for s3 settings

Closes #1924

See merge request pleroma/pleroma!2745
```
  167a6194
- Merge branch 'chore/should-document-that' into 'develop' · 76f5f617
  feld authored Jul 10, 2020
```
Probably worth documenting the MediaProxy fix

See merge request pleroma/pleroma!2750
```
  76f5f617
- Merge branch 'develop' into issue/1790-updated-oban · 3c0c1fd2
  feld authored Jul 10, 2020
  
  3c0c1fd2
- Switch to the official Oban 2.0.0 release · d7a37fdd
  feld authored Jul 10, 2020
  
  d7a37fdd
- Probably worth documenting the MediaProxy fix · 0517d325
  feld authored Jul 10, 2020
  
  0517d325
- Merge branch 'proxy-range-and-chunk' into 'develop' · ce951400
  feld authored Jul 10, 2020
```
ReverseProxy: Streaming and disable encoding if Range

Closes #1860 and #1823

See merge request pleroma/pleroma!2749
```
  ce951400
- Credo line length complaint · 72b3dbf4
  feld authored Jul 10, 2020
  
  72b3dbf4
- ReverseProxy: Streaming and disable encoding if Range · a1dace08
  href authored Jul 10, 2020
```
Fixes #1823
Fixes #1860
```
  a1dace08
- ActivityPub: Don't rename a clashing nickname with the same ap id. · 93e494ec
  lain authored Jul 10, 2020
  
  93e494ec
- Merge branch 'chat-federation-information' into 'develop' · fba1ee7d
  lain authored Jul 10, 2020
```
Add an `accepts_chat_messages` to user, expose in api and federation

See merge request pleroma/pleroma!2716
```
  fba1ee7d
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information · b39eb6ec
  lain authored Jul 10, 2020
  
  b39eb6ec
- Merge branch 'bump-fe-2020-07-10' into 'develop' · 8aa7143f
  lain authored Jul 10, 2020
```
Update frontend

See merge request pleroma/pleroma!2747
```
  8aa7143f