Commits · 5e37adedfb718264fbc3eb3353ccee5244e82a89 · Pleroma / pleroma

30 Jan, 2018 8 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 5e37aded
  lain authored Jan 30, 2018
  
  5e37aded
- Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop · ad0ab3a5
  lain authored Jan 30, 2018
  
  ad0ab3a5
- Make specs less breaky. · 45010946
  lain authored Jan 30, 2018
  
  45010946
- Fix specs. · 1bb3ba02
  lain authored Jan 30, 2018
  
  1bb3ba02
- provide logo at feed.atom (debug) · cefb6cfe
  Hakaba Hitoyo authored Jan 30, 2018
  
  cefb6cfe
- provide logo at feed.atom · b713b28d
  Hakaba Hitoyo authored Jan 30, 2018
  
  b713b28d
- Merge branch 'pr-upstream-http-proxy' into 'develop' · 2f23ae5b
  lain authored Jan 30, 2018
```
Pr upstream http proxy

See merge request !43
```
  2f23ae5b
- Merge branch 'feature/caddyfile' into 'develop' · 189e9d63
  lain authored Jan 30, 2018
```
Add a Caddyfile.

See merge request !50
```
  189e9d63
29 Jan, 2018 3 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · ede4883a
  lain authored Jan 29, 2018
  
  ede4883a
- Fix incoming Pleroma CWs. Closes #96 . · 64e51c2c
  lain authored Jan 29, 2018
  
  64e51c2c
- use nil instead of empty string · 066fe1a6
  jeff authored Jan 29, 2018
  
  066fe1a6
27 Jan, 2018 1 commit
- Merge branch 'feature/longfox' into 'develop' · 8db83c3d
  lain authored Jan 27, 2018
```
add longfox emojis

See merge request !53
```
  8db83c3d
26 Jan, 2018 6 commits
- add longfox emojis · 7e1d4819
  Hakaba Hitoyo authored Jan 27, 2018
  
  7e1d4819
- Merge branch 'feature/cross-origin' into 'develop' · 46c8f79c
  lain authored Jan 26, 2018
```
Access-Control-Allow-Origin

See merge request !52
```
  46c8f79c
- Access-Control-Allow-Origin · 9c0c40cf
  Hakaba Hitoyo authored Jan 26, 2018
  
  9c0c40cf
- Update frontend. · e97864bf
  lain authored Jan 26, 2018
  
  e97864bf
- Fix config. · 5957c651
  lain authored Jan 26, 2018
  
  5957c651
- Update frontend. · cd3210c9
  lain authored Jan 26, 2018
  
  cd3210c9
24 Jan, 2018 1 commit
- Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy · dffde663
  jeff authored Jan 24, 2018
  
  dffde663
20 Jan, 2018 2 commits
- Stats: Make less crashy and improve query. · 0f722a8c
  lain authored Jan 20, 2018
  
  0f722a8c
- Merge branch 'feature/remote-follow' into 'develop' · 2ed17541
  lain authored Jan 20, 2018
```
remote follow

See merge request !51
```
  2ed17541
18 Jan, 2018 6 commits
- Revert "Revert "Add remote follow pages."" · beb13bf3
  eal authored Jan 18, 2018
```
This reverts commit b259b4e4.
```
  beb13bf3
- Revert "Revert "Add remote follow path to webfinger."" · 57d413e6
  eal authored Jan 18, 2018
```
This reverts commit fb5aa340.
```
  57d413e6
- Revert "Add remote follow pages." · b259b4e4
  eal authored Jan 18, 2018
```
This reverts commit 47e8c8db.
```
  b259b4e4
- Revert "Add remote follow path to webfinger." · fb5aa340
  eal authored Jan 18, 2018
```
This reverts commit bc689740.
```
  fb5aa340
- Add remote follow pages. · 47e8c8db
  eal authored Jan 18, 2018
  
  47e8c8db
- Add remote follow path to webfinger. · bc689740
  eal authored Jan 16, 2018
  
  bc689740
16 Jan, 2018 3 commits
- Merge branch 'fix/background-profile-fetch' into 'develop' · ac7580df
  lain authored Jan 16, 2018
```
Fetch external profile in the background.

See merge request !49
```
  ac7580df
- Add a Caddyfile. · 6678fe32
  eal authored Jan 16, 2018
  
  6678fe32
- Fetch external profile in the background. · b3e7d7ae
  eal authored Jan 16, 2018
  
  b3e7d7ae
15 Jan, 2018 5 commits
- Merge branch 'default-pictures' into 'develop' · 80f6ac41
  eal authored Jan 15, 2018
```
Add a default profile picture and banner.

See merge request !48
```
  80f6ac41
- Add a default profile picture and banner. · 14b086ee
  eal authored Jan 15, 2018
```
This removes the placehold.it dependency.
```
  14b086ee
- Merge branch 'prod.exs' into 'develop' · baf66cae
  eal authored Jan 15, 2018
```
Correct prod.exs

See merge request !47
```
  baf66cae
- Merge branch 'fix/pleroma.nginx' into 'develop' · db5dfd1b
  eal authored Jan 15, 2018
```
Correct pleroma.nginx

See merge request !46
```
  db5dfd1b
- Merge branch 'stats-daemon' into 'develop' · 5a6f54b3
  lain authored Jan 15, 2018
```
Add a stats agent for storing data from expensive queries.

See merge request !45
```
  5a6f54b3
14 Jan, 2018 4 commits
- Correct pleroma.nginx · aceef36e
  Hakaba Hitoyo authored Jan 14, 2018
  
  aceef36e
- #95 Correct prod.exs · 048f61d7
  Hakaba Hitoyo authored Jan 14, 2018
  
  048f61d7
- Fix instance test. · 6e1cb861
  eal authored Jan 14, 2018
  
  6e1cb861
- Move user count to stats agent. · d8db3956
  eal authored Jan 14, 2018
  
  d8db3956
13 Jan, 2018 1 commit
- Add a stats agent for storing data from expensive queries. · 9717166d
  eal authored Jan 13, 2018
  
  9717166d