Commits · aceef36e5675253b32b0be4322b055e98a0154e7 · Pleroma / pleroma

14 Jan, 2018 1 commit
- Correct pleroma.nginx · aceef36e
  Hakaba Hitoyo authored Jan 14, 2018
  
  aceef36e
12 Jan, 2018 2 commits
- Merge branch 'add-mediaproxy-question-to-configgen' into 'develop' · d49109ca
  eal authored Jan 12, 2018
```
added question about activating mediaproxy to config generator

See merge request pleroma/pleroma!44
```
  d49109ca
- Ask for proxy URL if proxy enabled. · d56ab436
  eal authored Jan 12, 2018
```
Also change the true/false question to y/n
```
  d56ab436
09 Jan, 2018 1 commit
- added question about activating mediaproxy to config generator · 29b7e822
  frosch authored Jan 09, 2018
  
  29b7e822
23 Dec, 2017 1 commit
- Unlink follow import process from the one processing request. · 5c09d8d3
  eal authored Dec 23, 2017
```
Mistakes were made.
```
  5c09d8d3
22 Dec, 2017 1 commit
- Merge branch 'media-proxy-fix-encoding' into 'develop' · ad180ad6
  lain authored Dec 22, 2017
```
Remove a useless URI.encode call in MediaProxy

See merge request !42
```
  ad180ad6
21 Dec, 2017 1 commit
- Remove a useless URI.encode call in MediaProxy · 0ccd0e5c
  href authored Dec 21, 2017
  
  0ccd0e5c
20 Dec, 2017 1 commit
- Merge branch 'media-proxy' into 'develop' · 35ac549a
  lain authored Dec 20, 2017
```
Media proxy

See merge request !34
```
  35ac549a
19 Dec, 2017 2 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 2a744cdf
  lain authored Dec 19, 2017
  
  2a744cdf
- Fix timelines in subway tooter. · f1f79c0d
  lain authored Dec 19, 2017
  
  f1f79c0d
18 Dec, 2017 5 commits
- Merge branch 'fix/twitterapi-follow-lists' into 'develop' · 29c98127
  lain authored Dec 18, 2017
```
Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41
```
  29c98127
- MastoAPI: Fix always-sensitive bugs. · 47887ac8
  lain authored Dec 18, 2017
  
  47887ac8
- Send out salmons before websub. · 846d59a5
  lain authored Dec 18, 2017
  
  846d59a5
- Fix follower/following lists. · 1969773f
  eal authored Dec 18, 2017
```
Add tests.
```
  1969773f
- Merge branch 'feature/follow-import' into 'develop' · 6b484892
  lain authored Dec 18, 2017
```
Add follow import.

See merge request pleroma/pleroma!40
```
  6b484892
12 Dec, 2017 5 commits
- Run follow import in the background. · fdfb5082
  eal authored Dec 12, 2017
  
  fdfb5082
- Allow uploading a file for follow import. · d89193a8
  eal authored Dec 12, 2017
  
  d89193a8
- Add follow import. · 39ccfdc0
  eal authored Dec 12, 2017
  
  39ccfdc0
- proxy emojis · f909aec0
  href authored Dec 12, 2017
```
(i fix emojos better than gargon but sshhhhh)
```
  f909aec0
- fix content-type and fallback to image/jpeg · 8e825471
  href authored Dec 12, 2017
  
  8e825471
11 Dec, 2017 7 commits
- Fix some more tests. · 92230383
  eal authored Dec 11, 2017
  
  92230383
- Fix tests. · 79b3397c
  eal authored Dec 11, 2017
  
  79b3397c
- Merge branch 'fix/tootdon-mentions' into 'develop' · 4b06e46a
  lain authored Dec 11, 2017
```
Fix Tootdon linking the whole status when mentioning someone.

See merge request !39
```
  4b06e46a
- Add a bunch of useless HTML to mentions. · b00e2307
  eal authored Dec 11, 2017
  
  b00e2307
- Merge remote-tracking branch 'upstream/develop' into media-proxy · 9093b2cf
  href authored Dec 11, 2017
  
  9093b2cf
- nginx sample config, quickly tested · d1806ec0
  href authored Dec 11, 2017
  
  d1806ec0
- Limit body size to 25MB · 077faaed
  href authored Dec 11, 2017
  
  077faaed
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 7 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