Commits · 9c1b36856b97a7f86e60ad23ef374449c1910c7a · Pleroma / pleroma

10 Apr, 2019 6 commits
- s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ · 9c1b3685
  Haelwenn authored Apr 10, 2019
  
  9c1b3685
- s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ · cae02317
  Haelwenn authored Apr 10, 2019
  
  cae02317
- s/Pleroma.Mailer/Pleroma.Emails.Mailer/ · 1791ee8e
  Haelwenn authored Apr 10, 2019
  
  1791ee8e
- Merge branch 'hotfix/fix_undefined_summary' into 'develop' · 0ab563d3
  kaniini authored Apr 10, 2019
```
transmogrifier.ex: Add fix_summary/1

See merge request !1039
```
  0ab563d3
- Merge branch 'notification-pleroma-settings' into 'develop' · 97395e01
  kaniini authored Apr 10, 2019
```
Notification controls

Closes #738

See merge request !988
```
  97395e01
- transmogrifier.ex: Add fix_summary/1 · cf9ba8fe
  Haelwenn authored Apr 10, 2019
```
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
```
  cf9ba8fe
09 Apr, 2019 3 commits
- Merge branch 'mastoapi/plaintext-statuses' into 'develop' · 144648de
  rinpatch authored Apr 09, 2019
```
Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request !1035
```
  144648de
- Merge branch 'bugfix/follower_count' into 'develop' · 0a02ed7a
  lain authored Apr 09, 2019
```
update the follower count when a follower is blocked

See merge request !1033
```
  0a02ed7a
- update the follower count when a follower is blocked · 07afb9b5
  Sachin Joshi authored Apr 08, 2019
  
  07afb9b5
08 Apr, 2019 13 commits
- Merge branch 'use-jobs-in-webpush' into 'develop' · 4977e96f
  lain authored Apr 08, 2019
```
Use PleromaJobQueue in Pleroma.Web.Push

See merge request !1023
```
  4977e96f
- Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush · 9abf832b
  minibikini authored Apr 08, 2019
  
  9abf832b
- Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' · e19590c9
  lain authored Apr 08, 2019
```
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request !1019
```
  e19590c9
- Merge branch 'twitter_oauth' into 'develop' · fd45cab9
  lain authored Apr 08, 2019
```
OAuth consumer (sign in / sign up with external provider)

See merge request !923
```
  fd45cab9
- Merge branch 'feature/697-language-tag-metadata' into 'develop' · ff929083
  lain authored Apr 08, 2019
```
adding language tag

See merge request !1034
```
  ff929083
- adding language tag · 36c0a10f
  Alexander Strizhakov authored Apr 08, 2019 and lain committed Apr 08, 2019
  
  36c0a10f
- Merge branch 'feature/770-add-emoji-tags' into 'develop' · 23067908
  lain authored Apr 08, 2019
```
Feature/770 add emoji tags

See merge request !998
```
  23067908
- Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush · c3d5c351
  minibikini authored Apr 08, 2019
  
  c3d5c351
- AdminApiControllerTest unused variables fix. · 44829d91
  Ivan Tashkinov authored Apr 08, 2019
  
  44829d91
- Merge branch 'develop' into use-jobs-in-webpush · a1a85464
  minibikini authored Apr 08, 2019
  
  a1a85464
- [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth · bffddf5e
  Ivan Tashkinov authored Apr 08, 2019
```
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
```
  bffddf5e
- Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' · b4da2bc1
  lain authored Apr 08, 2019
```
# Conflicts:
#   config/config.exs
#   docs/config.md
```
  b4da2bc1
- Merge branch 'scheduled-activities' into 'develop' · b177e1e7
  lain authored Apr 08, 2019
```
Scheduled activities

See merge request !989
```
  b177e1e7
07 Apr, 2019 1 commit
- [#923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. · e3328bc1
  Ivan Tashkinov authored Apr 07, 2019
  
  e3328bc1
06 Apr, 2019 10 commits
- Merge branch 'fix/deactivated-user-error' into 'develop' · fb2040d0
  feld authored Apr 06, 2019
```
Return 403 for deactivated user on token request

Closes #785

See merge request !1031
```
  fb2040d0
- Add scheduler for sending scheduled activities to the queue · 2056efa7
  Eugenij authored Apr 03, 2019
  
  2056efa7
- Added limits and media attachments for scheduled activities. · fc92a0fd
  Eugenij authored Apr 02, 2019
  
  fc92a0fd
- Handle `scheduled_at` on status creation. · b3870df5
  Eugenij authored Mar 30, 2019
  
  b3870df5
- Add scheduled activities · 7bf622ce
  Eugenij authored Mar 28, 2019
  
  7bf622ce
- Return 403 on oauth token exchange for a deactivated user · 7aa53d52
  Eugenij authored Apr 06, 2019
  
  7aa53d52
- Merge branch 'fix/failed-legacy-test' into 'develop' · 876965a7
  feld authored Apr 06, 2019
```
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request !1030
```
  876965a7
- Merge branch 'feature/prometheus' into 'develop' · 9aeac7dc
  feld authored Apr 06, 2019
```
Upstream: Metrics and debugging

See merge request !1020
```
  9aeac7dc
- Pin recon dependency to 2.4.0 · b395aebf
  feld authored Apr 06, 2019
  
  b395aebf
- Merge develop to 770-add-emoji-tags · 7410aee8
  Alexander Strizhakov authored Apr 06, 2019
```
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
```
  7410aee8
05 Apr, 2019 7 commits
- Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' · 3c5daa02
  Haelwenn authored Apr 05, 2019
```
Redirect to the referer url after mastofe authorization

Closes #717

See merge request !1025
```
  3c5daa02
- Redirect to the referer url after mastofe authorization · 325a2680
  Sergey Suprunenko authored Apr 05, 2019 and Haelwenn committed Apr 05, 2019
  
  325a2680
- Mock :crypt.crypt/2 because otherwise the test fails on Mac OS · e9c075d0
  Sergey Suprunenko authored Apr 05, 2019
  
  e9c075d0
- Merge branch 'revert-8607ae68' into 'develop' · e3ca9f70
  rinpatch authored Apr 05, 2019
```
Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028
```
  e3ca9f70
- Revert "Merge branch 'test-coverage' into 'develop'" · e5df8cad
  rinpatch authored Apr 05, 2019
```
This reverts merge request !1027
```
  e5df8cad
- Merge branch 'test-coverage' into 'develop' · 8607ae68
  rinpatch authored Apr 05, 2019
```
Use --cover option when running CI tests

See merge request !1027
```
  8607ae68
- Use --cover option when running CI tests · fb1be1d7
  optikfluffel authored Apr 05, 2019
  
  fb1be1d7