Commits · ef55d240540ed9fbac76248c60bdb23f82c3f36e · Pleroma / pleroma

07 May, 2020 20 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator · ef55d240
  lain authored May 07, 2020
  
  ef55d240
- Merge branch 'feature/undo-validator-reduced' into 'develop' · bef08b85
  rinpatch authored May 07, 2020
```
Move Undo (except undo follow) to the common pipeline

See merge request !2489
```
  bef08b85
- Merge branch 'openapi/search' into 'develop' · 516ff945
  lain authored May 07, 2020
```
Add OpenAPI spec for SearchController

See merge request !2484
```
  516ff945
- Merge branch 'fix/streamer-wrong-arg-order' into 'develop' · 9f2bb22e
  rinpatch authored May 07, 2020
```
Streamer: Fix wrong argument order when rendering activities to authenticated user

Closes #1747

See merge request !2490
```
  9f2bb22e
- Streamer: Fix wrong argument order when rendering activities to authenticated user · eb1f2fcb
  rinpatch authored May 07, 2020
```
Closes #1747
```
  eb1f2fcb
- Credo fixes · d11eea62
  lain authored May 07, 2020
  
  d11eea62
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator · 7ac0cffb
  lain authored May 07, 2020
  
  7ac0cffb
- Merge fixes. · 788b7e7b
  lain authored May 07, 2020
  
  788b7e7b
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced · cda410ad
  lain authored May 07, 2020
  
  cda410ad
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced · f0c22df2
  lain authored May 07, 2020
  
  f0c22df2
- Merge branch 'fix/downgraded-deps' into 'develop' · b7635bf2
  rinpatch authored May 07, 2020
```
Restore mix.lock after 2FA merge

See merge request !2487
```
  b7635bf2
- Restore mix.lock after 2FA merge · 9c3c142c
  rinpatch authored May 07, 2020
```
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
```
  9c3c142c
- Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex · 3f867d8e
  lain authored May 07, 2020
  
  3f867d8e
- Add OpenAPI spec for SearchController · dc4a448f
  minibikini authored May 07, 2020
  
  dc4a448f
- Add schema for Tag · cdca62e8
  minibikini authored May 06, 2020
  
  cdca62e8
- Merge branch 'openapi/polls' into 'develop' · 4c92dfb7
  lain authored May 07, 2020
```
Add OpenAPI spec for PollController

See merge request !2476
```
  4c92dfb7
- Merge branch 'streamer-worker-registry' into 'develop' · 40618418
  lain authored May 07, 2020
```
Streamer rework

See merge request !2426
```
  40618418
- Streamer rework · 9491ba3e
  href authored May 07, 2020 and lain committed May 07, 2020
  
  9491ba3e
- Merge branch 'issue/209' into 'develop' · f4c2bf09
  lain authored May 07, 2020
```
[#209] 2FA/two_factor_authentication support

See merge request pleroma/pleroma!801
```
  f4c2bf09
- Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController ->... · 3d0c567f
  Maksim authored May 07, 2020 and lain committed May 07, 2020
```
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
```
  3d0c567f
06 May, 2020 20 commits
- Merge branch 'fix/syslog-compile' into 'develop' · 68a12631
  lain authored May 06, 2020
```
Fix for syslog compile with updated rebar3

See merge request !2482
```
  68a12631
- fix for syslog compile with updated rebar3 · 4b00eb93
  Alexander Strizhakov authored May 06, 2020
  
  4b00eb93
- Merge branch 'docs/chat-in-cheatsheet' into 'develop' · a32483f2
  feld authored May 06, 2020
```
Add :chat to cheatsheet

See merge request !2480
```
  a32483f2
- Merge branch 'feature/delete-validator' into 'develop' · 473b0d9f
  rinpatch authored May 06, 2020
```
Move deletions to the common pipeline

Closes #1497

See merge request !2441
```
  473b0d9f
- Add :chat to cheatsheet · d7537a37
  feld authored May 06, 2020
  
  d7537a37
- Merge branch 'fix/apache-cert-chain' into 'develop' · b73b1731
  feld authored May 06, 2020
```
Apache chain issue fix

See merge request !2478
```
  b73b1731
- apache chain issue fix · 3c42caa8
  Alexander Strizhakov authored May 06, 2020
  
  3c42caa8
- Fix description · 06c69c0a
  minibikini authored May 06, 2020
  
  06c69c0a
- Merge branch 'plug-if-unless-func-options-refactoring' into 'develop' · 07e7c80b
  lain authored May 06, 2020
```
Refactoring of :if_func / :unless_func plug options

See merge request !2446
```
  07e7c80b
- Merge branch 'openapi/subscriptions' into 'develop' · a7165432
  lain authored May 06, 2020
```
Add OpenAPI spec for SubscriptionController

See merge request !2444
```
  a7165432
- Merge branch 'openapi/markers' into 'develop' · 61ea8f1f
  lain authored May 06, 2020
```
Add OpenAPI spec for MarkerController

See merge request !2386
```
  61ea8f1f
- Merge branch 'bugfix/sensitive_object' into 'develop' · df846eda
  lain authored May 06, 2020
```
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request !2470
```
  df846eda
- Merge branch 'fix/1726-user-pagination' into 'develop' · c3f1ce80
  lain authored May 06, 2020
```
Pagination fix for service users filters in admin api

Closes #1726

See merge request !2452
```
  c3f1ce80
- Merge branch 'openapi/follow_requests' into 'develop' · 0a88bf6a
  lain authored May 06, 2020
```
Add OpenAPI spec for FollowRequestController

See merge request !2448
```
  0a88bf6a
- Merge branch 'openapi/filters' into 'develop' · 957172a3
  lain authored May 06, 2020
```
Add OpenAPI spec for FilterController

See merge request !2382
```
  957172a3
- Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop' · f84c8f2f
  lain authored May 06, 2020
```
Webfinger: Request account info with the acct scheme

Closes #1728

See merge request !2465
```
  f84c8f2f
- Merge branch 'openapi/instance' into 'develop' · 1ee34d4a
  lain authored May 06, 2020
```
Add OpenAPI spec for InstanceController

See merge request !2450
```
  1ee34d4a
- Merge branch 'openapi/lists' into 'develop' · 7fdc7078
  lain authored May 06, 2020
```
Add OpenAPI spec for ListController

See merge request !2453
```
  7fdc7078
- Merge branch 'openapi/conversations' into 'develop' · 76c1a7a3
  lain authored May 06, 2020
```
Add OpenAPI spec for ConversationController

See merge request !2445
```
  76c1a7a3
- Merge branch 'openapi/scheduled_activities' into 'develop' · 7612d940
  Haelwenn authored May 06, 2020
```
Add OpenAPI spec for ScheduledActivityController

See merge request !2477
```
  7612d940