glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	6f85bb754b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	6 years ago
ThibG	eb80c3924f	Allow switching between singe-option and multiple-option polls (#10603 )	6 years ago
kedama	92ced1e94b	Fix modal items cannot scroll on touch devices (#10605 )	6 years ago
ThibG	3c6f8de45a	Minor code cleanup (#10613 )	6 years ago
Yamagishi Kazutoshi	47c0af88f1	Add hi.json (#10573 )	6 years ago
partev	fe19e9d7b1	Update hy.json (#10591 )	6 years ago
jeroenpraat	f7cc05db80	Update NL (Dutch) translation (#10601 ) * Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml	6 years ago
Sho Kusano	1af37e09f3	Configrationable repository url (#10600 ) * config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started	6 years ago
Thibaut Girka	3673665b46	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Renato "Lond" Cerqueira	83420b9d41	Add new pt-br translations (#10564 )	6 years ago
Thibaut Girka	5a24934449	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Evgeny Petrov	4c19204392	i18n: Russian localization update (#10515 ) * i18n: Updated ru.json for Russian language * i18n: Updated ru.yml * Normalize ru.yml * i18n: Updated simple_form.ru.yml * i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings * Added new strings to ru.json * Deleted unused (?) string * i18n: Added recent strings (Settings refactor)	6 years ago
Eugen Rochko	a0000b9a94	Weblate translations (2019-04-10) (#10545 ) * Translated using Weblate (Occitan) Currently translated at 95.7% (780 of 815 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Greek) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (372 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Thai) Currently translated at 75.4% (288 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Slovak) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (German) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Slovak) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (Kazakh) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ * Translated using Weblate (Persian) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Kazakh) Currently translated at 99.0% (378 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ * i18n-tasks normalize * yarn manage:translations * Fix empty string in Occitan	6 years ago
Aditoo17	db70d35c3f	I18n: Final Czech translation 🇨🇿 (#10542 ) * I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff	6 years ago
Marek Ľach	aced669796	Updates the grammar of the SK translation (#10541 )	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
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
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	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
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
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
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	6e024f0d7a	Update poll remaining time just like with status timestamps (#10466 )	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	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
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
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	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	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
Alix Rossi	1ce9bd86b3	Update Corsican translations (#10418 ) * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml	6 years ago

1 2 3 4 5 ...

1728 Commits (e720f1eac2470033e995a4ba6ec087944edd4d3c)