Commits · c026128325e5dd44d8660fc99415befc581dd6a9 · Alex Gleason / pleroma

Feb 29, 2020
- deps: update cachex to 3.2.0 · c0261283
  rinpatch authored 5 years ago
  
  c0261283
- Merge branch 'descriptions-changes' into 'develop' · 5db2fb3c
  Haelwenn authored 5 years ago
  
  Adding streamer group & Oban crontab child to descriptions.exs Closes #1592 See merge request pleroma/pleroma!2258
  5db2fb3c
- streamer group & Oban crontab child · 04b03e47
  Alexander Strizhakov authored 5 years ago
  
  04b03e47
Feb 28, 2020
- Merge branch 'update/pleroma-fe-20200228' into 'develop' · aad057a2
  feld authored 5 years ago
  
  Update PleromaFE bundle for the 2.0 release See merge request pleroma/pleroma!2255
  aad057a2
- Merge branch 'develop' into update/pleroma-fe-20200228 · bdd603e9
  feld authored 5 years ago
  
  bdd603e9
- Update PleromaFE bundle for the 2.0 release · c28de939
  feld authored 5 years ago
  
  c28de939
- Merge branch 'update/admin-fe-20200228' into 'develop' · d075bdc9
  feld authored 5 years ago
  
  Update AdminFE build See merge request pleroma/pleroma!2254
  d075bdc9
- Update AdminFE build · 3d24a091
  feld authored 5 years ago
  
  - Removed Grouped Reports; API needs proper architecture/refactor - Cannot set Tesla adapter in AdminFE as it's not safe yet - Layout/rendering improvements
  3d24a091
- Merge branch 'filtered-params' into 'develop' · e892a7eb
  Haelwenn authored 5 years ago
  
  add confirm field to filtered params See merge request pleroma/pleroma!2251
  e892a7eb
- add confirm field to filtered params · fabcd82f
  Steven Fuchs authored 5 years ago and Haelwenn committed 5 years ago
  
  fabcd82f
Feb 27, 2020

Merge branch 'descriptions-changes' into 'develop' · 457a653f
feld authored 5 years ago
```
Removing unnecessary groups from descriptions.exs

See merge request pleroma/pleroma!2247
```
457a653f

Merge branch 'admin-status-list' into 'develop' · f2216287

feld authored 5 years ago

Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192

f2216287

Merge branch 'exclude-boosts-admin-api' into 'develop' · ab0aa04e

feld authored 5 years ago

Admin API: filter out boosts from recent statuses

Closes #1589

See merge request pleroma/pleroma!2248

ab0aa04e

Feb 26, 2020
- Admin API: Exclude boosts from `GET... · 4ab07cf0
  Eugenij authored 5 years ago
  
  Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
  4ab07cf0
- Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts... · e2a6a403
  Eugenij authored 5 years ago
  
  Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
  e2a6a403
- unnecessary groups · 2076c9f8
  Alexander Strizhakov authored 5 years ago
  
  2076c9f8
- Merge branch 'feat/instance-gen-improvements' into 'develop' · fda6f35a
  lain authored 5 years ago
  
  small instance.gen task improvements See merge request pleroma/pleroma!2245
  fda6f35a
Feb 25, 2020
- instance.gen task: make example instance name less confusing · 3bbfebd1
  rinpatch authored 5 years ago
  
  See pleroma/pleroma!2245 (comment 52217)
  3bbfebd1
- instance.gen task: remind to transfer the config to the database after · 359faa86
  rinpatch authored 5 years ago
  
  migrations
  359faa86
- instance.gen task: make instance name default to the domain · cfa28dee
  rinpatch authored 5 years ago
  
  cfa28dee
- Merge branch 'fix/dialyzer-warnings' into 'develop' · 8b4d1a0b
  rinpatch authored 5 years ago
  
  Fix Dialyzer warnings See merge request pleroma/pleroma!2242
  8b4d1a0b
- Merge branch 'merge/admin-fe-20200225' into 'develop' · 2cd253f6
  feld authored 5 years ago
  
  Update AdminFE build See merge request pleroma/pleroma!2244
  2cd253f6
- Update AdminFE build · 554bc88e
  feld authored 5 years ago
  
  554bc88e
- Merge branch 'token-web-push-test' into 'develop' · 97dae772
  feld authored 5 years ago
  
  Add a test to ensure OAuth tokens are tied to Push subscriptions Closes #1551 See merge request pleroma/pleroma!2241
  97dae772
- Fix Dialyzer warnings · 22018ada
  minibikini authored 5 years ago
  
  22018ada
- Add a test to ensure OAuth tokens are tied to Push subscriptions · c495e6d3
  minibikini authored 5 years ago
  
  c495e6d3
- Merge branch 'test-fix' into 'develop' · 87e8d792
  lain authored 5 years ago
  
  Compile fix in tests See merge request pleroma/pleroma!2239
  87e8d792
- compile fix · 3eccdd15
  Alexander Strizhakov authored 5 years ago
  
  3eccdd15
Feb 24, 2020
- Merge branch 'fix/instance-gen-custom-static' into 'develop' · 035c2c14
  rinpatch authored 5 years ago
  
  instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237
  035c2c14
- instance.gen task: fix crash when using custom static directory · 5e4fe0e8
  rinpatch authored 5 years ago
  
  Closes #1082
  5e4fe0e8
- Merge branch 'status-visibility-count-stats' into 'develop' · 908b6ee4
  Haelwenn authored 5 years ago
  
  Status count by visibility scope (`GET /api/pleroma/admin/stats` ) See merge request pleroma/pleroma!2097
  908b6ee4
- Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope · 7ad5c51f
  Eugenij authored 5 years ago
  
  7ad5c51f
- Merge branch 'theming_your_instance' into 'develop' · d240ce41
  lain authored 5 years ago
  
  DOCS Theming your instance See merge request pleroma/pleroma!2232
  d240ce41
- DOCS Theming your instance · c0146f48
  Ilja authored 5 years ago and lain committed 5 years ago
  
  I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance
  c0146f48
- Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' · 81f29e7c
  lain authored 5 years ago
  
  Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236
  81f29e7c
- Merge branch '1505-threads-federation' into 'develop' · 1e1156b6
  Haelwenn authored 5 years ago
  
  [#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
  1e1156b6
- Captcha: return invalid when answer_data is nil · f9fe6a9e
  Haelwenn authored 5 years ago
  
  f9fe6a9e
- captcha_test.exs: Use the same testing logic in Kocaptcha and native · ee57663d
  Haelwenn authored 5 years ago
  
  ee57663d
Feb 22, 2020
- Merge branch 'fix/missing-config-settings' into 'develop' · 1961a680
  feld authored 5 years ago
  
  Add missing invites_enabled and account_activation_required settings See merge request pleroma/pleroma!2234
  1961a680
- Add missing invites_enabled and account_activation_required settings · 9fe60c3b
  feld authored 5 years ago
  
  9fe60c3b