1600aeb6cb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ddd7a9e44b
Fix opacity of relationship tags ( #10411 )
6 years ago
2a740c3e9a
I18n: Update Czech translation ( #10410 )
6 years ago
be7c92061c
squashed identity proof updates ( #10375 )
6 years ago
3a9abe39b2
Add `tootctl self-destruct` ( #10367 )
...
Fix #10305
6 years ago
2b3d268dfb
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
db1d883202
Bump aws-sdk-s3 from 1.35.0 to 1.36.0 ( #10406 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.35.0 to 1.36.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/compare/v1.35.0...v1.36.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
68d3c33532
Bump rails from 5.2.2.1 to 5.2.3 ( #10407 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
364e49ae1f
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
6 years ago
11b3d88dc8
[Security] Bump devise from 4.5.0 to 4.6.2 ( #10394 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b6bf8e24be
Add `tootctl search deploy` to avoid ugly rake task syntax ( #10403 )
6 years ago
7aeb50cc89
Add order options to relationship manager UI ( #10404 )
6 years ago
f1a582dc15
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
6 years ago
6e163d5b2a
Fix alternative relay support regression ( #10398 )
...
Fix #10324
6 years ago
77718e0b98
Bump tzinfo-data from 1.2018.9 to 1.2019.1 ( #10396 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b27559d1c4
Bump bootsnap from 1.4.1 to 1.4.2 ( #10395 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
da47c30eac
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
6 years ago
02d5017d85
Fix interpolations in some localizations ( #10397 )
6 years ago
367ab6764f
Remove unused ActivityPub `@context` values depending on response ( #10378 )
...
Fix #8078
6 years ago
aa9fbfe842
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
...
Revert emojimart update
6 years ago
451a79bda3
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit e781d842a5
6 years ago
d72bc923e9
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit b0e478fcc5
6 years ago
910fd88da2
Revert "Fix compilation after emoji-picker change"
...
This reverts commit 05b79f07fa
6 years ago
398b39ca12
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
add1f52864
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2e5ec8b7c8
Move the account dropdown menubar to the right, make sure it doesn't move ( #10390 )
...
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
6 years ago
1a0de0f62d
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
5ca976c776
[Glitch] Add a “Block & Report” button to the block confirmation dialog
...
Port 36a6089a22
6 years ago
cab7e62235
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
36a6089a22
Add a “Block & Report” button to the block confirmation dialog ( #10360 )
6 years ago
cffb8cb38d
Fix HTML validation ( #10354 )
...
* Fix HTML validation
* Report first HTML error instead on validation error
6 years ago
70a78d968f
Make clicking on avatar open public profile in new tab ( #10387 )
6 years ago
824dc7c6b9
[Glitch] Do not set CSRF Token when no csrf header
...
Port cc670c3234
6 years ago
36daf28215
[Glitch] Change icons of features on admin dashboard to remove bias
...
Port SCSS changes from 88a85f2574
6 years ago
f6767a00d4
[Glitch] Add `lang` attribute to statuses in web UI
...
Port JS changes from 0e730974cd
6 years ago
a1cc930335
[Glitch] Do not empty timeline of blocked users on block
...
Port 248de99443
6 years ago
1f70b51fff
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
6 years ago
f37800e097
[Glitch] Add custom closed registrations message to landing page when set
...
Port SCSS changes from b4c64dcccc
6 years ago
e97d76632d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb
Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
6 years ago
4527b357ef
Bump makara from 0.4.0 to 0.4.1 ( #10382 )
...
Bumps [makara]() from 0.4.0 to 0.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
cc670c3234
Do not set CSRF Token when no csrf header ( #10383 )
6 years ago
d5483234a8
Bump dotenv-rails from 2.7.1 to 2.7.2 ( #10381 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.1...v2.7.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1ec7d1a391
Bump nokogiri from 1.10.1 to 1.10.2 ( #10380 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
798d9a6b4a
Fix menu items that don't action ( #10379 )
6 years ago
88a85f2574
Change icons of features on admin dashboard to remove bias ( #10366 )
...
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.
Add status of timeline preview as well
Fix sample accounts changing too frequently due to wrong query
Sample accounts are intended to be sorted by popularity
6 years ago
a8bb10633d
Add `blocked_by` relationship to the REST API ( #10373 )
6 years ago
0e730974cd
Change language detector threshold from 140 characters to 4 words ( #10376 )
...
Add `lang` attribute to statuses in web UI
6 years ago
ff61c88d7e
Improve performance of list of blocked domains by caching counts ( #10374 )
6 years ago
858bc12635
Redesign profile column in web UI to match design on public pages ( #10337 )
...
* Redesign profile column in web UI to match design on public pages
* Make the tab links text bolder
6 years ago
Thibaut Girka
Aditoo17
Alex Gessner
Eugen Rochko
dependabot[bot]
slice
Hinaloe
mayaeh