1709 Commits (f5f6d23d554b3a81020feebc65188cc64f644095)

Author	SHA1	Message	Date
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
koyu	3f036ac6b8	Updated German locales (#10505) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German)	6 years ago
Alix Rossi	6e111152e0	i18n: Update Corsican translations (#10504)	6 years ago
Aditoo17	ae58bbd705	i18n: Update Czech translation (#10506)	6 years ago
Jeong Arm	619bbc23ef	Translate Korean (#10499)	6 years ago
mayaeh	a265696991	i18n: Update Japanese translations (#10494) ... * Update Japanese translations * Update Japanese translations.	6 years ago
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a1. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	6 years ago
Marek Ľach	78a8a99b0b	Improve sk translation further (#10484) ... * Further improving Slovak translation * Update sk.json	6 years ago
ashleyhull-versent	2b68fe5442	tinyfix 2: unrequired arguments (#10471) ... * unrequired argument * unrequired argument	6 years ago
marcin mikołajczak	4be7952892	i18n: Update Polish translation (#10479) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>	6 years ago
Marek Ľach	e0137c5884	Updates the Slovak translation (#10477) ... * Update sk.json * Update sk.json * Update sk.json	6 years ago
jeroenpraat	48a52c9372	Dutch (nl) translation (#10474) ... * Translation Dutch * Update activerecord.nl.yml * Update devise.nl.yml * Update nl.yml * Update nl.yml * Update devise.nl.yml * Update nl.yml	6 years ago
ashleyhull-versent	bd365cc38b	Duplicate values (#10470)	6 years ago
Thibaut Girka	1682ac5717	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	26bd9fa508	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
ThibG	daab45d4ae	Update poll remaining time just like with status timestamps (#10466)	6 years ago
Jeong Arm	f984f2ea4e	Esperanto translations (#10461) ... * Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation	6 years ago
Renato "Lond" Cerqueira	83190fffc7	Re-dd PT-br translations (#10459)	6 years ago
spla	3f75b0929e	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	0705e4b177	I18n: Improve Czech translation (#10454)	6 years ago
Thibaut Girka	12dae9d583	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
ThibG	62bafa20a1	Hide blocking accounts from blocked users (#10442) ... * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b. * 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 bd02ec6daa * Refactor by adding `without_blocking` scope	6 years ago
mayaeh	abdf225353	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
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Jeong Arm	51625d3423	Remove unused code (#10426)	6 years ago
Eugen Rochko	8fb69f1366	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) ... Fix #10315 This reverts commit db06b25376.	6 years ago
Eugen Rochko	379c3e237f	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	bd02ec6daa	Add indication that you have been blocked in web UI (#10420)	6 years ago
Aditoo17	1d62b88f8d	I18n: Update Czech translation (#10419)	6 years ago
Jeong Arm	e5d79d1635	Add missing Korean translations (#10416) ... * Fix Korean translation * Add missing translation	6 years ago
Alix Rossi	34090a85e4	Update Corsican translations (#10418) ... * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml	6 years ago
Masoud Abkenar	2a326940e8	l10n update: fa (#10417)	6 years ago
Thibaut Girka	ce7d055d3c	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Aditoo17	1a7d1f4a42	I18n: Update Czech translation (#10410)	6 years ago
Alex Gessner	69141dca26	squashed identity proof updates (#10375)	6 years ago
Thibaut Girka	050efbc126	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	6 years ago
Eugen Rochko	683013756e	Revert locales touched by automated translations (#10399) ... * Revert ruined translations Regression from #10362 * yarn manage:translations	6 years ago
slice	73f5711fb8	Add rel='noopener' to redesigned profile column header avatar link (#10393)	6 years ago
Thibaut Girka	3a2f646cb1	Revert "fix: update to emoji-mart 2.10.0 (#10281)" ... This reverts commit db06b25376.	6 years ago
Thibaut Girka	48230b57d2	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	a91acf79b5	Move the account dropdown menubar to the right, make sure it doesn't move (#10390) ... * Move the account dropdown menubar to the right, make sure it doesn't move * Fix margin	6 years ago
Thibaut Girka	fae53e1a39	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	6df4a82969	Add a “Block & Report” button to the block confirmation dialog (#10360)	6 years ago
Aditoo17	6f6abc369f	Make clicking on avatar open public profile in new tab (#10387)	6 years ago
Thibaut Girka	b9f314bba7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	6 years ago
Hinaloe	68f2211f00	Do not set CSRF Token when no csrf header (#10383)	6 years ago
mayaeh	186f7bcbb6	Fix menu items that don't action (#10379)	6 years ago
Eugen Rochko	e6cfa7ab89	Change language detector threshold from 140 characters to 4 words (#10376) ... Add `lang` attribute to statuses in web UI	6 years ago
Eugen Rochko	a96181f16f	Redesign profile column in web UI to match design on public pages (#10337) ... * Redesign profile column in web UI to match design on public pages * Make the tab links text bolder	6 years ago
ThibG	94aceb85ad	Do not empty timeline of blocked users on block (#10359) ... Fixes #10226	6 years ago