Commits · develop · Jorin / pleroma

Oct 23, 2018
- Merge branch 'bugfix/html-scrub-comments' into 'develop' · 945ce991
  kaniini authored 6 years ago
  
  html: ensure comments are correctly scrubbed See merge request pleroma/pleroma!384
  945ce991
- Merge branch 'new-frontend-options' into 'develop' · bcae57af
  kaniini authored 6 years ago
  
  New frontend options See merge request pleroma/pleroma!383
  bcae57af
- html: ensure comments are correctly scrubbed · 8613db0e
  kaniini authored 6 years ago
  
  8613db0e
Oct 21, 2018
- Defaults for new frontend options in config.exs · 3e79d941
  scarlett authored 6 years ago
  
  3e79d941
- New frontend options · a253c146
  scarlett authored 6 years ago
  
  a253c146
Oct 20, 2018
- Merge branch 'pleroma-list-belongs' into 'develop' · aaf3fc15
  eal authored 6 years ago
  
  Pleroma list belongs Closes #333 See merge request pleroma/pleroma!382
  aaf3fc15
- Fix some typos in the list test. · 5e9a0e24
  eal authored 6 years ago
  
  5e9a0e24
Oct 19, 2018
- Add a test for List.get_lists_account_belongs · a249cbf1
  h3poteto authored 6 years ago
  
  a249cbf1
Oct 18, 2018
- Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs · e8c698af
  h3poteto authored 6 years ago
  
  e8c698af
- Merge branch 'bugfix/html-scrub-schemes' into 'develop' · ad318189
  kaniini authored 6 years ago
  
  lib/pleroma/html.ex: Fix scheme lists See merge request pleroma/pleroma!377
  ad318189
- html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility · 595d855f
  kaniini authored 6 years ago
  
  595d855f
- lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes · 2154c5dc
  Haelwenn authored 6 years ago
  
  Verified
  
  2154c5dc
Oct 17, 2018
- Merge branch 'bugfix/osada-mention' into 'develop' · 60980702
  kaniini authored 6 years ago
  
  fix osada mentions Closes #324 See merge request pleroma/pleroma!380
  60980702
- tests: add a testcase for matching osada users in the formatter · 958c5e02
  kaniini authored 6 years ago
  
  958c5e02
- formatter: fix matching osada users · 582dbe5c
  kaniini authored 6 years ago
  
  582dbe5c
- Merge branch 'import-maybe-direct-follow' into 'develop' · c7140c67
  Haelwenn authored 6 years ago
  
  Use maybe_direct_follow for follow imports See merge request pleroma/pleroma!378
  c7140c67
- Use maybe_direct_follow for follow imports · 7562912f
  scarlett authored 6 years ago
  
  7562912f
Oct 16, 2018
- lib/pleroma/html.ex: Use a function as a variable (broken for some reason) · d7654c77
  Haelwenn authored 6 years ago
  
  Verified
  
  d7654c77
- lib/pleroma/html.ex: Fix scheme lists · 50e0a9ae
  Haelwenn authored 6 years ago
  
  Gosh please don’t break ourselves… Also this is copy-paste of the list in lib/pleroma/formatter.ex, I think this should be put in a common variable, but where?
  Verified
  
  50e0a9ae
Oct 14, 2018
- Merge branch 'feature/markdown-enable-tags' into 'develop' · c93571b8
  kaniini authored 6 years ago
  
  common api: enable tag linking in markdown mode Closes #322 See merge request pleroma/pleroma!376
  c93571b8
- common api: enable tag linking in markdown mode · 30efa86c
  kaniini authored 6 years ago
  
  30efa86c
- Merge branch 'security/clear-oauth-with-password' into 'develop' · e0c03558
  kaniini authored 6 years ago
  
  Delete Tokens and Authorizations on password change Closes #320 See merge request pleroma/pleroma!375
  e0c03558
- Delete Tokens and Authorizations on password change · eacab0fb
  Haelwenn authored 6 years ago
  
  Closes: pleroma/pleroma#320
  Verified
  
  eacab0fb
Oct 11, 2018
- Merge branch 'security/fix-local-locked-accounts' into 'develop' · 117e0054
  kaniini authored 6 years ago
  
  security: fix local locked accounts Closes #316 See merge request pleroma/pleroma!372
  117e0054
- user: break out local cases for maybe_direct_follow · 51eaece3
  kaniini authored 6 years ago
  
  51eaece3
- test: add regression test for #316 · ebc32045
  kaniini authored 6 years ago
  
  ebc32045
- user: local users are always AP-enabled (closes #316) · 2c29329d
  kaniini authored 6 years ago
  
  2c29329d
Oct 10, 2018
- Merge branch 'bugfix/length-enforce-subjects' into 'develop' · 3a77336d
  kaniini authored 6 years ago
  
  common api: take the combination of the subject and content for length limit enforcement Closes #315 See merge request pleroma/pleroma!371
  3a77336d
- common api: take the combination of the subject and content for length limit enforcement · 111841ad
  kaniini authored 6 years ago
  
  closes #315
  111841ad
Oct 07, 2018
- Merge branch 'feature/mrf-transparency-opt-out' into 'develop' · 5294b11e
  Haelwenn authored 6 years ago
  
  nodeinfo: allow opting out of MRF transparency See merge request pleroma/pleroma!370
  5294b11e
- nodeinfo: allow opting out of MRF transparency · 08d5ad71
  kaniini authored 6 years ago
  
  08d5ad71
- Merge branch 'security/follow-always-async' into 'develop' · 4a3a4607
  kaniini authored 6 years ago
  
  AP follows must be always async (closes #306) Closes #306 See merge request pleroma/pleroma!368
  4a3a4607
- Merge branch 'patch-2' into 'develop' · b638cc50
  kaniini authored 6 years ago
  
  Relax form-action content security policy in sample nginx config See merge request pleroma/pleroma!364
  b638cc50
- Merge branch 'update-pleroma-frontend' into 'develop' · a15eac05
  kaniini authored 6 years ago
  
  update-pleroma-frontend See merge request pleroma/pleroma!369
  a15eac05
- {mastodon api, twitter api}: make the follow handshake timeout configurable · 7b3fff9a
  kaniini authored 6 years ago
  
  7b3fff9a
- update-pleroma-frontend · be7bb90b
  hakabahitoyo authored 6 years ago
  
  be7bb90b
Oct 05, 2018
- mastodon api: relationship view: better handle no pre-existing follow activity · 7f530f6f
  kaniini authored 6 years ago
  
  7f530f6f
- user: add wait_and_refresh() for async three-way handshake case · e69faf55
  kaniini authored 6 years ago
  
  e69faf55
- mastodon api: account view: fetch follow state and use it to populate `requested` field · 3e751496
  kaniini authored 6 years ago
  
  3e751496
- activitypub: always track following state for async reasons · a71b8220
  kaniini authored 6 years ago
  
  a71b8220