pleroma/config
Henry Jameson a9eb20e2db Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (24 commits)
  MastoAPI followers/following endpoints
  Switch the CI to Elixir 1.8.1
  Linting.
  WebPush: Add activity id to the push messages.
  MastoAPI Accounts: Add fetching by nickname.
  Update Differences-in-MastodonAPI-Responses.md
  Remove chromium input hilight that clashes with our own
  Style again the login page to fit pleroma more
  MastoAPI StatusView: Add locality indicator.
  Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
  Change order of source code to align with platforms
  Update homepages and provide source code links for Roma apps in Clients.md
  Rename Mastalab -> Fedilab in Clients.md
  http: connection: unify adapter configuration and defaults
  http: connection: relax the timeouts a little
  http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
  http: actually pass the options list to the Connection factory
  http: connection: merge hackney option lists instead of concatenating them
  http: safely catch erlang exits and elixir errors from hackney (ref #672)
  Allow an admin to delete a user status
  ...
2019-03-12 21:50:45 +02:00
..
config.exs Merge remote-tracking branch 'origin/develop' into shigusegubu 2019-03-12 21:50:45 +02:00
custom_emoji.txt customs 2018-08-04 18:23:11 +02:00
dev.exs config/dev.exs: Don’t put secure cookies on dev 2019-02-12 21:50:47 +01:00
emoji.txt customs 2018-08-04 18:23:11 +02:00
prod.exs [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
test.exs [#647] tests for web push 2019-03-06 13:20:12 +00:00