about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-28Fix opacity of relationship tags (#10411)ThibG
2019-03-28I18n: Update Czech translation (#10410)Aditoo17
2019-03-28squashed identity proof updates (#10375)Alex Gessner
2019-03-28Add `tootctl self-destruct` (#10367)Eugen Rochko
Fix #10305
2019-03-28Merge pull request #970 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
2019-03-28Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406)dependabot[bot]
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>
2019-03-28Bump rails from 5.2.2.1 to 5.2.3 (#10407)dependabot[bot]
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>
2019-03-28Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)Eugen Rochko
Also, fix some n+1 queries Resolve #10365
2019-03-28[Security] Bump devise from 4.5.0 to 4.6.2 (#10394)dependabot[bot]
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>
2019-03-28Add `tootctl search deploy` to avoid ugly rake task syntax (#10403)Eugen Rochko
2019-03-28Add order options to relationship manager UI (#10404)Eugen Rochko
2019-03-28Revert locales touched by automated translations (#10399)Eugen Rochko
* Revert ruined translations Regression from #10362 * yarn manage:translations
2019-03-27Fix alternative relay support regression (#10398)Eugen Rochko
Fix #10324
2019-03-27Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396)dependabot[bot]
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>
2019-03-27Bump bootsnap from 1.4.1 to 1.4.2 (#10395)dependabot[bot]
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>
2019-03-27Add rel='noopener' to redesigned profile column header avatar link (#10393)slice
2019-03-27Fix interpolations in some localizations (#10397)Aditoo17
2019-03-27Remove unused ActivityPub `@context` values depending on response (#10378)Eugen Rochko
Fix #8078
2019-03-27Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimartThibG
Revert emojimart update
2019-03-27Revert "fix: update to emoji-mart 2.10.0 (#10281)"Thibaut Girka
This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
2019-03-27Revert "[Glitch] fix: update to emoji-mart 2.10.0"Thibaut Girka
This reverts commit 49bea8c46b006d8c86285c8b1158cd700dc2eb45.
2019-03-27Revert "Fix compilation after emoji-picker change"Thibaut Girka
This reverts commit 8ea344fed40ae1dccf5e1b6ecfd0014128c10fb7.
2019-03-27Merge pull request #968 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-26Move the account dropdown menubar to the right, make sure it doesn't move ↵ThibG
(#10390) * Move the account dropdown menubar to the right, make sure it doesn't move * Fix margin
2019-03-26Merge pull request #966 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-26[Glitch] Add a “Block & Report” button to the block confirmation dialogThibG
Port 6df4a8296996181d56a22535b86830c0ab56086e to glitch-soc
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-26Add a “Block & Report” button to the block confirmation dialog (#10360)ThibG
2019-03-26Fix HTML validation (#10354)ThibG
* Fix HTML validation * Report first HTML error instead on validation error
2019-03-26Make clicking on avatar open public profile in new tab (#10387)Aditoo17
2019-03-26[Glitch] Do not set CSRF Token when no csrf headerHinaloe
Port 68f2211f00dfa3f823ad780ed748c1af0078a0cf to glitch-soc
2019-03-26[Glitch] Change icons of features on admin dashboard to remove biasEugen Rochko
Port SCSS changes from e11796432514afb49f3d891f805973a37f00fcf1 to glitch-soc
2019-03-26[Glitch] Add `lang` attribute to statuses in web UIEugen Rochko
Port JS changes from e6cfa7ab897ac4fd6bf9bbcafe09fc42c4cc2c5d to glitch-soc
2019-03-26[Glitch] Do not empty timeline of blocked users on blockThibG
Port 94aceb85ad638cfd02fecce1aed0be5157bcb133 to glitch-soc
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
2019-03-26[Glitch] Add custom closed registrations message to landing page when setEugen Rochko
Port SCSS changes from 55a9658ad8552804c7c585df12d46c391b84dd94 to glitch-soc
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-03-26Bump makara from 0.4.0 to 0.4.1 (#10382)dependabot[bot]
Bumps [makara]() from 0.4.0 to 0.4.1. Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-26Do not set CSRF Token when no csrf header (#10383)Hinaloe
2019-03-26Bump dotenv-rails from 2.7.1 to 2.7.2 (#10381)dependabot[bot]
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>
2019-03-26Bump nokogiri from 1.10.1 to 1.10.2 (#10380)dependabot[bot]
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>
2019-03-26Fix menu items that don't action (#10379)mayaeh
2019-03-26Change icons of features on admin dashboard to remove bias (#10366)Eugen Rochko
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
2019-03-26Add `blocked_by` relationship to the REST API (#10373)Eugen Rochko
2019-03-26Change language detector threshold from 140 characters to 4 words (#10376)Eugen Rochko
Add `lang` attribute to statuses in web UI
2019-03-26Improve performance of list of blocked domains by caching counts (#10374)Eugen Rochko
2019-03-26Redesign profile column in web UI to match design on public pages (#10337)Eugen Rochko
* Redesign profile column in web UI to match design on public pages * Make the tab links text bolder
generated by cgit-pink (git 2.37.1) at 2024-11-26 18:10:06 +0000