Commits · 2a744cdff8a94d92683ab1a16f89bb51112006f8 · kaniini / pleroma

Dec 19, 2017
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 2a744cdf
  lain authored 7 years ago
  
  2a744cdf
- Fix timelines in subway tooter. · f1f79c0d
  lain authored 7 years ago
  
  f1f79c0d
Dec 18, 2017
- Merge branch 'fix/twitterapi-follow-lists' into 'develop' · 29c98127
  lain authored 7 years ago
  
  Fix follower/following lists. Closes #29 See merge request pleroma/pleroma!41
  29c98127
- MastoAPI: Fix always-sensitive bugs. · 47887ac8
  lain authored 7 years ago
  
  47887ac8
- Send out salmons before websub. · 846d59a5
  lain authored 7 years ago
  
  846d59a5
- Fix follower/following lists. · 1969773f
  eal authored 7 years ago
  
  Add tests.
  1969773f
- Merge branch 'feature/follow-import' into 'develop' · 6b484892
  lain authored 7 years ago
  
  Add follow import. See merge request pleroma/pleroma!40
  6b484892
Dec 12, 2017
- Run follow import in the background. · fdfb5082
  eal authored 7 years ago
  
  fdfb5082
- Allow uploading a file for follow import. · d89193a8
  eal authored 7 years ago
  
  d89193a8
- Add follow import. · 39ccfdc0
  eal authored 7 years ago
  
  39ccfdc0
Dec 11, 2017
- Fix some more tests. · 92230383
  eal authored 7 years ago
  
  92230383
- Fix tests. · 79b3397c
  eal authored 7 years ago
  
  79b3397c
- Merge branch 'fix/tootdon-mentions' into 'develop' · 4b06e46a
  lain authored 7 years ago
  
  Fix Tootdon linking the whole status when mentioning someone. See merge request pleroma/pleroma!39
  4b06e46a
- Add a bunch of useless HTML to mentions. · b00e2307
  eal authored 7 years ago
  
  b00e2307
Dec 09, 2017
- Merge branch 'feature/user_deletion' into develop · d5a13c10
  lain authored 7 years ago
  
  d5a13c10
Dec 08, 2017
- Delete notifications on activity deletion. · ef2322bd
  lain authored 7 years ago
  
  ef2322bd
- Basic user deletion. · bad499b3
  lain authored 7 years ago
  
  bad499b3
- Merge branch 'fix/linkify' into 'develop' · 35cfbf43
  lain authored 7 years ago
  
  Fix links with HTML elements and/or parentheses. See merge request pleroma/pleroma!38
  35cfbf43
- Merge branch 'fix/mastoapi-attachment-linking' into 'develop' · 40c30ab8
  lain authored 7 years ago
  
  MastoAPI: don't add attachment links. Closes #92 See merge request pleroma/pleroma!37
  40c30ab8
- Merge branch 'postgresetup' into 'develop' · d7da3ca0
  lain authored 7 years ago
  
  first version of safe DB setup See merge request pleroma/pleroma!32
  d7da3ca0
Dec 07, 2017
- Allow parentheses in links. · a3e68f02
  eal authored 7 years ago
  
  a3e68f02
- Fix HTML escape breaking some links. · bf91e565
  eal authored 7 years ago
  
  bf91e565
- MastoAPI: don't add attachment links. · 5436dbae
  eal authored 7 years ago
  
  5436dbae
- Add websocket upgrade to example nginx config. · afd0ea37
  eal authored 7 years ago
  
  afd0ea37
- User deletion: Remove relationships. · 6df6ad0b
  lain authored 7 years ago
  
  6df6ad0b
- Don't follow deactivated users. · a78ae2a6
  lain authored 7 years ago
  
  a78ae2a6
- Add function to deactivate users. · b727ecc5
  lain authored 7 years ago
  
  b727ecc5
- Don't log in deactivated users. · 0ec5aeb8
  lain authored 7 years ago
  
  0ec5aeb8
Dec 06, 2017
- Priority queue fixes. · e31a5ff4
  lain authored 7 years ago
  
  e31a5ff4
Dec 05, 2017
- Add basic queue prioritization. · 66c3813e
  lain authored 7 years ago
  
  66c3813e
- Merge branch 'feature/chat' into 'develop' · 08e7e249
  lain authored 7 years ago
  
  Feature/chat See merge request !36
  08e7e249
- Fix tests. · e7c2472a
  lain authored 7 years ago
  
  e7c2472a
- Update frontend. · 74e92152
  lain authored 7 years ago
  
  74e92152
- Update frontend. · b652dc5f
  lain authored 7 years ago
  
  b652dc5f
- Merge remote-tracking branch 'origin/develop' into feature/chat · 1c90bfb4
  lain authored 7 years ago
  
  1c90bfb4
- Merge branch 'fix/odd-passwords' into 'develop' · 7f336cb8
  lain authored 7 years ago
  
  Fix basic auth for passwords with a colon. See merge request pleroma/pleroma!35
  7f336cb8
- Don't save user in socket, just save the name. · 5945ec84
  lain authored 7 years ago
  
  5945ec84
- Add basic channel state. · 69f1024b
  lain authored 7 years ago
  
  69f1024b
Dec 04, 2017
- Fix basic auth for passwords with a colon. · c1fa1e88
  eal authored 7 years ago
  
  c1fa1e88
- Update frontend. · d01243c1
  lain authored 7 years ago
  
  d01243c1