Commits · 7c3991f59eccc47551257dfe41817e71d0eb6717 · Pleroma / pleroma

09 Feb, 2020 1 commit
- [#1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids). · 7c3991f5
  Ivan Tashkinov authored Feb 09, 2020
  
  7c3991f5
08 Feb, 2020 3 commits
- Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation · 4e6bbdc7
  Ivan Tashkinov authored Feb 08, 2020
  
  4e6bbdc7
- [#1505] Added tests, changelog entry, tweaked config settings related to... · d458f4fd
  Ivan Tashkinov authored Feb 08, 2020
```
[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
```
  d458f4fd
- Merge branch 'fix/upload-limit-otp' into 'develop' · 964b4d82
  lain authored Feb 08, 2020
```
Actually fix upload limit on OTP releases

Closes #1109

See merge request !2185
```
  964b4d82
07 Feb, 2020 9 commits
- Actually fix upload limit on OTP releases · 15ea75cd
  rinpatch authored Feb 07, 2020
```
Closes #1109
```
  15ea75cd
- Merge branch 'cancel-follow-request' into 'develop' · 1262357d
  Haelwenn authored Feb 07, 2020
```
Add support for cancellation of a follow request

Closes #1522

See merge request !2175
```
  1262357d
- Merge branch 'questions-timezone' into 'develop' · 8d01aaa7
  rinpatch authored Feb 07, 2020
```
Questions: Add timezone to `closed` property

Closes #1552

See merge request !2184
```
  8d01aaa7
- Questions: Add timezone to `closed` property · d85bcc86
  lain authored Feb 07, 2020
  
  d85bcc86
- deps: update plug to 1.9 · f57cea17
  rinpatch authored Feb 07, 2020
```
Includes functionality needed to fix upload limit not being changed at
runtime:
https://github.com/elixir-plug/plug/commit/087cd64d864696c74bf07f935e2ae31caec19a1e
```
  f57cea17
- Add User.get_follow_state/2 · bc2e98b2
  minibikini authored Feb 07, 2020
  
  bc2e98b2
- Merge branch 'rename_emoji_reactios' into 'develop' · f13b7878
  rinpatch authored Feb 07, 2020
```
EmojiReactions: Rename to EmojiReacts

See merge request !2181
```
  f13b7878
- Merge branch 'docs-fix' into 'develop' · 1b51390e
  rinpatch authored Feb 07, 2020
```
Fix for config.md

See merge request !2182
```
  1b51390e
- fix · 01da001d
  Alexander Strizhakov authored Feb 07, 2020
  
  01da001d
06 Feb, 2020 13 commits
- EmojiReactions: Rename to EmojiReacts · 8a79f20c
  lain authored Feb 06, 2020
  
  8a79f20c
- Merge branch 'update/fe-bundle-20200206' into 'develop' · 5b1ef335
  rinpatch authored Feb 06, 2020
```
Update FE bundle

See merge request !2180
```
  5b1ef335
- Update FE bundle · fed9b0d1
  feld authored Feb 06, 2020
  
  fed9b0d1
- Merge branch 'mastoapi-non-html-strings' into 'develop' · df0b00b3
  feld authored Feb 06, 2020
```
mastodon API: do not sanitize html in non-html fields

See merge request !2167
```
  df0b00b3
- Merge branch 'fix/dymamic-docs' into 'develop' · e12bf05f
  feld authored Feb 06, 2020
```
Simplify in-database config docs

See merge request !2178
```
  e12bf05f
- Merge branch 'config-changes' into 'develop' · 5499f172
  feld authored Feb 06, 2020
```
Config changes

Closes #1547

See merge request !2174
```
  5499f172
- Update CHANGELOG · 2cc4fbab
  minibikini authored Feb 06, 2020
  
  2cc4fbab
- Cancellation of a follow request for a remote user · 8b9742ec
  minibikini authored Feb 06, 2020
  
  8b9742ec
- Merge branch 'develop' into fix/dymamic-docs · 6769ecd9
  rinpatch authored Feb 06, 2020
  
  6769ecd9
- Simplify in-database config docs · 6722dade
  rinpatch authored Feb 06, 2020
```
Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore)
```
  6722dade
- description change · 7a2e153a
  Alexander Strizhakov authored Feb 06, 2020
  
  7a2e153a
- dropdown type · bdf0a87b
  Alexander Strizhakov authored Feb 05, 2020
  
  bdf0a87b
- removing confusing error · c85aa6e8
  Alexander Strizhakov authored Feb 05, 2020
  
  c85aa6e8
05 Feb, 2020 9 commits
- Merge branch 'fix/unpinnable-polls' into 'develop' · 15cb1f68
  rinpatch authored Feb 05, 2020
```
fix not being able to pin polls

See merge request !2172
```
  15cb1f68
- Merge branch 'removing-admin-api-endpoint' into 'develop' · 72d76799
  rinpatch authored Feb 05, 2020
```
Removing migrate_from_db endpoint from admin api

See merge request !2177
```
  72d76799
- Merge branch 'remove-linker-scheme-option' into 'develop' · b21e59da
  feld authored Feb 05, 2020
```
Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
```
  b21e59da
- Apply suggestion to CHANGELOG.md · 2a3e06eb
  Alexander Strizhakov authored Feb 05, 2020
  
  2a3e06eb
- removing migrate_from_db endpoint from admin api · 5db6ac8e
  Alexander Strizhakov authored Feb 05, 2020
  
  5db6ac8e
- Remove AutoLinker `scheme` option from the config · 3909b5b7
  minibikini authored Feb 05, 2020
  
  3909b5b7
- Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' · 49e80a15
  rinpatch authored Feb 05, 2020
```
Restarting pleroma from outside application

See merge request pleroma/pleroma!2144
```
  49e80a15
- Add support for cancellation of a follow request · 8c71f7e1
  minibikini authored Feb 04, 2020
  
  8c71f7e1
- Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation · e84fee5b
  Ivan Tashkinov authored Feb 05, 2020
  
  e84fee5b
04 Feb, 2020 2 commits
- Merge branch 'feature/make_attachments_cleanup_optional' into 'develop' · a56db789
  lain authored Feb 04, 2020
```
Make attachments cleanup optional

See merge request pleroma/pleroma!2170
```
  a56db789
- Add cheatsheet entry · 90b862e7
  lain authored Feb 04, 2020
  
  90b862e7
02 Feb, 2020 2 commits
- fix not being able to pin polls · 50f5a920
  rinpatch authored Feb 02, 2020
  
  50f5a920
- mastodon API: do not sanitize html in non-html fields · 983a8717
  rinpatch authored Jan 30, 2020
  
  983a8717
30 Jan, 2020 1 commit
- Make attachments cleanup optional · 8057157e
  Roman Chvanikov authored Jan 31, 2020
  
  8057157e