Commits · 52200998c997576c9008cbe50b0a7b9f0e6134cc · Pleroma / pleroma

11 Feb, 2018 1 commit
- Merge branch 'develop' into feature/activitypub · 52200998
  lain authored Feb 11, 2018
  
  52200998
09 Feb, 2018 3 commits
- update frontend · 0e2ca77e
  lain authored Feb 09, 2018
  
  0e2ca77e
- UtilController: Fix statusnet config api compatibility. · 08f458e6
  lain authored Feb 09, 2018
  
  08f458e6
- Merge branch 'develop' into 'develop' · af854f7e
  lain authored Feb 09, 2018
```
action_fallback for OAuth Controller

See merge request !63
```
  af854f7e
08 Feb, 2018 5 commits
- Merge branch 'fix/config-disable-chat' into 'develop' · f0cde24f
  lain authored Feb 08, 2018
```
Add config option for enabling/disabling chat.

See merge request !58
```
  f0cde24f
- Changed fallback controller to handle all cases from OAuthController · 73249fa5
  Calv authored Feb 08, 2018
  
  73249fa5
- Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop · 314f4775
  Calv authored Feb 08, 2018
  
  314f4775
- Create action_fallback for username/password incorrect input · bdb5dd21
  Calv authored Feb 08, 2018
  
  bdb5dd21
- Fix compile errors on 1.4.5 · 2f291576
  lain authored Feb 08, 2018
  
  2f291576
07 Feb, 2018 1 commit
- update frontend · 103eca48
  lain authored Feb 07, 2018
  
  103eca48
05 Feb, 2018 2 commits
- Update required Elixir version in README · b1edfba3
  eal authored Feb 06, 2018
```
Also remove the erlang packages, they're specified in the Debian guide.
```
  b1edfba3
- Merge branch 'fix/no-image-upload-filetype' into 'develop' · 8df0aee8
  eal authored Feb 05, 2018
```
Detect file type if none given.

See merge request !62
```
  8df0aee8
04 Feb, 2018 1 commit
- Detect file type if none given. · 286f6698
  eal authored Feb 04, 2018
  
  286f6698
03 Feb, 2018 4 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 !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
- Add config option for enabling/disabling chat. · f0745148
  eal authored Feb 01, 2018
  
  f0745148
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 !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 !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 2 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