Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Fix #10305
|
|
Merge upstream changes
|
|
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
|
|
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>
|
|
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>
|
|
Also, fix some n+1 queries
Resolve #10365
|
|
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>
|
|
|
|
|
|
* Revert ruined translations
Regression from #10362
* yarn manage:translations
|
|
Fix #10324
|
|
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>
|
|
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>
|
|
|
|
|
|
Fix #8078
|
|
Revert emojimart update
|
|
This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
|
|
This reverts commit 49bea8c46b006d8c86285c8b1158cd700dc2eb45.
|
|
This reverts commit 8ea344fed40ae1dccf5e1b6ecfd0014128c10fb7.
|
|
Merge upstream changes
|
|
|
|
(#10390)
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
|
|
Merge upstream changes
|
|
Port 6df4a8296996181d56a22535b86830c0ab56086e to glitch-soc
|
|
|
|
|
|
* Fix HTML validation
* Report first HTML error instead on validation error
|
|
|
|
Port 68f2211f00dfa3f823ad780ed748c1af0078a0cf to glitch-soc
|
|
Port SCSS changes from e11796432514afb49f3d891f805973a37f00fcf1 to glitch-soc
|
|
Port JS changes from e6cfa7ab897ac4fd6bf9bbcafe09fc42c4cc2c5d to glitch-soc
|
|
Port 94aceb85ad638cfd02fecce1aed0be5157bcb133 to glitch-soc
|
|
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
|
|
Port SCSS changes from 55a9658ad8552804c7c585df12d46c391b84dd94 to glitch-soc
|
|
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.
|
|
Bumps [makara]() from 0.4.0 to 0.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
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>
|
|
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>
|
|
|
|
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
|
|
|
|
Add `lang` attribute to statuses in web UI
|
|
|
|
* Redesign profile column in web UI to match design on public pages
* Make the tab links text bolder
|