Commits · 28bfb09b01d324e149e9f36a74db2674a07b07da · normandy / pleroma · GitLab

Snippets Groups Projects

Feb 01, 2019
- Merge branch 'hotfix/object-normalize-cache' into 'develop' · 28bfb09b
  href authored 6 years ago
  28bfb09b
- Merge branch 'streaming-api-url-fix' into 'develop' · ffbf306c
  href authored 6 years ago
  ffbf306c
- object: use cached accesses when possible in Object.normalize() · af10ef8d
  kaniini authored 6 years ago
  
  af10ef8d
- Use url() instead of static_url in Endpoint.websocket_url() · a184811a
  Eugenij authored 6 years ago
  
  a184811a
- Merge branch 'develop' into 'develop' · 7e384a24
  href authored 6 years ago
  7e384a24
- update nodeinfo version when requesting 2.1 · 9cac8729
  luna authored 6 years ago
  
  9cac8729
- Use String.replace_leading instead of String.replace for getting websocket streaming api url. · d747bd98
  Eugenij authored 6 years ago
  d747bd98
- mix format pass · 1cdcee89
  luna authored 6 years ago
  
  1cdcee89
- downcase software name in nodeinfo · 23b1c64a
  luna authored 6 years ago
  
  23b1c64a
- add tests for nodeinfo 2.0 compat and 2.1's new field · e8c7be38
  luna authored 6 years ago
  
  e8c7be38
- Merge branch 'bugfix/get_list_return_404' into 'develop' · 389e6a87
  Haelwenn authored 6 years ago
  389e6a87
- keep compatibility with nodeinfo 2.0 · b17ce875
  luna authored 6 years ago
  b17ce875
- MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list · 74c6119f
  Haelwenn authored 6 years ago
  
  74c6119f
- use Mix.Project.Config for some Application functions · cd6db6ab
  luna authored 6 years ago
  
  cd6db6ab
- Merge branch 'feature/split-hide-network' into 'develop' · 0a82a7e6
  kaniini authored 6 years ago
  0a82a7e6
- Merge branch 'serve-sw-pleroma.js' into 'develop' · fc764479
  lain authored 6 years ago
  fc764479
- Serve sw-pleroma.js properly · fa5ec765
  href authored 6 years ago
  
  fa5ec765
- Merge branch 'fix-rich-media-toggle' into 'develop' · ddab8d45
  lain authored 6 years ago
  ddab8d45
- Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle · 01d483f9
  lain authored 6 years ago
  
  01d483f9
- Merge branch '534_federation_targets_reachability' into 'develop' · b3b08554
  href authored 6 years ago
  b3b08554
- mix format pass · b0c4c082
  luna authored 6 years ago
  
  b0c4c082
- use nodeinfo 2.1, add repository field · c05928db
  luna authored 6 years ago
  c05928db
Jan 31, 2019
- Merge branch 'docs/pleroma-api-invite-token' into 'develop' · 0340fcae
  Haelwenn authored 6 years ago
  0340fcae
- docs/Pleroma-API.md: Add missing token field documentation · a7c55c61
  Haelwenn authored 6 years ago
  a7c55c61
- Remove default value for rich media. · b19b4f85
  lain authored 6 years ago
  b19b4f85
- Merge branch 'user-follow-all-unique' into 'develop' · e914eeb6
  kaniini authored 6 years ago
  e914eeb6
- User.follow_all: ensure its stays unique · 308b35eb
  href authored 6 years ago
  
  308b35eb
- Merge branch 'bugfix/rich-media-non-unicode' into 'develop' · 44913c10
  lain authored 6 years ago
  44913c10
- test: http mocks: formatting · 106475f2
  kaniini authored 6 years ago
  
  106475f2
- Merge branch 'develop' into 'develop' · dea33f4a
  kaniini authored 6 years ago
  dea33f4a
- Merge branch 'fix/rich-media-disable-in-config' into 'develop' · fb973001
  kaniini authored 6 years ago
  fb973001
- test: rich media: parser: add malformed data regression test · 3f5b7845
  kaniini authored 6 years ago
  
  3f5b7845
- rich media: parser: only try to validate strings, not numbers (OEmbed) · 46dba030
  kaniini authored 6 years ago
  
  46dba030
- test: add malformed OGP data fixture · 4e76f9fd
  kaniini authored 6 years ago
  
  4e76f9fd
- rich media: parser: reject OGP fields we cannot safely process · dafb6f0b
  kaniini authored 6 years ago
  
  dafb6f0b
- Make rich media support toggleable · 7057891d
  rinpatch authored 6 years ago
  
  7057891d
- Clarify the description of the `logo_mask` configuration key. · a0dc95d0
  Alice authored 6 years ago
  
  a0dc95d0
- Merge branch 'revert-4d3655c4 ' into 'develop' · bd89cdbe
  lain authored 6 years ago
  bd89cdbe
- Revert "Merge branch 'spc-fix-3' into 'develop'" · a43a1c6d
  lain authored 6 years ago
  a43a1c6d
- Merge branch 'spc-fix-3' into 'develop' · 4d3655c4
  kaniini authored 6 years ago
  4d3655c4