about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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")
2019-04-08i18n: Update Japanese translations (#10494)mayaeh
* Update Japanese translations * Update Japanese translations.
2019-04-07i18n: Update Corsican translations (#10496)Alix Rossi
* Update Corsican translation * Fix brackets typo
2019-04-07Improve blocked view of profiles (#10491)Eugen Rochko
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a. * 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
2019-04-07Add rate limit for media proxy requests (#10490)Eugen Rochko
30 per 30 minutes, like media uploads
2019-04-07I18n: Update Czech translation (#10489)Aditoo17
2019-04-07Updated German locales (#10488)koyu
2019-04-06Add batch actions for approving and rejecting pending accounts (#10469)Eugen Rochko
2019-04-06Fix admin validation being too strict about usernames (#10449)Eugen Rochko
* Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase
2019-04-06Improve sk translation further (#10484)Marek Ľach
* Further improving Slovak translation * Update sk.json
2019-04-06tinyfix 2: unrequired arguments (#10471)ashleyhull-versent
* unrequired argument * unrequired argument
2019-04-06Fix missing long description on `tootctl statuses remove` (#10482)Eugen Rochko
2019-04-06Add `tootctl emoji purge` (#10481)Eugen Rochko
Fix #10441
2019-04-06Add `tootctl accounts approve` (#10480)Eugen Rochko
2019-04-06Bump rubocop from 0.66.0 to 0.67.1 (#10475)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.1. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-06i18n: Update Polish translation (#10479)marcin mikołajczak
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
2019-04-05Updates the Slovak translation (#10477)Marek Ľach
* Update sk.json * Update sk.json * Update sk.json
2019-04-05Dutch (nl) translation (#10474)jeroenpraat
* Translation Dutch * Update activerecord.nl.yml * Update devise.nl.yml * Update nl.yml * Update nl.yml * Update devise.nl.yml * Update nl.yml
2019-04-04Fix `tootctl accounts cull` (#10460)Ben Lubar
* List the actual accounts that would have been culled during a dry run. Otherwise, the dry run mode is basically useless. * Prevent unreachable domains from inheriting the previous status code. * Update CHANGELOG.md for #10460.
2019-04-04Duplicate values (#10470)ashleyhull-versent
2019-04-04Merge pull request #981 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-04[Glitch] Update poll remaining time just like with status timestampsThibG
Port daab45d4ae000a208f251ce96334df47d894dba3 to glitch-soc
2019-04-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-04-04i18n: update Catalan translation (#10458)spla
* 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
2019-04-04Translate Korean (devise) (#10464)Jeong Arm
2019-04-04Cache featured collections, as well as outbox, followers and following (#10467)ThibG