Commits · 286f6698eee9127928ce945e73be2e1059ba4e81 · Pleroma / pleroma

04 Feb, 2018 1 commit
- Detect file type if none given. · 286f6698
  eal authored Feb 04, 2018
  
  286f6698
03 Feb, 2018 3 commits
- Merge branch 'move-backend-images' into 'develop' · 61c16193
  lain authored Feb 03, 2018
```
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
```
  61c16193
- add backend endpoint /images · c8a29315
  Hakaba Hitoyo authored Feb 03, 2018
  
  c8a29315
- move avi.png & banner.png from /priv/static/static to /priv/static/images · ea6d1b2b
  Hakaba Hitoyo authored Feb 03, 2018
  
  ea6d1b2b
02 Feb, 2018 3 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 9a9766d6
  lain authored Feb 02, 2018
  
  9a9766d6
- Update frontend. · 2203fa2f
  lain authored Feb 02, 2018
  
  2203fa2f
- Merge branch 'feature/remote-follow' into 'develop' · 31633110
  lain authored Feb 02, 2018
```
Add remote following of local profiles.

See merge request pleroma/pleroma!59
```
  31633110
01 Feb, 2018 2 commits
- Add remote following of local profiles. · 29be70c0
  eal authored Feb 02, 2018
  
  29be70c0
- TwitterAPI: Add is_local to user view. · ab83e0de
  eal authored Feb 01, 2018
  
  ab83e0de
31 Jan, 2018 8 commits
- Revert renaming emoji.txt · 15cb3f2b
  eal authored Jan 31, 2018
  
  15cb3f2b
- Merge branch 'feature/instance-thumbnail-api' into 'develop' · 0f194dc5
  eal authored Jan 31, 2018
```
Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55
```
  0f194dc5
- Merge branch 'fix/split-custom-emoji' into 'develop' · 3fa6f3ae
  lain authored Jan 31, 2018
```
Split emoji to default and custom.

See merge request pleroma/pleroma!56
```
  3fa6f3ae
- Split emoji to default and custom. · ab8b9aba
  eal authored Jan 31, 2018
  
  ab8b9aba
- provide instance thumbnail at /api/v1/instance (debug) · 03c15a54
  Hakaba Hitoyo authored Jan 31, 2018
  
  03c15a54
- provide instance thumbnail at /api/v1/instance (debug) · e47f60c0
  Hakaba Hitoyo authored Jan 31, 2018
  
  e47f60c0
- provide instance thumbnail at /api/v1/instance (debug) · 10753178
  Hakaba Hitoyo authored Jan 31, 2018
  
  10753178
- provide instance thumbnail at /api/v1/instance · a4335e39
  Hakaba Hitoyo authored Jan 31, 2018
  
  a4335e39
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 2 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