about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-31Merge pull request #976 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-30Fix failing keybase-related testThibaut Girka
2019-03-30[Glitch] Fix transparent avatars showing underlying elements in avatar stack ↵Eugen Rochko
and profile Port 79227d153b86144e9a8cc73f1d4045973eabc9ef to glitch-soc
2019-03-30[Glitch] Fix search in web UI not setting a limit, restore limit of 10Eugen Rochko
Port 379c3e237fd271b91073f4b4a4a1626e84a7250f to glitch-soc, but changing the 5 limit to 10, since that's what we had previously
2019-03-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-30Remove unused code (#10426)Jeong Arm
2019-03-30Cache error 410 responses in recommended nginx configuration (#10425)Eugen Rochko
2019-03-30Bump version to 2.8.0rc1 (#10340)Eugen Rochko
Update AUTHORS.md Update CHANGELOG.md
2019-03-30Add ActivityPub representation for identity proofs (#10414)Eugen Rochko
* Add ActivityPub representation for identity proofs * Add tests
2019-03-30Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ↵Eugen Rochko
(#10413) Fix #10315 This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
2019-03-30Fix transparent avatars showing underlying elements in avatar stack and ↵Eugen Rochko
profile (#10422)
2019-03-30Fix search in web UI not setting a limit, restore limit of 5 (#10421)Eugen Rochko
The search API now supports returning more results and pagination, but until the web UI implements pagination, it makes no sense to dump so many results at once. This fix restores the behaviour before the API change
2019-03-30Add indication that you have been blocked in web UI (#10420)Eugen Rochko
2019-03-29I18n: Update Czech translation (#10419)Aditoo17
2019-03-29Add missing Korean translations (#10416)Jeong Arm
* Fix Korean translation * Add missing translation
2019-03-29Bump capybara from 3.15.0 to 3.16.0 (#10415)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.15.0...3.16.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-29Update Corsican translations (#10418)Alix Rossi
* Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml
2019-03-29l10n update: fa (#10417)Masoud Abkenar
2019-03-29[Glitch] squashed identity proof updatesAlex Gessner
Port JS from 69141dca26f8a28d3aff63387b1c8d2bba7fdfa3 to glitch-soc
2019-03-28Fix background color transition in destructive buttonsThibaut Girka
2019-03-28[Glitch] Fix opacity of relationship tagsThibG
Port 58667072d9923b17c90543550294aa9f801103d7 to glitch-soc
2019-03-28Fix left border of profile navigation tabThibaut Girka
2019-03-28Add fa-info-circle to disclaimerThibaut Girka
2019-03-28Fix double border for account disclaimerThibaut Girka
2019-03-28[Glitch] Add rel='noopener' to redesigned profile column header avatar linkslice
Port 73f5711fb8a6131f5906903dcea40a113a842669 to glitch-soc
2019-03-28[Glitch] Move the account dropdown menubar to the right, make sure it ↵ThibG
doesn't move Port a91acf79b53307ada584f449da1369c0216a24d1 to glitch-soc
2019-03-28[Glitch] Make clicking on avatar open public profile in new tabAditoo17
Port 6f6abc369f113b174fe191cf562098fe01c2eeec to glitch-soc
2019-03-28[Glitch] Fix menu items that don't actionmayaeh
Port 186f7bcbb64e289fb732272c67eae6cb59276941 to glitch-soc
2019-03-28[Glitch] Redesign profile column in web UI to match design on public pagesEugen Rochko
Port a96181f16f4ef74ce6a1efc5e893ddd87a127949 to glitch-soc
2019-03-28Fix centering on public pagesThibaut Girka
2019-03-28Fix padding and centering of display namesThibaut Girka
2019-03-28Port search results styling to glitch-socThibaut Girka
2019-03-28Merge pull request #973 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
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>