glitchier-soc

Commit Graph

Author	SHA1	Message	Date
ThibG	3964cc964d	Merge pull request #981 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
ThibG	729b3841c3	[Glitch] Update poll remaining time just like with status timestamps Port `6e024f0d7a` to glitch-soc	6 years ago
Thibaut Girka	a835ea0e8f	Merge branch 'master' into glitch-soc/merge-upstream 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.	6 years ago
spla	f46cd7f002	i18n: update Catalan translation (#10458 ) * 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	6 years ago
Jeong Arm	e09e68b656	Translate Korean (devise) (#10464 )	6 years ago
ThibG	4fa0b331ae	Cache featured collections, as well as outbox, followers and following (#10467 )	6 years ago
Thibaut Girka	b83e693c40	Do not handle clicks in detailed status content	6 years ago
ThibG	e87214826b	Export and import `hide_notifications` alongside user mutes (#10335 ) * Export hide_notifications along with user mutes * Import hide_notifications along with muted users list * Add headers for CSV exports	6 years ago
ThibG	6e024f0d7a	Update poll remaining time just like with status timestamps (#10466 )	6 years ago
ThibG	aa7fe3101f	Hopefully fix input text selection quirks on iOS (#10463 ) Fix #10448 (hopefully)	6 years ago
Jeong Arm	7deedcc0cf	Esperanto translations (#10461 ) * Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation	6 years ago
Renato "Lond" Cerqueira	a0eaf51ad4	Re-dd PT-br translations (#10459 )	6 years ago
spla	8cc94c38cf	i18n: update catalan translations (#10455 ) * 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	6 years ago
Aditoo17	445568eff3	I18n: Improve Czech translation (#10454 )	6 years ago
dependabot[bot]	b3726cd06d	Bump i18n-tasks from 0.9.28 to 0.9.29 (#10451 ) 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>	6 years ago
dependabot[bot]	1aef2d60d7	Bump capybara from 3.16.0 to 3.16.1 (#10450 ) 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>	6 years ago
ThibG	7da934c1f5	Merge pull request #978 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Thibaut Girka	5eb2632410	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
ThibG	0317f37c6f	Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )	6 years ago
ThibG	4cd944d364	Hide blocking accounts from blocked users (#10442 ) * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit `d31affe69b`. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit `a8bb10633d`. * 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 `d31affe69b` * Refactor by adding `without_blocking` scope	6 years ago
Jeong Arm	dbabfec2ea	Simplify culling and fix race condition (#10440 )	6 years ago
ThibG	ec3dab2b7f	Fix more keybase-related test failures (#10443 )	6 years ago
slice	67cd7abbb1	Improvements to image upload validation and creation (#10431 ) * 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	6 years ago
mayaeh	0615bc56aa	i18n: Update Japanese translations (#10427 ) * Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.	6 years ago
ThibG	65930be714	Ensure request.body isn't emptied out before signature verification (#10432 ) Fixes #10429	6 years ago
slice	0aea1c0775	Add thumbnail, hero, and mascot back to Form::AdminSettings::KEYS (#10430 ) These will allow these images to be uploaded again on the admin settings page.	6 years ago
ThibG	9498b61ded	Merge pull request #976 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Thibaut Girka	f253b55bd5	Fix failing keybase-related test	6 years ago
Eugen Rochko	a547a214fd	[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile Port `9a12568a33` to glitch-soc	6 years ago
ThibG	3ce98a995e	Fix failing keybase-related test (#10428 )	6 years ago
Eugen Rochko	2393504c23	[Glitch] Fix search in web UI not setting a limit, restore limit of 10 Port `20769a332a` to glitch-soc, but changing the 5 limit to 10, since that's what we had previously	6 years ago
Thibaut Girka	99336afaff	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Jeong Arm	1289e86116	Remove unused code (#10426 )	6 years ago
Eugen Rochko	403ba71317	Cache error 410 responses in recommended nginx configuration (#10425 )	6 years ago
Eugen Rochko	2dc1f643d9	Bump version to 2.8.0rc1 (#10340 ) Update AUTHORS.md Update CHANGELOG.md	6 years ago
Eugen Rochko	a82bc7f5ae	Add ActivityPub representation for identity proofs (#10414 ) * Add ActivityPub representation for identity proofs * Add tests	6 years ago
Eugen Rochko	ed2862e249	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413 ) Fix #10315 This reverts commit `e781d842a5`.	6 years ago
Eugen Rochko	9a12568a33	Fix transparent avatars showing underlying elements in avatar stack and profile (#10422 )	6 years ago
Eugen Rochko	20769a332a	Fix search in web UI not setting a limit, restore limit of 5 (#10421 ) 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	6 years ago
Eugen Rochko	d31affe69b	Add indication that you have been blocked in web UI (#10420 )	6 years ago
Aditoo17	0c334481cc	I18n: Update Czech translation (#10419 )	6 years ago
Jeong Arm	6c39082e87	Add missing Korean translations (#10416 ) * Fix Korean translation * Add missing translation	6 years ago
dependabot[bot]	3df435ddba	Bump capybara from 3.15.0 to 3.16.0 (#10415 ) 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>	6 years ago
Alix Rossi	1ce9bd86b3	Update Corsican translations (#10418 ) * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml	6 years ago
Masoud Abkenar	c2e0b3487d	l10n update: fa (#10417 )	6 years ago
Alex Gessner	d1b617374c	[Glitch] squashed identity proof updates Port JS from `be7c92061c` to glitch-soc	6 years ago
Thibaut Girka	b29731bb10	Fix background color transition in destructive buttons	6 years ago
ThibG	4211c9b8d3	[Glitch] Fix opacity of relationship tags Port `ddd7a9e44b` to glitch-soc	6 years ago
Thibaut Girka	773c600c26	Fix left border of profile navigation tab	6 years ago
Thibaut Girka	751739337d	Add fa-info-circle to disclaimer	6 years ago

1 2 3 4 5 ...

9033 Commits (3964cc964df6ba144ca2435fcd4045071007db9b) All Branches Search

9033 Commits (3964cc964df6ba144ca2435fcd4045071007db9b)

All Branches