Commits · 4a019827b2a911fc9217e3ec57170e3fb6336600 · normandy / pleroma

Nov 27, 2018
- Revert "Merge branch 'chore/mix-lock-update' into 'develop'" · 4a019827
  kaniini authored 6 years ago
  
  This reverts merge request !480
  4a019827
- Merge branch 'chore/mix-lock-update' into 'develop' · 02e43d44
  kaniini authored 6 years ago
  
  Add ex_doc & makeup_elixir to mix.lock See merge request pleroma/pleroma!480
  02e43d44
- Add ex_doc & makeup_elixir to mix.lock · 0314f04c
  Maxim Filippov authored 6 years ago
  
  0314f04c
- Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop' · 41ff86ca
  kaniini authored 6 years ago
  
  fix: version string: force git abbrev size to 8 chars Closes #389 See merge request pleroma/pleroma!472
  41ff86ca
- Merge branch 'ogg-theora-detection' into 'develop' · b9bc8309
  kaniini authored 6 years ago
  
  Add Theora detection to upload.ex See merge request pleroma/pleroma!479
  b9bc8309
- Fix lint error · 0d229613
  rinpatch authored 6 years ago
  
  0d229613
- Add Theora detection to upload.ex · 7f20a3cf
  rinpatch authored 6 years ago
  
  7f20a3cf
- Merge branch 'feature/mrf-user-allowlist' into 'develop' · 5ae6088d
  Haelwenn authored 6 years ago
  
  MRF: user allowlist module See merge request pleroma/pleroma!477
  5ae6088d
Nov 26, 2018
- Merge branch 'fix/pleromafe-title' into 'develop' · a76058fc
  kaniini authored 6 years ago
  
  Replace hardcoded <title> See merge request pleroma/pleroma!476
  a76058fc
- config: document mrf_user_allowlist · 6979eeda
  kaniini authored 6 years ago
  
  6979eeda
- nodeinfo: add mrf_user_allowlist data · 271f9f13
  kaniini authored 6 years ago
  
  271f9f13
- MRF: add user allowlist module · 8c05d19c
  kaniini authored 6 years ago
  
  8c05d19c
- Replace this hardcoded <title> · 6cc94404
  feld authored 6 years ago
  
  6cc94404
- Merge branch 'bugfix/csp-no-https' into 'develop' · bdb0c6e4
  kaniini authored 6 years ago
  
  Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https See merge request pleroma/pleroma!475
  bdb0c6e4
- Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https · 04daa0fa
  Haelwenn authored 6 years ago
  
  This fixes running mastofe with MIX_ENV=dev
  04daa0fa
- Merge branch 'add-manifest-src-to-csp' into 'develop' · 3370924b
  Haelwenn authored 6 years ago
  
  Add manifest-src to CSP to allow manifest.json See merge request pleroma/pleroma!474
  3370924b
- Add manifest-src to allow manifest.json · 591b11ea
  shibayashi authored 6 years ago
  
  591b11ea
Nov 25, 2018

Merge branch 'bugfix/public-mastoapi-websocket' into 'develop' · 39a3b172

kaniini authored 6 years ago

Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints

See merge request pleroma/pleroma!471

39a3b172

Nov 24, 2018
- version string: force git abbrev size to 8 chars · f70b20e4
  href authored 6 years ago
  
  Fixes #389 Older git versions defaults to 7 chars.
  f70b20e4
- Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket · cc8952b4
  Haelwenn authored 6 years ago
  
  cc8952b4
- Web.Streamer: Get unauthenticated statuses representation · ca029f0b
  Haelwenn authored 6 years ago
  
  ca029f0b
- Web.MastodonAPI.MastodonSocket: Put access_token at function-level · d388a991
  Haelwenn authored 6 years ago
  
  d388a991
- Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints · 5346fabf
  Haelwenn authored 6 years ago
  
  reported by soka on CRTNet
  5346fabf
Nov 22, 2018
- Merge branch 'feature/admin-api' into 'develop' · 675653ce
  kaniini authored 6 years ago
  
  Add a admin API See merge request pleroma/pleroma!366
  675653ce
Nov 21, 2018
- Merge branch 'feature/improve-version' into 'develop' · 182e3e8d
  kaniini authored 6 years ago
  
  Improved version string See merge request pleroma/pleroma!467
  182e3e8d
Nov 20, 2018
- Merge branch 'runtime-fixes' into 'develop' · a591a044
  kaniini authored 6 years ago
  
  Various runtime configuration fixes See merge request pleroma/pleroma!468
  a591a044
- Merge branch 'feature/retry-queue' into 'develop' · c7d08bc1
  Haelwenn authored 6 years ago
  
  Federator: add retry queue. See merge request pleroma/pleroma!323
  c7d08bc1
- Merge branch 'fix/mediaproxy-empty-url' into 'develop' · dbb48365
  kaniini authored 6 years ago
  
  mediaproxy: fix empty url & add some tests See merge request pleroma/pleroma!466
  dbb48365
- Improved version string · bc5cf2c1
  href authored 6 years ago
  
  bc5cf2c1
- mediaproxy: fix empty url & add some tests · 7f4c3a1e
  href authored 6 years ago
  
  7f4c3a1e
Nov 19, 2018
- RetryQueue: tiny refractor, add tests · 689b46ef
  eal authored 6 years ago
  
  689b46ef
- Various runtime configuration fixes · bcecdc3a
  href authored 6 years ago
  
  bcecdc3a
Nov 18, 2018
- Merge branch 'update/pleroma-fe-20181118' into 'develop' · fbc3f289
  kaniini authored 6 years ago
  
  update pleroma frontend See merge request pleroma/pleroma!464
  fbc3f289
- update pleroma frontend · db8f269c
  kaniini authored 6 years ago
  
  db8f269c
- Federator: add retry queue. · 62299be0
  eal authored 6 years ago
  
  62299be0
Nov 17, 2018
- Merge branch 'security/as2-object-render-hardening' into 'develop' · 51435014
  lain authored 6 years ago
  
  activitypub: object view: avoid leaking private details See merge request pleroma/pleroma!463
  51435014
- activitypub: object view: avoid leaking private details · f6be980f
  kaniini authored 6 years ago
  
  f6be980f
- Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop' · b471344b
  lain authored 6 years ago
  
  ostatus controller: respond with AS2 objects instead of activities to notice URIs Closes #289 and #383 See merge request pleroma/pleroma!462
  b471344b
- ostatus controller: respond with AS2 objects instead of activities to notice URIs · 98795172
  kaniini authored 6 years ago
  
  98795172
- Merge branch 'security/spoofing-hardening' into 'develop' · d73c7cc0
  lain authored 6 years ago
  
  security: spoofing hardening Closes #380, #381, and #382 See merge request pleroma/pleroma!461
  d73c7cc0