about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-04-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.
2019-04-04i18n: update Catalan translation (#10458)spla
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations
2019-04-04Translate Korean (devise) (#10464)Jeong Arm
2019-04-04Cache featured collections, as well as outbox, followers and following (#10467)ThibG
2019-04-03Export and import `hide_notifications` alongside user mutes (#10335)ThibG
* Export hide_notifications along with user mutes * Import hide_notifications along with muted users list * Add headers for CSV exports
2019-04-03Update poll remaining time just like with status timestamps (#10466)ThibG
2019-04-03Hopefully fix input text selection quirks on iOS (#10463)ThibG
Fix #10448 (hopefully)
2019-04-03Esperanto translations (#10461)Jeong Arm
* Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation
2019-04-03Re-dd PT-br translations (#10459)Renato "Lond" Cerqueira
2019-04-03i18n: update catalan translations (#10455)spla
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations
2019-04-03I18n: Improve Czech translation (#10454)Aditoo17
2019-04-02Bump i18n-tasks from 0.9.28 to 0.9.29 (#10451)dependabot[bot]
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02Bump capybara from 3.16.0 to 3.16.1 (#10450)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.1. - [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.16.0...3.16.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-01Merge pull request #978 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
2019-04-01Fix filtering of favourited_by, reblogged_by, followers and following (#10447)ThibG
2019-04-01Hide blocking accounts from blocked users (#10442)ThibG
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa974dcd3231e73826a56e08dbeedadc * Refactor by adding `without_blocking` scope
2019-04-01Simplify culling and fix race condition (#10440)Jeong Arm
2019-04-01Fix more keybase-related test failures (#10443)ThibG
2019-04-01Improvements to image upload validation and creation (#10431)slice
* Check if image value is nil? before creating an image Check if uploaded images aren't nil before creating SiteUpload models for them. * Validate presence of file in SiteUpload * Fix file presence validation * Fabricate SiteUpload#file * Add link to Creative Commons license
2019-04-01i18n: Update Japanese translations (#10427)mayaeh
* Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.
2019-03-31Ensure request.body isn't emptied out before signature verification (#10432)ThibG
Fixes #10429
2019-03-31Add thumbnail, hero, and mascot back to Form::AdminSettings::KEYS (#10430)slice
These will allow these images to be uploaded again on the admin settings page.
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-30Fix failing keybase-related test (#10428)ThibG
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
generated by cgit-pink (git 2.37.1) at 2024-07-05 17:59:20 +0000