58da5e93c0
Port search results styling to glitch-soc
6 years ago
fad29fd230
Merge pull request #973 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ce7d055d3c
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
58667072d9
Fix opacity of relationship tags ( #10411 )
6 years ago
1a7d1f4a42
I18n: Update Czech translation ( #10410 )
6 years ago
69141dca26
squashed identity proof updates ( #10375 )
6 years ago
026dd75208
Add `tootctl self-destruct` ( #10367 )
...
Fix #10305
6 years ago
bb316fafff
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
050efbc126
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
24d5b6f9e3
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
85629bf3d3
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
f1bc90ab50
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
6 years ago
f46f67d984
[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
5d41532d94
Add `tootctl search deploy` to avoid ugly rake task syntax ( #10403 )
6 years ago
08ec7435ce
Add order options to relationship manager UI ( #10404 )
6 years ago
683013756e
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
6 years ago
e86663b1da
Fix alternative relay support regression ( #10398 )
...
Fix #10324
6 years ago
319bce3d9d
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
852ca12753
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
73f5711fb8
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
6 years ago
869e58e7ed
Fix interpolations in some localizations ( #10397 )
6 years ago
11fe293e1b
Remove unused ActivityPub `@context` values depending on response ( #10378 )
...
Fix #8078
6 years ago
0418bdd71f
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
...
Revert emojimart update
6 years ago
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
6 years ago
355d384d8d
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit 49bea8c46b
6 years ago
497a958297
Revert "Fix compilation after emoji-picker change"
...
This reverts commit 8ea344fed4
6 years ago
7535c607f4
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
48230b57d2
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a91acf79b5
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
bdf4f56f9a
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9e80b34a95
[Glitch] Add a “Block & Report” button to the block confirmation dialog
...
Port 6df4a82969
6 years ago
fae53e1a39
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6df4a82969
Add a “Block & Report” button to the block confirmation dialog ( #10360 )
6 years ago
0c46bd11aa
Fix HTML validation ( #10354 )
...
* Fix HTML validation
* Report first HTML error instead on validation error
6 years ago
6f6abc369f
Make clicking on avatar open public profile in new tab ( #10387 )
6 years ago
872eab5784
[Glitch] Do not set CSRF Token when no csrf header
...
Port 68f2211f00
6 years ago
89a0fa3053
[Glitch] Change icons of features on admin dashboard to remove bias
...
Port SCSS changes from e117964325
6 years ago
614bd3f8d4
[Glitch] Add `lang` attribute to statuses in web UI
...
Port JS changes from e6cfa7ab89
6 years ago
d680c61993
[Glitch] Do not empty timeline of blocked users on block
...
Port 94aceb85ad
6 years ago
b9f314bba7
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
648cf8bfd5
[Glitch] Add custom closed registrations message to landing page when set
...
Port SCSS changes from 55a9658ad8
6 years ago
fcce135d27
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
0c1a05b281
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
68f2211f00
Do not set CSRF Token when no csrf header ( #10383 )
6 years ago
792a0f106e
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
6968ae79a0
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
186f7bcbb6
Fix menu items that don't action ( #10379 )
6 years ago
e117964325
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
9745de883b
Add `blocked_by` relationship to the REST API ( #10373 )
6 years ago
e6cfa7ab89
Change language detector threshold from 140 characters to 4 words ( #10376 )
...
Add `lang` attribute to statuses in web UI
6 years ago
Thibaut Girka