Commits · 9c4344e16cb77092d86b185b816eea705a6dc664 · jeff / pleroma

Dec 18, 2018
- update frontend · 9c4344e1
  lain authored 6 years ago
  
  9c4344e1
- Merge branch 'runtime-static-plug' into 'develop' · b6ae412f
  lain authored 6 years ago
  
  Instance/Runtime static plug See merge request pleroma/pleroma!567
  b6ae412f
Dec 17, 2018
- Instance/Static runtime plug · b1860fe8
  href authored 6 years ago
  
  This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.
  Verified
  
  b1860fe8
- Merge branch '2018-12-17-update-frontend' into 'develop' · 3879500c
  lain authored 6 years ago
  
  2018 12 17 update frontend See merge request pleroma/pleroma!565
  3879500c
- Merge branch 'fix-test' into 'develop' · 7d9254fb
  lain authored 6 years ago
  
  Fix uploads test. See merge request pleroma/pleroma!564
  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
  
  Fix update_profile failing due to OAuth token record in assigns instead of string Closes #459 See merge request pleroma/pleroma!561
  3d980daa
- update frontend · 3e1816fc
  lain authored 6 years ago
  
  3e1816fc
- Merge branch 'support/issue_449' into 'develop' · ebbe11f3
  lain authored 6 years ago
  
  [#449] fix text field See merge request pleroma/pleroma!563
  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
  
  Captcha See merge request pleroma/pleroma!550
  52ac7dce
- Merge branch 'fix-tags' into 'develop' · c6d5f189
  lain authored 6 years ago
  
  Fix tagging problems for existing instances. See merge request pleroma/pleroma!562
  c6d5f189
- Merge branch 'test-mix-tasks' into 'develop' · 98c31dea
  lain authored 6 years ago
  
  Add tests for Mix tasks See merge request pleroma/pleroma!555
  98c31dea
- Merge branch 'phoenix14' into 'develop' · 078b8b6d
  lain authored 6 years ago
  
  Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
  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
  
  Verified
  
  ba9ef77b
- Integration tests for mastodon websocket · b12a9049
  href authored 6 years ago
  
  Verified
  
  b12a9049
- Cowboy handler for Mastodon WebSocket · 77b5154c
  href authored 6 years ago
  
  Verified
  
  77b5154c
- Support both OAuth token record and token string in UserView · cc878804
  raeno authored 6 years ago
  
  cc878804
- Merge branch 'testfix/webfinger-jrd' into 'develop' · 56735979
  lain authored 6 years ago
  
  WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554
  56735979
- minutes->seconds_retained in config.md · 6e2f64a0
  vaartis authored 6 years ago
  
  6e2f64a0
Dec 16, 2018
- Clean captchas up periodically, not schedule it after theyre created · ef682938
  vaartis authored 6 years ago
  
  ef682938
- Fix captcha tests · 73576ab6
  vaartis authored 6 years ago
  
  73576ab6
- Change minutes_retained config to seconds_retained · 3a31fdaf
  vaartis authored 6 years ago
  
  3a31fdaf
- Make the hosted kocaptcha the default value · 1d31fd07
  vaartis authored 6 years ago
  
  1d31fd07
- Add a configurable auto-cleanup for captchas · 6062885d
  vaartis authored 6 years ago
  
  6062885d
- More put_view. · 5dcb7aec
  href authored 6 years ago
  
  Verified
  
  5dcb7aec
- Use bindings dbuser and dbname in sample_psql.eex · 22d483d4
  link0ff authored 6 years ago
  
  22d483d4
- Upgrade to Phoenix 1.4 · f672555a
  href authored 6 years ago
  
  Verified
  
  f672555a
- Add more Mix task tests in relay_test.exs and uploads_test.exs. · 7c235b88
  link0ff authored 6 years ago
  
  Rename test/tasks/user.exs to test/tasks/user_test.exs.
  7c235b88
- Merge branch 'netbsd-script' into 'develop' · 8fadc1b6
  scarlett authored 6 years ago
  
  Add an rc.d script for NetBSD. See merge request pleroma/pleroma!558
  8fadc1b6
- Simplify the NetBSD rc script. · 4b40e418
  scarlett authored 6 years ago
  
  4b40e418
- Add an rc.d script for NetBSD. · 9d3eda19
  scarlett authored 6 years ago
  
  9d3eda19
- Merge branch 'develop' into 'develop' · 41e3401c
  Haelwenn authored 6 years ago
  
  Added init file for OpenBSD See merge request pleroma/pleroma!549
  41e3401c
- Merge branch 'fix/masto-put-settings' into 'develop' · 28478a9c
  eal authored 6 years ago
  
  Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557
  28478a9c
- Mastodon API: Fix PUT /api/web/settings · 4c783e35
  eal authored 6 years ago
  
  4c783e35