Commits · 139b9d1338618aa0107c188a9a5505c6615768be · Pleroma / pleroma

20 Apr, 2020 4 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms · 139b9d13
  lain authored Apr 20, 2020
  
  139b9d13
- Credo fixes. · 970b7438
  lain authored Apr 20, 2020
  
  970b7438
- CommonAPI: Obey local limit for chat messages. · 5b6818b3
  lain authored Apr 20, 2020
  
  5b6818b3
- ChatMessageValidator: Don't validate messages that are too long. · ce23673c
  lain authored Apr 20, 2020
  
  ce23673c
19 Apr, 2020 3 commits
- Merge branch '1559-follow-request-notifications' into 'develop' · 918a8094
  rinpatch authored Apr 19, 2020
```
[#1559] Support for "follow_request" notifications

Closes #1559

See merge request !2354
```
  918a8094
- Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' · 389fb36f
  rinpatch authored Apr 19, 2020
```
mix.exs: Do not bail out when .git doesn’t exists

See merge request !2405
```
  389fb36f
- mix.exs: Do not bail out when .git doesn’t exists · c906ffc5
  Haelwenn authored Apr 19, 2020
  
  c906ffc5
18 Apr, 2020 1 commit

Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' · 79445ae5

Haelwenn authored Apr 18, 2020

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request !2403

79445ae5

17 Apr, 2020 22 commits
- Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs · d698ecef
  Haelwenn authored Apr 17, 2020
  
  d698ecef
- Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex · 24f760c2
  Haelwenn authored Apr 17, 2020
  
  24f760c2
- migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo · eb615640
  Haelwenn authored Apr 17, 2020
  
  eb615640
- Merge branch '1682-basic-auth-permissions-fix' into 'develop' · f1843db4
  rinpatch authored Apr 17, 2020
```
[#1682] Fixed Basic Auth permissions issue

Closes #1682

See merge request !2401
```
  f1843db4
- Merge branch 'update/pleroma-fe-20200417' into 'develop' · e303d80d
  Haelwenn authored Apr 17, 2020
```
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

See merge request !2402
```
  e303d80d
- pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 · 24e0db63
  feld authored Apr 17, 2020
  
  24e0db63
- [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks... · 66f55106
  Ivan Tashkinov authored Apr 17, 2020
```
[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
```
  66f55106
- Notifications: Create a chat notification. · c8458209
  lain authored Apr 17, 2020
  
  c8458209
- Merge branch 'sideeffects-test' into 'develop' · e0d7847b
  rinpatch authored Apr 17, 2020
```
SideEffects: Test for notification creation.

See merge request !2399
```
  e0d7847b
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms · 8c2c3255
  lain authored Apr 17, 2020
  
  8c2c3255
- SideEffects: Test for notification creation. · 26d9c833
  lain authored Apr 17, 2020
  
  26d9c833
- Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' · 69368548
  rinpatch authored Apr 17, 2020
```
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request !2398
```
  69368548
- ChatView: Add a mastodon api representation of the recipient. · 372614cf
  lain authored Apr 17, 2020
  
  372614cf
- Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications · 6e6f95c6
  Ivan Tashkinov authored Apr 17, 2020
```
# Conflicts:
#	CHANGELOG.md
```
  6e6f95c6
- migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering · 46f05104
  Haelwenn authored Apr 17, 2020
  
  46f05104
- ChatController: Use OAuth scopes. · d45ae648
  lain authored Apr 17, 2020
  
  d45ae648
- Merge branch 'sync-changelog' into 'develop' · 09bd1d12
  Haelwenn authored Apr 17, 2020
```
Move changelog entries to unreleased section

See merge request !2397
```
  09bd1d12
- move changelogs entries to unreleased section · 4d22b100
  Alexander Strizhakov authored Apr 17, 2020
  
  4d22b100
- Merge branch 'feature/1584-client-captcha-options' into 'develop' · a17bfb5f
  Haelwenn authored Apr 17, 2020
```
Creating trusted app from adminFE & mix task

Closes #1584

See merge request !2252
```
  a17bfb5f
- Merge branch 'fix/1694-transfer-task-fix' into 'develop' · d8142ee6
  Haelwenn authored Apr 17, 2020
```
Fix for logger configuration

Closes #1694

See merge request !2396
```
  d8142ee6
- Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' · 9c76d70a
  Haelwenn authored Apr 17, 2020
```
Added need_reboot endpoint to admin api

Closes #1677

See merge request !2373
```
  9c76d70a
- fix for logger configuration · 304ea09f
  Alexander Strizhakov authored Apr 17, 2020
  
  304ea09f
16 Apr, 2020 10 commits
- Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' · badd888c
  rinpatch authored Apr 16, 2020
```
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request !2349
```
  badd888c
- Merge branch 'fix/1691-feed-render' into 'develop' · 28bcde5d
  rinpatch authored Apr 16, 2020
```
Fix for use of `published` field from different entities

Closes #1691

See merge request !2395
```
  28bcde5d
- Merge branch 'features/remove-user-source_data' into 'develop' · 0ddee13c
  rinpatch authored Apr 16, 2020
```
User: remove source_data

Closes #820

See merge request !2339
```
  0ddee13c
- Merge branch 'develop' into features/remove-user-source_data · 942d7467
  rinpatch authored Apr 16, 2020
  
  942d7467
- ChatController: Handle pagination. · f8c3ae7a
  lain authored Apr 16, 2020
  
  f8c3ae7a
- ChatMessagesHandling: Strip HTML of incoming messages. · e983f708
  lain authored Apr 16, 2020
  
  e983f708
- fix for use of published from different entities · 4d330d9d
  Alexander Strizhakov authored Apr 16, 2020
  
  4d330d9d
- Merge branch 'refactor/remove-upgrade-changeset' into 'develop' · 252528a4
  rinpatch authored Apr 16, 2020
```
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request !2368
```
  252528a4
- user: remove blank? · 77ee64b9
  rinpatch authored Apr 16, 2020
  
  77ee64b9
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms · 41fdcb72
  lain authored Apr 16, 2020
  
  41fdcb72