about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-04-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10Bump version to 2.8.0 (#10550)Eugen Rochko
2019-04-10Merge pull request #985 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-10[i18n] Update for Occitan language (#10548)Quentí
* Update activerecord.oc.yml * Update simple_form.oc.yml * Fix typo * Update simple_form.oc.yml * Remove trailing whitespace
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10i18n: Russian localization update (#10515)Evgeny Petrov
* 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)
2019-04-10Fix Keybase verification using wrong domain for remote accounts (#10547)Eugen Rochko
2019-04-10Weblate translations (2019-04-10) (#10545)Eugen Rochko
* 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
2019-04-10increase allowable length of remote proof username (#10546)Alex Gessner
2019-04-10compare usernames case-insensitively on new proof creation flow (#10544)Alex Gessner
* compare usernames case-insensitively on new proof creation flow * Fix code style issue
2019-04-10i18n: Update Japanese translations (#10536)mayaeh
* run i18n-tasks add-missing * Update Japanese translations.
2019-04-10I18n: Add one more string (#10543)Aditoo17
2019-04-10I18n: Final Czech translation 🇨🇿 (#10542)Aditoo17
* I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff
2019-04-10Updates the grammar of the SK translation (#10541)Marek Ľach
2019-04-10Updated German translation (#10539)koyu
* Updated German locales * Added account approval locales (German) * Updated JSON locales (German) * Updated German translation * Fixed grammar error (German) * New strings and adjustments (German)
2019-04-10Translation - Korean (#10540)Jeong Arm
2019-04-10i18n: Update Corsican translations (#10538)Alix Rossi
2019-04-10[Glitch] Fix glitched out "not found" message for non-existing profiles in ↵Eugen Rochko
web UI Port 56f29c38b603a98e7b9715c48de022106d8da073 to glitch-soc
2019-04-10[Glitch] Add "why do you want to join" field to invite requestsEugen Rochko
Port SCSS changes from 8b69a66380bbe32127e717ca2d79244392b7d2b6 to glitch-soc
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-04-10Bump version to 2.8.0rc3 (#10535)Eugen Rochko
2019-04-10Change the groupings of menu items in settings navigation (#10533)Eugen Rochko
* Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations
2019-04-10Change HTML validator to ignore all errors except unmatched tags (#10534)Eugen Rochko
2019-04-10Add invite request to pending account notification e-mail (#10528)Eugen Rochko
Fix sorting of the pending accounts page
2019-04-10Add preference to disable e-mails about new pending accounts (#10529)Eugen Rochko
2019-04-09Fixed terrible grammar and translated the most (#10527)Yağızhan
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.
2019-04-09Allow set the voting period to just 5 minutes (#10525)Hinaloe
* Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize
2019-04-09Add "why do you want to join" field to invite requests (#10524)Eugen Rochko
* 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
2019-04-09Bump hamlit-rails from 0.2.2 to 0.2.3 (#10522)dependabot[bot]
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09Bump bootsnap from 1.4.2 to 1.4.3 (#10523)dependabot[bot]
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09Fix permission denied bug on approve all/reject all pending accounts (#10519)Eugen Rochko
2019-04-09Bump version to 2.8.0rc2 (#10501)Eugen Rochko
2019-04-09Fix glitched out "not found" message for non-existing profiles in web UI ↵Eugen Rochko
(#10517)
2019-04-09[i18n] Update and correction (#10511)Quentí
* [i18n] Update and correction * Update oc.json * Update oc.json
2019-04-08Add column title to “Favourited by” and “Boosted by” columnsThibaut Girka
2019-04-08i18n: Update Corsican translations (#10510)Alix Rossi
* i18n: Update Corsican translations * i18n: Update Corsican translations
2019-04-08Fix batch actions not working on pending accounts (#10508)ThibG
2019-04-08Merge pull request #983 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-08Fix pending accounts managementThibaut Girka
2019-04-08[Glitch] Duplicate valuesashleyhull-versent
Port bd365cc38bbdcfe69f333525d37f44bbbaf1d62c to glitch-soc
2019-04-08[Glitch] Port SCSS changes from "Improve blocked view of profiles"Eugen Rochko
Port public pages SCSS changes from 67b3b62b98b89f24097a2757e42bc94f1bce123c
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-08Updated German locales (#10505)koyu
* Updated German locales * Added account approval locales (German) * Updated JSON locales (German)
2019-04-08i18n: Update Corsican translations (#10504)Alix Rossi
2019-04-08i18n: Update Czech translation (#10506)Aditoo17
2019-04-08Fix config serializer regex (#10487)Takeshi Umeda
2019-04-08Add `tootctl accounts reset-relationships` (#10483)Takeshi Umeda
* Add `tootctl accounts reset` * Rename reset to reset-relationships * Improve command description
2019-04-08Export and import show_reblogs together with following list (#10495)ThibG
* Refactor imports * Export show_reblogs when exporting list of followed users * Add support for importing show_reblogs with following collection * Fix tests
2019-04-08Translate Korean (#10499)Jeong Arm
2019-04-08Updated french translations (#10498)Hugo "Slaynash" Flores
* updated "Invalid email or password" french translation * Updated FR translations ("instance" in now "serveur")
generated by cgit-pink (git 2.37.1) at 2024-11-09 19:07:15 +0000