Commits · d5a13c10ac6a9a5f8dbb1932ffc85260f079a2dc · Pleroma / pleroma

09 Dec, 2017 1 commit
- Merge branch 'feature/user_deletion' into develop · d5a13c10
  lain authored Dec 09, 2017
  
  d5a13c10
08 Dec, 2017 5 commits
- Delete notifications on activity deletion. · ef2322bd
  lain authored Dec 08, 2017
  
  ef2322bd
- Basic user deletion. · bad499b3
  lain authored Dec 08, 2017
  
  bad499b3
- Merge branch 'fix/linkify' into 'develop' · 35cfbf43
  lain authored Dec 08, 2017
```
Fix links with HTML elements and/or parentheses.

See merge request !38
```
  35cfbf43
- Merge branch 'fix/mastoapi-attachment-linking' into 'develop' · 40c30ab8
  lain authored Dec 08, 2017
```
MastoAPI: don't add attachment links.

Closes #92

See merge request !37
```
  40c30ab8
- Merge branch 'postgresetup' into 'develop' · d7da3ca0
  lain authored Dec 08, 2017
```
first version of safe DB setup

See merge request !32
```
  d7da3ca0
07 Dec, 2017 8 commits
- Allow parentheses in links. · a3e68f02
  eal authored Dec 07, 2017
  
  a3e68f02
- Fix HTML escape breaking some links. · bf91e565
  eal authored Dec 07, 2017
  
  bf91e565
- MastoAPI: don't add attachment links. · 5436dbae
  eal authored Dec 07, 2017
  
  5436dbae
- Add websocket upgrade to example nginx config. · afd0ea37
  eal authored Dec 07, 2017
  
  afd0ea37
- User deletion: Remove relationships. · 6df6ad0b
  lain authored Dec 07, 2017
  
  6df6ad0b
- Don't follow deactivated users. · a78ae2a6
  lain authored Dec 07, 2017
  
  a78ae2a6
- Add function to deactivate users. · b727ecc5
  lain authored Dec 07, 2017
  
  b727ecc5
- Don't log in deactivated users. · 0ec5aeb8
  lain authored Dec 07, 2017
  
  0ec5aeb8
06 Dec, 2017 1 commit
- Priority queue fixes. · e31a5ff4
  lain authored Dec 06, 2017
  
  e31a5ff4
05 Dec, 2017 9 commits
- Add basic queue prioritization. · 66c3813e
  lain authored Dec 05, 2017
  
  66c3813e
- Merge branch 'feature/chat' into 'develop' · 08e7e249
  lain authored Dec 05, 2017
```
Feature/chat

See merge request !36
```
  08e7e249
- Fix tests. · e7c2472a
  lain authored Dec 05, 2017
  
  e7c2472a
- Update frontend. · 74e92152
  lain authored Dec 05, 2017
  
  74e92152
- Update frontend. · b652dc5f
  lain authored Dec 05, 2017
  
  b652dc5f
- Merge remote-tracking branch 'origin/develop' into feature/chat · 1c90bfb4
  lain authored Dec 05, 2017
  
  1c90bfb4
- Merge branch 'fix/odd-passwords' into 'develop' · 7f336cb8
  lain authored Dec 05, 2017
```
Fix basic auth for passwords with a colon.

See merge request !35
```
  7f336cb8
- Don't save user in socket, just save the name. · 5945ec84
  lain authored Dec 05, 2017
  
  5945ec84
- Add basic channel state. · 69f1024b
  lain authored Dec 05, 2017
  
  69f1024b
04 Dec, 2017 9 commits
- Fix basic auth for passwords with a colon. · c1fa1e88
  eal authored Dec 04, 2017
  
  c1fa1e88
- Update frontend. · d01243c1
  lain authored Dec 04, 2017
  
  d01243c1
- Basic backend chat. · 5c409861
  lain authored Dec 04, 2017
  
  5c409861
- unfuck · 964e2dd2
  HJ authored Dec 04, 2017
  
  964e2dd2
- made psql script compatible with migrations or generate_config reruns · 6b60f5f6
  HJ authored Dec 04, 2017
  
  6b60f5f6
- reverts config gen · 071f5180
  HJ authored Dec 04, 2017
  
  071f5180
- fix · a884e082
  HJ authored Nov 28, 2017
  
  a884e082
- fixes · 40714031
  HJ authored Nov 28, 2017
  
  40714031
- first version of safe DB setup · 0673511d
  HJ authored Nov 26, 2017
  
  0673511d
03 Dec, 2017 1 commit
- OStatus: Add user bio as summary field · d08a34e8
  lain authored Dec 03, 2017
```
Fixes problem with bio federation.
```
  d08a34e8
30 Nov, 2017 2 commits
- Add count index for local users. · 50dca016
  lain authored Nov 30, 2017
  
  50dca016
- MastodonAPI: Add proper user count. · 5637d163
  lain authored Nov 30, 2017
  
  5637d163
28 Nov, 2017 2 commits
- Merge branch 'salmon-native-keys' into 'develop' · 9d1c0ec1
  lain authored Nov 28, 2017
```
Salmon: generate private key with native crypto if available.

See merge request !33
```
  9d1c0ec1
- Salmon: generate private key with native crypto if available. · 4524721f
  href authored Nov 28, 2017
  
  4524721f
27 Nov, 2017 1 commit
- Return xml notice at /notice path. · c680ae58
  lain authored Nov 27, 2017
  
  c680ae58
25 Nov, 2017 1 commit
- Merge branch 'patch-1' into 'develop' · 89a8dc74
  eal authored Nov 25, 2017
```
fix mix typo in README.md

See merge request !31
```
  89a8dc74