Commits · 44829d91818e66da1cbeb13aafecc52a931af17d · jeff / pleroma

Apr 08, 2019
- AdminApiControllerTest unused variables fix. · 44829d91
  Ivan Tashkinov authored 6 years ago
  
  44829d91
- [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth · bffddf5e
  Ivan Tashkinov authored 6 years ago
  
  # Conflicts: # docs/config.md # test/support/factory.ex
  bffddf5e
- Merge branch 'scheduled-activities' into 'develop' · b177e1e7
  lain authored 6 years ago
  
  Scheduled activities See merge request pleroma/pleroma!989
  b177e1e7
Apr 07, 2019
- [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. · e3328bc1
  Ivan Tashkinov authored 6 years ago
  
  e3328bc1
Apr 06, 2019
- Merge branch 'fix/deactivated-user-error' into 'develop' · fb2040d0
  feld authored 6 years ago
  
  Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031
  fb2040d0
- Add scheduler for sending scheduled activities to the queue · 2056efa7
  Eugenij authored 6 years ago
  
  2056efa7
- Added limits and media attachments for scheduled activities. · fc92a0fd
  Eugenij authored 6 years ago
  
  fc92a0fd
- Handle `scheduled_at` on status creation. · b3870df5
  Eugenij authored 6 years ago
  
  b3870df5
- Add scheduled activities · 7bf622ce
  Eugenij authored 6 years ago
  
  7bf622ce
- Return 403 on oauth token exchange for a deactivated user · 7aa53d52
  Eugenij authored 6 years ago
  
  7aa53d52
- Merge branch 'fix/failed-legacy-test' into 'develop' · 876965a7
  feld authored 6 years ago
  
  Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS See merge request pleroma/pleroma!1030
  876965a7
- Merge branch 'feature/prometheus' into 'develop' · 9aeac7dc
  feld authored 6 years ago
  
  Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
  9aeac7dc
- Pin recon dependency to 2.4.0 · b395aebf
  feld authored 6 years ago
  
  b395aebf
Apr 05, 2019
- Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' · 3c5daa02
  Haelwenn authored 6 years ago
  
  Redirect to the referer url after mastofe authorization Closes #717 See merge request pleroma/pleroma!1025
  3c5daa02
- Redirect to the referer url after mastofe authorization · 325a2680
  Sergey Suprunenko authored 6 years ago and Haelwenn committed 6 years ago
  
  325a2680
- Mock :crypt.crypt/2 because otherwise the test fails on Mac OS · e9c075d0
  Sergey Suprunenko authored 6 years ago
  
  e9c075d0
- Merge branch 'revert-8607ae68 ' into 'develop' · e3ca9f70
  rinpatch authored 6 years ago
  
  Revert "Merge branch 'test-coverage' into 'develop'" See merge request pleroma/pleroma!1028
  e3ca9f70
- Revert "Merge branch 'test-coverage' into 'develop'" · e5df8cad
  rinpatch authored 6 years ago
  
  This reverts merge request !1027
  e5df8cad
- Merge branch 'test-coverage' into 'develop' · 8607ae68
  rinpatch authored 6 years ago
  
  Use --cover option when running CI tests See merge request pleroma/pleroma!1027
  8607ae68
- Use --cover option when running CI tests · fb1be1d7
  optikfluffel authored 6 years ago
  
  fb1be1d7
- Merge branch 'feature/admin-api-follow' into 'develop' · 3fb3f42e
  feld authored 6 years ago
  
  Feature/admin api follow See merge request pleroma/pleroma!1026
  3fb3f42e
- We actually want the user id not nickname in the test... · fac76bfa
  feld authored 6 years ago
  
  fac76bfa
- Also remove Repo functions in the tests · c746087f
  feld authored 6 years ago
  
  c746087f
- Redundant Repo.get_by usage was recently removed from the codebase · b5a2d384
  feld authored 6 years ago
  
  b5a2d384
- Document the admin API endpoints for controlling follow/unfollow · da64a5ae
  feld authored 6 years ago
  
  da64a5ae
- Add user following / unfollowing to the admin api. · 7895ee37
  lain authored 6 years ago and feld committed 6 years ago
  
  7895ee37
- Merge branch 'hotfix/html-sanitization' into 'develop' · 54997500
  lain authored 6 years ago
  
  Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi See merge request pleroma/pleroma!1022
  54997500
- Refactor html caching functions to have a key instead of a module, use more... · f0f30019
  rinpatch authored 6 years ago
  
  Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
  f0f30019
- [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. · 47a236f7
  Ivan Tashkinov authored 6 years ago
  
  47a236f7
- [#923] OAuthController#callback adjustments (with tests). · 3e7f2bfc
  Ivan Tashkinov authored 6 years ago
  
  3e7f2bfc
Apr 04, 2019
- [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth · 45765918
  Ivan Tashkinov authored 6 years ago
  
  # Conflicts: # mix.exs
  45765918
- Merge branch 'develop' into feature/prometheus · 66e7b033
  feld authored 6 years ago
  
  66e7b033
- Merge branch 'feature/quack' into 'develop' · 9c9eec62
  feld authored 6 years ago
  
  Add ability to ship logs to a Slack channel See merge request pleroma/pleroma!1014
  9c9eec62
- Add ability to ship logs to a Slack channel · 3b12eeda
  feld authored 6 years ago
  
  3b12eeda
- [#923] OAuth consumer controller tests. Misc. improvements. · f7cd9131
  Ivan Tashkinov authored 6 years ago
  
  f7cd9131
- Code readability tweak · 69038887
  feld authored 6 years ago
  
  69038887
- Clean merge crumbs · 7222afe0
  feld authored 6 years ago
  
  7222afe0
- Serve metrics at `/api/pleroma/app_metrics` · 7e930559
  href authored 6 years ago and feld committed 6 years ago
  
  7e930559
- Document Prometheus · 5564cd42
  feld authored 6 years ago
  
  5564cd42
- [#1] fix telemetry · 0b5c818c
  minibikini authored 6 years ago and feld committed 6 years ago
  
  0b5c818c