mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 06:35:08 +01:00
Code Issues Projects Releases Wiki Activity
11,605 Commits 139 Branches 269 Tags 897 MiB
bf9da1e734
Commit Graph

11605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
dc15c81e67
Change video uploads to enforce certain limits (#13218) 
- Dimensions at most 1920x1200
- Frame rate at most 60
 2020-03-09 02:19:07 +01:00
dependabot-preview[bot]
7088633ae1
Bump cld3 from 3.2.6 to 3.3.0 (#13107) 
* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2020-03-09 00:12:52 +01:00
ThibG
b154428e14
Add federation support for the "hide network" preference (#11673) 
* Change ActivityPub follower/following collections to not link first page

* Add support for hiding followers and following of remote users

* Switch to using a single `hide_collections` column

* Address code style remarks
 2020-03-09 00:10:29 +01:00
Eugen Rochko
9660aa4543
Change local media attachments to perform heavy processing asynchronously (#13210) 
Fix #9106
 2020-03-08 23:56:18 +01:00
ThibG
840b17e344
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-03-08 22:09:53 +01:00
ThibG
9c29229587 [Glitch] Add support for links to statuses in announcements to be opened in web UI 
Port aa67036b41 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
669cf49c54 [Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI 
Port 5e4b649655 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:45:36 +01:00
Bèr Kessels
fc53d9cc76 [Glitch] Code style improvements in JavaScript 
Port fd76955f39 to glitch-soc

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:43:53 +01:00
Mélanie Chauvel (ariasuni)
35d2189ac8 [Glitch] Change description of privacy levels to be more intuitive in web UI 
Port 4063f9f278 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:37:13 +01:00
Mélanie Chauvel (ariasuni)
bdb06f50ec [Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI 
Port 2e18b1a2a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:19:08 +01:00
ThibG
3c96a0c21d [Glitch] Fix too large announcements not being scrollable in web UI 
Port 503eab1c1f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:16:43 +01:00
koyu
6211eff739 [Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI 
Port e69a3f54a1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:15:11 +01:00
ThibG
c8f36a71ea [Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI 
Port 39453de232 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
eae96cb204 [Glitch] Add tooltips to audio/video player buttons 
Port 036ba3f510 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 19:59:42 +01:00
Thibaut Girka
c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
 2020-03-08 19:38:53 +01:00
dependabot-preview[bot]
764b89939f
Bump doorkeeper from 5.2.3 to 5.3.1 (#13144) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-08 16:22:12 +01:00
ThibG
5284e29e2f
Fix public posts from silenced accounts not being changed to unlisted visibility (#13096) 2020-03-08 16:11:49 +01:00
ThibG
aa67036b41
Add support for links to statuses in announcements to be opened in web UI (#13212) 
* Add support for links to public statuses in announcements to be opened in WebUI

* Please CodeClimate
 2020-03-08 16:10:48 +01:00
Mélanie Chauvel (ariasuni)
5e4b649655
Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199) 2020-03-08 16:09:34 +01:00
Mélanie Chauvel (ariasuni)
62c4e4cc22
Change wording of media display preferences to be more intuitive (#13198) 2020-03-08 16:08:38 +01:00
Shlee
514cd874a7
Update nginx.conf (#13066) 2020-03-08 16:04:25 +01:00
guigeekz
e31ba618d4
Add submit button to the top of preferences pages (#13068) 
* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec
 2020-03-08 16:04:03 +01:00
Bèr Kessels
fd76955f39
Code style improvements in JavaScript (#13159) 
* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.
 2020-03-08 16:02:36 +01:00
tateisu
4e524218d3
Add --skip-media-remove option to tootctl statuses remove (#13080) 
* Add skip_media_remove option to tootctl statuses remove

* Add skip_media_remove option to tootctl statuses remove

Co-authored-by: tateisu <tateisu@juggler.jp>
 2020-03-08 16:01:07 +01:00
ThibG
2423d2f677
Add ability to delete files uploaded for settings in admin UI (#13192) 
* Allow deleting site uploads

* Refactor and move links into hints

* Fix i18n tests

* Fix HTML output of site_upload_delete_hint
 2020-03-08 16:00:24 +01:00
Mélanie Chauvel (ariasuni)
4063f9f278
Change description of privacy levels to be more intuitive in web UI (#13197) 
* Improve description of privacy levels in compose interface

* Change strings in defaultMessage and source as well as english

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 15:59:55 +01:00
David Cook
05d83cb07d
Set BUNDLE_PATH in CircleCI (#13214) 2020-03-08 15:45:19 +01:00
ThibG
6185bff4b3
Fix error when searching for URLs that contain the mention syntax (#13151) 
Fixes #13150
 2020-03-08 15:42:20 +01:00
ThibG
4a4cd686c1
Add sorting by username, creation and last activity in moderation view (#13076) 
* Add ability to order accounts in moderation view

* Display last status date in “Most recent activity” for remote users
 2020-03-08 15:39:13 +01:00
Mélanie Chauvel (ariasuni)
2e18b1a2a2
Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148) 2020-03-08 15:36:50 +01:00
Eugen Rochko
339ce1c4e9
Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
ThibG
503eab1c1f
Fix too large announcements not being scrollable in web UI (#13211) 2020-03-06 15:20:14 +01:00
koyu
e69a3f54a1
Change GIF label to be displayed even when autoplay is enabled in web UI (#13209) 2020-03-06 05:31:51 +01:00
Eugen Rochko
0ae5c6312f
Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
Eugen Rochko
39453de232
Change the string "Hide everything from …" to "Block domain …" in web UI (#13178) 
Blocking a domain is closer to blocking all its users than to a mute
action.
 2020-03-05 23:20:49 +01:00
Eugen Rochko
d081a80cff
Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170) 
Fixes #13168
 2020-03-05 15:56:01 +01:00
Eugen Rochko
036ba3f510
Add tooltips to audio/video player buttons (#13203) 2020-03-05 15:52:15 +01:00
dependabot-preview[bot]
86c932f79c
Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:55:52 +09:00
dependabot-preview[bot]
3d8a6dc043
Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:55:32 +09:00
dependabot-preview[bot]
131c16f0bc
Bump @babel/core from 7.8.4 to 7.8.6 (#13185) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:49:40 +09:00
dependabot-preview[bot]
66b014ca50
Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:48:02 +09:00
dependabot-preview[bot]
95155ecbe7
Bump oj from 3.10.1 to 3.10.3 (#13187) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:46:56 +09:00
dependabot-preview[bot]
74c2490cdd
Bump strong_migrations from 0.5.1 to 0.6.2 (#13071) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:44:44 +09:00
ThibG
7d575c669e
Bump puma from 4.3.2 to 4.3.3 (#13177) 
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
 2020-03-01 22:25:13 +01:00
Thibaut Girka
13ef4d5fb0 Update puma from 4.3.2 to 4.3.3 
Fixes #1294

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
 2020-03-01 20:54:02 +01:00
Thibaut Girka
553a16c6f8 Update JS dependencies 2020-02-29 22:32:33 +01:00
Thibaut Girka
b0a7cb71be Update glitch-soc-specific dependencies 
- drop html2text which has been unused in a while
- update redcarpet
 2020-02-29 22:32:33 +01:00
ThibG
907ebcfd43
Merge pull request #1291 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-02-29 12:50:44 +01:00
Thibaut Girka
427ef4948a Merge branch 'master' into glitch-soc/merge-upstream 2020-02-29 12:20:54 +01:00
ThibG
5393b187c4
Fix elasticsearch-api and faraday incompatibilities (#13166) 2020-02-29 03:05:02 +01:00