Commits · 7bcb6a183a13cabd32bafd0e3ca20f8ca543565b · Pleroma / pleroma

06 Dec, 2018 5 commits
- [#394 ] Refactoring. · 7bcb6a18
  Ivan Tashkinov authored Dec 06, 2018
  
  7bcb6a18
- [#394 ] Formatting fix. · 22830c8f
  Ivan Tashkinov authored Dec 06, 2018
  
  22830c8f
- [#394 ] Added `users.tags` and admin routes to tag and untag users. Added tests. · 7b194873
  Ivan Tashkinov authored Dec 06, 2018
  
  7b194873
- Merge branch '210_twitter_api_uploads_alt_text' into 'develop' · ccf0b46d
  kaniini authored Dec 06, 2018
```
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.

See merge request !496
```
  ccf0b46d
- [#210] Mastodon: actor storing for media uploads, ownership check to update_media. · 3e90f688
  Ivan Tashkinov authored Dec 06, 2018
```
Refactoring.
```
  3e90f688
05 Dec, 2018 28 commits
- Merge branch 'follower-hiding' into 'develop' · 48a03156
  kaniini authored Dec 05, 2018
```
Network hiding

Closes #356

See merge request pleroma/pleroma!490
```
  48a03156
- Merge branch 'dev_vald_fe/data_tag' into 'develop' · 6ab58fdf
  kaniini authored Dec 05, 2018
```
added data-user and data-tag attributes

Closes #410

See merge request !504
```
  6ab58fdf
- added data attrs to twitter scrubber · 194869c7
  ValD authored Dec 06, 2018
  
  194869c7
- Fix merge. · 7d5720f2
  lain authored Dec 05, 2018
  
  7d5720f2
- Merge remote-tracking branch 'origin' into follower-hiding · 76d6b1c6
  lain authored Dec 05, 2018
  
  76d6b1c6
- MastodonAPI: Show users their own network. · 3ea44764
  lain authored Dec 05, 2018
  
  3ea44764
- resolved activity view test · 3c8ffe7e
  ValD authored Dec 06, 2018
  
  3c8ffe7e
- lint · 028904c3
  ValD authored Dec 06, 2018
  
  028904c3
- resolved api and controller test failures · 911a8775
  ValD authored Dec 06, 2018
  
  911a8775
- TwitterAPI: Show users their own network. · fdac2150
  lain authored Dec 05, 2018
  
  fdac2150
- linting · 743a0913
  ValD authored Dec 06, 2018
  
  743a0913
- resolved formatter_test failures · 812b20d4
  ValD authored Dec 06, 2018
  
  812b20d4
- added data attrs for user and tag · 3ccfe226
  ValD authored Dec 06, 2018
  
  3ccfe226
- [#210 ] Stylistic change. · 3b5be09f
  Ivan Tashkinov authored Dec 05, 2018
  
  3b5be09f
- TwitterAPI: Add network hiding. · 839526a9
  lain authored Dec 05, 2018
  
  839526a9
- Merge branch 'support/oauth_fetch_token' into 'develop' · 5f0c2372
  lain authored Dec 05, 2018
```
[#273] bugfix/273

See merge request !502
```
  5f0c2372
- Merge branch 'fix/mix-tasks-userinfo' into 'develop' · 991b62cb
  lain authored Dec 05, 2018
```
Update mix tasks that use User.info.info_changeset since it is deprecated

See merge request !503
```
  991b62cb
- [#210 ] Stylistic change. · c4f3c5e9
  Ivan Tashkinov authored Dec 05, 2018
  
  c4f3c5e9
- Sorry · c3519132
  Rin Toshaka authored Dec 05, 2018
  
  c3519132
- Update mix tasks since User.info.info_changeset is deprecated · 5427d2af
  Rin Toshaka authored Dec 05, 2018
  
  5427d2af
- fix/273 · c524c505
  Maksim authored Dec 05, 2018
  
  c524c505
- [#210 ] Formatting fix. · ba345e4c
  Ivan Tashkinov authored Dec 05, 2018
  
  ba345e4c
- [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check · 848151f7
  Ivan Tashkinov authored Dec 05, 2018
```
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
```
  848151f7
- [#210 ] Test update (replaced bang- with non-bang method). · 53797d19
  Ivan Tashkinov authored Dec 05, 2018
  
  53797d19
- [#210 ] Further refactoring. · be187f82
  Ivan Tashkinov authored Dec 05, 2018
  
  be187f82
- Merge branch 'bugfix/408' into 'develop' · 22eff179
  lain authored Dec 05, 2018
```
ensure user info is populated when registering users

See merge request !500
```
  22eff179
- tests: add regression test for bug #408 · 0f061bea
  kaniini authored Dec 05, 2018
  
  0f061bea
- user: put default user info when registering a user · 956f3c75
  kaniini authored Dec 05, 2018
  
  956f3c75
04 Dec, 2018 7 commits
- Merge branch 'optional-retry-queue' into 'develop' · ec1ec32f
  kaniini authored Dec 04, 2018
```
Make retry queue optional.

See merge request !498
```
  ec1ec32f
- Make retry queue optional. · 925b0505
  lain authored Dec 04, 2018
```
At the moment, it can use a lot of memory really fast.
```
  925b0505
- Merge branch 'feature/integration_tesla' into 'develop' · 114b95ce
  kaniini authored Dec 04, 2018
```
[#354] Move all http interactions to Tesla

See merge request !487
```
  114b95ce
- Merge branch 'bugfix/mrf-simple-media-removal' into 'develop' · 4a602230
  lain authored Dec 04, 2018
```
bugfix: MRF simple media removal

See merge request !497
```
  4a602230
- MRF: simple policy: fix media removal · b57d83e3
  kaniini authored Dec 04, 2018
  
  b57d83e3
- add test · a9e3e387
  Maksim authored Dec 04, 2018
  
  a9e3e387
- [#210 ] Refactoring. · 44ab3dbe
  Ivan Tashkinov authored Dec 04, 2018
  
  44ab3dbe