Commits · 074fa790ba6282772cd8b2d40926032228d17c81 · Pleroma / pleroma

09 Dec, 2018 3 commits
- fix compile warnings · 074fa790
  Maksim authored Dec 09, 2018
  
  074fa790
- Merge branch 'angristan-docker' into 'develop' · cf85a9ae
  Haelwenn authored Dec 09, 2018
```
Update angristan/docker-pleroma URL in README

See merge request pleroma/pleroma!526
```
  cf85a9ae
- Update angristan/docker-pleroma link · 88e463e7
  Stanislas authored Dec 09, 2018
  
  88e463e7
08 Dec, 2018 5 commits
- Merge branch 'fix/add-upload.ex' into 'develop' · 5436aaad
  lain authored Dec 08, 2018
```
Mix Tasks: Add task uploads.ex for migrating local uploads.

See merge request pleroma/pleroma!517
```
  5436aaad
- Merge branch 'fix/nodeinfo-nil-features' into 'develop' · beadeaff
  lain authored Dec 08, 2018
```
Nodeinfo: remove null features; relay feature.

See merge request pleroma/pleroma!520
```
  beadeaff
- Merge branch 'fix/media-proxy-url-encoded' into 'develop' · 8fa5c66e
  lain authored Dec 08, 2018
```
Media proxy: fix url encoding

See merge request pleroma/pleroma!521
```
  8fa5c66e
- Merge branch 'fix/typo-relay-ex' into 'develop' · 4976a8b0
  lain authored Dec 08, 2018
```
[#283] Mix Tasks: Fix a typo in relay.ex

See merge request pleroma/pleroma!522
```
  4976a8b0
- [#283 ] Mix Tasks: Fix a typo in relay.ex · 6c73136a
  Rin Toshaka authored Dec 08, 2018
  
  6c73136a
07 Dec, 2018 21 commits
- Media proxy: fix url encoding · bdc8112e
  href authored Dec 07, 2018
  
  bdc8112e
- Merge branch 'fix/gopher-respect-ip' into 'develop' · 7d86c0c5
  lain authored Dec 07, 2018
```
[#155] Fix Gopher server binding only to default value

See merge request pleroma/pleroma!518
```
  7d86c0c5
- Merge branch 'media-proxy-follow-redirect' into 'develop' · 94ac0075
  lain authored Dec 07, 2018
```
Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
```
  94ac0075
- Nodeinfo: remove null features; relay feature. · 134cc94c
  href authored Dec 07, 2018
  
  134cc94c
- Media proxy: follow HTTP redirects by default · d8fcf7c5
  href authored Dec 07, 2018
  
  d8fcf7c5
- Merge branch '394_user_tags' into 'develop' · 94d8f1ab
  lain authored Dec 07, 2018
```
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
```
  94d8f1ab
- Make gopher respect ip · 09f20de0
  Rin Toshaka authored Dec 07, 2018
  
  09f20de0
- Fix a typo · fd5c7b44
  Rin Toshaka authored Dec 07, 2018
  
  fd5c7b44
- Merge branch 'emoji-alphabetical-ordering' into 'develop' · da4315b5
  lain authored Dec 07, 2018
```
Emojis: Alphabetical ordering

Closes #366

See merge request pleroma/pleroma!515
```
  da4315b5
- Mix Tasks: Add task uploads.ex for migrating local uploads. · a02e0c18
  Rin Toshaka authored Dec 07, 2018
  
  a02e0c18
- Emojis: Alphabetical ordering · 3c925e9d
  href authored Dec 07, 2018
  
  3c925e9d
- [#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.) · 1cea97df
  Ivan Tashkinov authored Dec 07, 2018
  
  1cea97df
- Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' · 8764f646
  lain authored Dec 07, 2018
```
Add mix pleroma.user unsubscribe to mix doc

See merge request !512
```
  8764f646
- Merge branch 'fix/typo-in-relay-doc' into 'develop' · 4b90c7cc
  lain authored Dec 07, 2018
```
Mix Tasks: Fix a typo in relay.ex moduledoc

See merge request !513
```
  4b90c7cc
- Fix a typo in relay.ex moduledoc · 4e2250b1
  rinpatch authored Dec 07, 2018
  
  4e2250b1
- [#394 ] Refactoring (using Ecto.Multi; "untag" route change). · 6ed5044c
  Ivan Tashkinov authored Dec 07, 2018
  
  6ed5044c
- Oops · f7e23aee
  rinpatch authored Dec 07, 2018
  
  f7e23aee
- Add mix pleroma.user unsubscribe to mix doc · f6618138
  rinpatch authored Dec 07, 2018
  
  f6618138
- Merge branch 'fix/add-common.ex' into 'develop' · c88db2c1
  eal authored Dec 07, 2018
```
add common.ex

See merge request !511
```
  c88db2c1
- Rename def to defval · 08e10a70
  rinpatch authored Dec 07, 2018
  
  08e10a70
- add common.ex · 1d11c4cf
  Rin Toshaka authored Dec 07, 2018
  
  1d11c4cf
06 Dec, 2018 11 commits
- Merge branch 'refactor/mix-tasks' into 'develop' · 220de240
  kaniini authored Dec 06, 2018
```
Rebased !243

See merge request !509
```
  220de240
- [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. · 7a2162bb
  Ivan Tashkinov authored Dec 06, 2018
  
  7a2162bb
- Update README.md · f5726a2e
  Rin Toshaka authored Dec 06, 2018
  
  f5726a2e
- [#394] View tests fix. · abbf347d
  Ivan Tashkinov authored Dec 06, 2018
  
  abbf347d
- Remove unused vars from user.ex · 71d5cf9e
  Rin Toshaka authored Dec 06, 2018
  
  71d5cf9e
- [#394] Refactoring. · 7bcb6a18
  Ivan Tashkinov authored Dec 06, 2018
  
  7bcb6a18
- Update instance.ex for web push · 66313cda
  Rin Toshaka authored Dec 06, 2018
  
  66313cda
- [#394 ] Formatting fix. · 22830c8f
  Ivan Tashkinov authored Dec 06, 2018
  
  22830c8f
- Merge develop · 88f92693
  Rin Toshaka authored Dec 06, 2018
  
  88f92693
- [#394 ] Added `users.tags` and admin routes to tag and untag users. Added tests. · 7b194873
  Ivan Tashkinov authored Dec 06, 2018
  
  7b194873
- Refactor common functions to common.ex · ca7b46fb
  Rin Toshaka authored Dec 06, 2018
  
  ca7b46fb