5e1ded97b5
Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-01 21:51:16 +02:00
98aa197c07
[Glitch] Fix cursor type in statuses
...
Port eee8b314af
2020-07-01 20:18:07 +02:00
0f633143eb
[Glitch] Fix lock icon not being shown when locking account in profile settings
...
Port 9e14647df8
2020-07-01 20:13:51 +02:00
928a3a9fd5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Conflict because part of that file has been split to
`app/javascript/core/settings.js`. Ported those changes
there.
2020-07-01 19:23:14 +02:00
ca238c879d
Change Redis#exists calls to Redis#exists? to avoid deprecation warning ( #14191 )
2020-07-01 19:05:21 +02:00
eee8b314af
Fix cursor type in statuses ( #14185 )
2020-07-01 13:52:05 +02:00
9e14647df8
Fix lock icon not being shown when locking account in profile settings ( #14190 )
2020-07-01 13:51:50 +02:00
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
4b703d398a
follow-up #14149 ( #14192 )
...
ran `yarn manage:translations en`
2020-07-01 11:34:19 +02:00
9b91f64ff3
Add support for li attribute to li element
2020-07-01 01:02:27 +02:00
c28f80802a
Add support for “start” and “reversed” attributes to ol element
...
Fixes #1367
2020-07-01 01:02:27 +02:00
2ea362dd85
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-01 00:18:49 +02:00
36e5fd547b
Fix remote files not using Content-Type header, streaming ( #14184 )
2020-06-30 23:58:02 +02:00
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
50f439db96
[Glitch] Add user notes on accounts
...
Port 3afc7977b1
2020-06-30 23:32:02 +02:00
9dcd3388f6
[Glitch] Fix padding on account header
...
Port 41acf83cdf
2020-06-30 23:10:44 +02:00
a11fac77f3
[Glitch] Fix read marker state not being udpated internally
...
Port 8b7066dc61
2020-06-30 23:09:39 +02:00
1c3764c6f8
[Glitch] Change sensitive preview cards to not blur text
...
Port c92278aa1c
2020-06-30 23:08:24 +02:00
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
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
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
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
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
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
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
e145c1865f
Add GitHub Sponsors
2020-06-29 16:10:49 +02:00
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
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
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
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
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
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
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
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
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
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
72ff9a1d65
Replace to testing-library from enzyme ( #14152 )
2020-06-29 13:58:07 +02:00
41acf83cdf
Fix padding on account header ( #14179 )
2020-06-29 13:57:44 +02:00
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
8b7066dc61
Fix read marker state not being udpated internally ( #14155 )
...
Fixes #14151
2020-06-28 20:55:32 +02:00
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
85ecbd5527
Fix help text around `tootctl email_domain_blocks` ( #14147 )
2020-06-26 21:28:40 +02:00
91d71b6842
Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-06-26 16:36:55 +02:00
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
5ea65bfe13
Fix public page CSS to match upstream's changes
...
Kind of a port of 1aed75c2d0
2020-06-26 13:45:40 +02:00
2700043e34
[Glitch] Improve appearence consistency of settings pages
...
Port 2fca9d3715
2020-06-26 13:31:17 +02:00
00283fe6ab
[Glitch] Fix design issues with sensitive preview cards
...
Port 907fe2996c
2020-06-26 13:28:52 +02:00
4500435bb1
[Glitch] Fix avatar size in public page detailed status
...
Port 528c103fc6
2020-06-26 13:27:39 +02:00
03273b3c7b
[Glitch] Fix various issues around OpenGraph representation of media
...
Port front-end changes (except for audio player) from 12ac904a33
2020-06-26 13:23:56 +02:00
d3f692f7f9
Revert "Remove unused dependency on wavesurfer.js ( #14136 )"
...
This reverts commit 1fcf4d65d5
2020-06-26 13:03:39 +02:00
ThibG