6376 Commits (c97a40647af1130a307d93d2c5fba00d6a7eee97)

Author	SHA1	Message	Date
Eugen Rochko	c97a40647a	[Glitch] Add "why do you want to join" field to invite requests ... Port SCSS changes from 7eb05b8724 to glitch-soc	6 years ago
Thibaut Girka	cde0ac1aa7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	75ab8cef8f	Change the groupings of menu items in settings navigation (#10533) ... * Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations	6 years ago
Eugen Rochko	753bb5e701	Change HTML validator to ignore all errors except unmatched tags (#10534)	6 years ago
Eugen Rochko	6d5b05e3d5	Add invite request to pending account notification e-mail (#10528) ... Fix sorting of the pending accounts page	6 years ago
Eugen Rochko	13c1b5bac8	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
Yağızhan	6286ace752	Fixed terrible grammar and translated the most (#10527) ... The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon. I'll come back and finish the translation.	6 years ago
Hinaloe	da343470c4	Allow set the voting period to just 5 minutes (#10525) ... * Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize	6 years ago
Eugen Rochko	7eb05b8724	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Eugen Rochko	55f25ceda3	Fix permission denied bug on approve all/reject all pending accounts (#10519)	6 years ago
Eugen Rochko	403338108e	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
Quentí	5c9f6740c6	[i18n] Update and correction (#10511) ... * [i18n] Update and correction * Update oc.json * Update oc.json	6 years ago
Thibaut Girka	0405e42c4a	Add column title to “Favourited by” and “Boosted by” columns	6 years ago
ThibG	a604f766e0	Fix batch actions not working on pending accounts (#10508)	6 years ago
Thibaut Girka	85ab126f88	Fix pending accounts management	6 years ago
ashleyhull-versent	85a9a248f9	[Glitch] Duplicate values ... Port 8037fa7d2e to glitch-soc	6 years ago
Eugen Rochko	2b965f8d17	[Glitch] Port SCSS changes from "Improve blocked view of profiles" ... Port public pages SCSS changes from c84c30c542	6 years ago
Thibaut Girka	5c8f9a3220	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	c66a043591	Updated German locales (#10505) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German)	6 years ago
Alix Rossi	a5a7780ad1	i18n: Update Corsican translations (#10504)	6 years ago
Aditoo17	20040927fc	i18n: Update Czech translation (#10506)	6 years ago
Takeshi Umeda	21193ed31e	Fix config serializer regex (#10487)	6 years ago
ThibG	110dbb5286	Export and import show_reblogs together with following list (#10495) ... * Refactor imports * Export show_reblogs when exporting list of followed users * Add support for importing show_reblogs with following collection * Fix tests	6 years ago
Jeong Arm	d035f4af41	Translate Korean (#10499)	6 years ago
mayaeh	4f8beb3717	i18n: Update Japanese translations (#10494) ... * Update Japanese translations * Update Japanese translations.	6 years ago
Eugen Rochko	c84c30c542	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 0317f37c6f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 4cd944d364. * 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
Eugen Rochko	c34a7f5bd2	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
Eugen Rochko	d48f53cf1a	Fix admin validation being too strict about usernames (#10449) ... * Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase	6 years ago
Marek Ľach	1409a529dd	Improve sk translation further (#10484) ... * Further improving Slovak translation * Update sk.json	6 years ago
ashleyhull-versent	b0348d0f92	tinyfix 2: unrequired arguments (#10471) ... * unrequired argument * unrequired argument	6 years ago
marcin mikołajczak	0e7c4d0c69	i18n: Update Polish translation (#10479) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>	6 years ago
Marek Ľach	705a2b7615	Updates the Slovak translation (#10477) ... * Update sk.json * Update sk.json * Update sk.json	6 years ago
jeroenpraat	4c20f5376a	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	8037fa7d2e	Duplicate values (#10470)	6 years ago
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
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
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