treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
12,252 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

12252 Commits (c952cc311518056f711b23515492a9fb4c2a598f)

Author SHA1 Message Date
ThibG 3e51b04d40 Change move handler to carry blocks over (#14144) 
* Change move handler to carry blocks and mutes over

When user A blocks user B and B moves to a new account C, make A block C
accordingly.

Note that it only works if A's instance is aware of the Move, that is,
if B is on A's instance or has followers there.

* Also notify instances with known people blocking you when moving

* Add automatic account notes when blocking/muting an account that had no note
 2020-07-01 13:51:15 +02:00
mayaeh 4b703d398a follow-up #14149 (#14192) 
ran `yarn manage:translations en`
 2020-07-01 11:34:19 +02:00
Thibaut Girka 9b91f64ff3 Add support for li attribute to li element 2020-07-01 01:02:27 +02:00
Thibaut Girka c28f80802a Add support for “start” and “reversed” attributes to ol element 
Fixes #1367
 2020-07-01 01:02:27 +02:00
ThibG 2ea362dd85 Merge pull request #1366 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-07-01 00:18:49 +02:00
Eugen Rochko 36e5fd547b Fix remote files not using Content-Type header, streaming (#14184) 2020-06-30 23:58:02 +02:00
Thibaut Girka a0b071e0e2 Use allow/deny-list instead of white/black-list in .env.production.sample 
.env.production.sample has been nuked upstream, but we decided to keep it,
so change it to reflect latest changes in environment variable names.

(The link still refers to “whitelist_mode” because the documentation hasn't
been updated yet)
 2020-06-30 23:32:02 +02:00
ThibG 50f439db96 [Glitch] Add user notes on accounts 
Port 3afc7977b1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:32:02 +02:00
trwnh 9dcd3388f6 [Glitch] Fix padding on account header 
Port 41acf83cdf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:10:44 +02:00
ThibG a11fac77f3 [Glitch] Fix read marker state not being udpated internally 
Port 8b7066dc61 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:09:39 +02:00
ThibG 1c3764c6f8 [Glitch] Change sensitive preview cards to not blur text 
Port c92278aa1c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:08:24 +02:00
Thibaut Girka 2a2af880b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
 2020-06-30 23:00:20 +02:00
ThibG 3afc7977b1 Add user notes on accounts (#14148) 
* Add UserNote model

* Add UI for user notes

* Put comment in relationships entity

* Add API to create user notes

* Copy user notes to new account when receiving a Move activity

* Address some of the review remarks

* Replace modal by inline edition

* Please CodeClimate

* Button design changes

* Change design again

* Cancel note edition when pressing Escape

* Fixes

* Tweak design again

* Move “Add note” item, and allow users to add notes to themselves

* Rename UserNote into AccountNote, rename “comment” Relationship attribute to “note”
 2020-06-30 19:19:50 +02:00
dependabot[bot] 8a1a6b8fb0 Bump diff-lcs from 1.3 to 1.4.3 (#14186) 
Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.3 to 1.4.3.
- [Release notes](https://github.com/halostatue/diff-lcs/releases)
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md)
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.3...v1.4.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-30 13:18:38 +09:00
dependabot[bot] c3070c905d Bump faker from 2.12.0 to 2.13.0 (#14174) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.12.0 to 2.13.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.12.0...v2.13.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-30 13:18:25 +09:00
dependabot[bot] a941212907 Bump uuid from 8.1.0 to 8.2.0 (#14162) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.1.0...v8.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-30 01:24:56 +09:00
dependabot[bot] 008e1a3308 Bump jest-config from 26.0.1 to 26.1.0 (#14176) 
Bumps [jest-config](https://github.com/facebook/jest/tree/HEAD/packages/jest-config) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-config)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-30 01:24:46 +09:00
Eugen Rochko 16a8db0958 Fix trying to write non-existent image remote URL attribute on preview cards (#14181) 
Regression from #14145
 2020-06-29 17:59:04 +02:00
Eugen Rochko e145c1865f Add GitHub Sponsors 2020-06-29 16:10:49 +02:00
dependabot[bot] 97e77c986f Bump redis-store from 1.8.2 to 1.9.0 (#14160) 
Bumps [redis-store](https://github.com/jodosha/redis-store) from 1.8.2 to 1.9.0.
- [Release notes](https://github.com/jodosha/redis-store/releases)
- [Changelog](https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jodosha/redis-store/compare/v1.8.2...v1.9.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 22:45:50 +09:00
dependabot[bot] fe868c554b Bump pghero from 2.5.0 to 2.5.1 (#14163) 
Bumps [pghero](https://github.com/ankane/pghero) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.5.0...v2.5.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 22:44:43 +09:00
dependabot[bot] d993d41cf4 Bump rails-controller-testing from 1.0.4 to 1.0.5 (#14161) 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.4...v1.0.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 22:43:34 +09:00
dependabot[bot] 2b4a61b8ed Bump jest-environment-jsdom from 26.0.1 to 26.1.0 (#14167) 
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-environment-jsdom)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:55:22 +09:00
dependabot[bot] 890a6d704a Bump webpack-cli from 3.3.11 to 3.3.12 (#14164) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.12/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.11...v3.3.12)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:50:12 +09:00
dependabot[bot] a72d95015e Bump @babel/plugin-transform-runtime from 7.10.1 to 7.10.3 (#14168) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.1 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:49:48 +09:00
dependabot[bot] c575d09adc Bump react-textarea-autosize from 8.0.1 to 8.1.1 (#14177) 
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize) from 8.0.1 to 8.1.1.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases)
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v8.0.1...v8.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:47:42 +09:00
dependabot[bot] 09b5865109 Bump rubocop from 0.85.1 to 0.86.0 (#14171) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.1 to 0.86.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.85.1...v0.86.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:44:32 +09:00
dependabot[bot] 24a512e418 Bump aws-sdk-s3 from 1.69.0 to 1.72.0 (#14158) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.69.0 to 1.72.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:43:31 +09:00
Alex Dunn f2c5dd7b44 Add Helm chart (#14090) 
* add Helm chart

known issues/future work:

- SSO is unsupported

- S3/Minio/GCS is unsupported

- Swift is unsupported

- WEB_DOMAIN is unsupported

- Tor is unsupported

* helm: clarify how LOCAL_DOMAIN is set

* helm: add chart description

* helm: make DB_POOL and Sidekiq concurrency configurable

* helm: only enforce pod affinity when using ReadWriteOnce

* helm: clarify compatibility

* helm: clean up application variables

* helm: add job to create initial admin
 2020-06-29 13:58:48 +02:00
Yamagishi Kazutoshi 72ff9a1d65 Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
trwnh 41acf83cdf Fix padding on account header (#14179) 2020-06-29 13:57:44 +02:00
Eugen Rochko a3ce01a102 Add customizable thumbnails for audio and video attachments (#14145) 
- Change audio files to not be stripped of metadata
- Automatically extract cover art from audio if it exists
- Add `thumbnail` parameter to `POST /api/v1/media`, `POST /api/v2/media` and `PUT /api/v1/media/:id`
- Add `icon` to represent it in attachments in ActivityPub
- Fix `preview_url` containing URL of missing missing image when there is no thumbnail instead of null
- Fix duration of audio not being displayed on public pages until the file is loaded
 2020-06-29 13:56:55 +02:00
ThibG 8b7066dc61 Fix read marker state not being udpated internally (#14155) 
Fixes #14151
 2020-06-28 20:55:32 +02:00
Eugen Rochko 42d2f45db1 Remove the terms blacklist and whitelist from UX (#14149) 
Localization strings:

- "Whitelist mode" -> "Limited federation mode"
- "Blacklist e-mail domain" -> "Block e-mail domain"
- "Whitelist domain" -> "Allow domain for federation"

...And so on

Environment variables (backwards-compatible):

- `WHITELIST_MODE` -> `LIMITED_FEDERATION_MODE`
- `EMAIL_DOMAIN_BLACKLIST` -> `EMAIL_DOMAIN_DENYLIST`
- `EMAIL_DOMAIN_WHITELIST` -> `EMAIL_DOMAIN_ALLOWLIST`

tootctl:

- `tootctl domains purge --whitelist-mode` -> `tootctl domains purge --limited-federation-mode`

Removed badly maintained and no longer relevant .env.production.sample file
 2020-06-27 20:20:11 +02:00
Eugen Rochko 85ecbd5527 Fix help text around `tootctl email_domain_blocks` (#14147) 2020-06-26 21:28:40 +02:00
ThibG 91d71b6842 Merge pull request #1364 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-06-26 16:36:55 +02:00
ThibG c92278aa1c Change sensitive preview cards to not blur text (#14143) 
Also only require click-through for interactive embeds.
 2020-06-26 14:31:13 +02:00
Thibaut Girka 5ea65bfe13 Fix public page CSS to match upstream's changes 
Kind of a port of 1aed75c2d0 to glitch-soc
 2020-06-26 13:45:40 +02:00
Mélanie Chauvel 2700043e34 [Glitch] Improve appearence consistency of settings pages 
Port 2fca9d3715 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:31:17 +02:00
ThibG 00283fe6ab [Glitch] Fix design issues with sensitive preview cards 
Port 907fe2996c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:28:52 +02:00
ThibG 4500435bb1 [Glitch] Fix avatar size in public page detailed status 
Port 528c103fc6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:27:39 +02:00
Eugen Rochko 03273b3c7b [Glitch] Fix various issues around OpenGraph representation of media 
Port front-end changes (except for audio player) from 12ac904a33 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:23:56 +02:00
Thibaut Girka d3f692f7f9 Revert "Remove unused dependency on wavesurfer.js (#14136)" 
This reverts commit 1fcf4d65d5.
 2020-06-26 13:03:39 +02:00
Thibaut Girka 0e33582bff Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
Mélanie Chauvel 2fca9d3715 Improve appearence consistency of settings pages (#13938) 
* Fix header button changing header size in settings pages

* Make form buttons look more like a part of the form in settings pages

- Put buttons closer, using same distance as between inputs
- Make buton font size a bit smaller to blend a bit more
- Add the class button to button tags for consisent styling
 2020-06-26 00:36:30 +02:00
Mélanie Chauvel cb63e1e0d7 Improve wording of the “Add media” button tooltip (#13954) 
- Remove (incomplete) list of supported formats
- List types of media (image, video, audio)
- Tell that several images could be uploaded using plural
 2020-06-26 00:14:29 +02:00
Sasha Sorokin 8e9572112d Fix Thai being skipped from language detection (#13989) 
Thai does not separate words by spaces, so I figured out it should be
in 'reliable characters regexp' that denotes languages that do the same.

Related #13891.
 2020-06-25 22:45:01 +02:00
Takeshi Umeda 17c1443b23 Change to correct the role of the boost button (#14132) 2020-06-25 22:44:19 +02:00
Takeshi Umeda 1aed75c2d0 Add a visibility icon to status (#14123) 
* Add a visibility icon to status

* Change to using the icon element

* Fix RTL

* Add a public globe
 2020-06-25 22:43:59 +02:00
ThibG 907fe2996c Fix design issues with sensitive preview cards (#14126) 
* Fix design issues with sensitive preview cards

* Center “sensitive” label on preview image for interactive cards

* Add “button” role to sensitive preview card text
 2020-06-25 22:42:01 +02:00