Commits · fda148a9a2732c717b3c900455811ceca5253f5c · jeff / pleroma

Dec 20, 2018
- Merge branch 'documentation/copy-pleroma-api' into 'develop' · fda148a9
  kaniini authored 6 years ago
  fda148a9
Dec 19, 2018
- Merge branch 'userless-admin' into 'develop' · f98ee940
  kaniini authored 6 years ago
  f98ee940
Dec 18, 2018
- Merge branch 'fix/ci-cache-improved' into 'develop' · a3da8a56
  lain authored 6 years ago
  a3da8a56
- Merge branch 'fix/formatter-ignore-html-chars' into 'develop' · b7f63501
  lain authored 6 years ago
  b7f63501
- Compile pleroma before ecto migrate · facd30c9
  Rin Toshaka authored 6 years ago
  
  facd30c9
- Add a way to use the admin api without a user. · f3eb414e
  lain authored 6 years ago
  
  f3eb414e
- Improve CI cache · f685351c
  Rin Toshaka authored 6 years ago
  
  f685351c
- Fix tests · 196d9c0f
  Rin Toshaka authored 6 years ago
  
  196d9c0f
- Add test · 8a67677d
  rinpatch authored 6 years ago
  
  8a67677d
- Merge branch 'develop' into fix/formatter-ignore-html-chars · ef318fb8
  rinpatch authored 6 years ago
  
  ef318fb8
- Ignore HTML characters in formatter.ex · 059dd6f6
  rinpatch authored 6 years ago
  
  059dd6f6
- Pleroma-API.md: Additionnal endpoints · d6b133ec
  rinpatch authored 6 years ago and Haelwenn committed 6 years ago
  
  d6b133ec
- Move to docs · 6adea5a7
  Haelwenn authored 6 years ago
  
  6adea5a7
- Documentation: Move generated files to priv/static/doc, add it to endpoint.ex · a6dfe1fc
  Haelwenn authored 6 years ago
  
  a6dfe1fc
- Merge branch 'feature/new-user-routes' into 'develop' · 443d59ba
  lain authored 6 years ago
  443d59ba
- Merge branch 'new-routes-integration' into 'develop' · c9ddcd80
  lain authored 6 years ago
  c9ddcd80
- update frontend · 9c4344e1
  lain authored 6 years ago
  
  9c4344e1
- Merge branch 'ci-test-fix' into 'develop' · 5177426e
  lain authored 6 years ago
  5177426e
- Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints · 08b6294f
  Haelwenn authored 6 years ago
  
  08b6294f
- SetUserSessionIdPlugTest: try to fix random ci failures · daaa8cd6
  href authored 6 years ago
  
  daaa8cd6
- Merge branch 'runtime-static-plug' into 'develop' · b6ae412f
  lain authored 6 years ago
  b6ae412f
Dec 17, 2018
- Instance/Static runtime plug · b1860fe8
  href authored 6 years ago
  b1860fe8
- Merge branch '2018-12-17-update-frontend' into 'develop' · 3879500c
  lain authored 6 years ago
  3879500c
- Merge branch 'fix-test' into 'develop' · 7d9254fb
  lain authored 6 years ago
  7d9254fb
- Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend · eb2d34eb
  lain authored 6 years ago
  
  eb2d34eb
- Merge branch '459_fix_user_profile_crash' into 'develop' · 3d980daa
  lain authored 6 years ago
  3d980daa
- update frontend · 3e1816fc
  lain authored 6 years ago
  
  3e1816fc
- Merge branch 'support/issue_449' into 'develop' · ebbe11f3
  lain authored 6 years ago
  ebbe11f3
- Fix uploads test. · 52bda3b4
  lain authored 6 years ago
  
  52bda3b4
- fix text field · 92a5133c
  Maksim authored 6 years ago
  
  92a5133c
- Merge branch 'captcha' into 'develop' · 52ac7dce
  lain authored 6 years ago
  52ac7dce
- Merge branch 'fix-tags' into 'develop' · c6d5f189
  lain authored 6 years ago
  c6d5f189
- Merge branch 'test-mix-tasks' into 'develop' · 98c31dea
  lain authored 6 years ago
  98c31dea
- Merge branch 'phoenix14' into 'develop' · 078b8b6d
  lain authored 6 years ago
  078b8b6d
- don't re-use build · 0f67c1d4
  lain authored 6 years ago
  
  0f67c1d4
- Fix tagging problems for existing instances. · e4763cd4
  lain authored 6 years ago
  
  e4763cd4
- Alias Kocaptcha in the test · de981ac5
  vaartis authored 6 years ago
  
  de981ac5
- Use :ets.match_delete to delete old captchas · 35522fef
  vaartis authored 6 years ago and vaartis committed 6 years ago
  
  35522fef
- Switch to phoenixframework/phoenix as the needed change is merged. · ba9ef77b
  href authored 6 years ago
  
  ba9ef77b
- Integration tests for mastodon websocket · b12a9049
  href authored 6 years ago
  
  b12a9049