about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-05-20Refactor contentType selection in glitch composerThibaut Girka
2019-05-19Use glitch-soc's poll component instead of upstream'sThibaut Girka
2019-05-19Merge pull request #1055 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Merge pull request #1054 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-19Fix “invited by” not showing up for invited accounts in admin interface ↵ThibG
(#10791)
2019-05-20sk.yml grammar update (#10786)Marek Ľach
* sk.yml grammar update * bundle exec i18n-tasks normalize
2019-05-19fix `isSubmitting` prop case (#10785)Hinaloe
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Small corrections for sk translation (#10784)Marek Ľach
2019-05-19Add post-deployment migration script to delete ↵ThibG
public-boosts-of-private-toots (#10783)
2019-05-19Upgrade redis in docker-compose.yml from 4 to 5 (#9063)Shlee
2019-05-19I18n: Update Czech translation (#10781)Aditoo17
2019-05-18add og:image:alt for media attachments in embeds (#10779)Ben Lubar
2019-05-18Change poll options to alphabetic letters when status text is hidden (#10685)Eugen Rochko
Fix #10569
2019-05-18Remove 'Weblate' from CONTRIBUTING.md (#10778)Yusuke Nakamura
The mastodon project no longer used weblate to translate UI sentences. (ref #10385)
2019-05-18Merge pull request #1053 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18Prevent from publicly boosting one's own private toots (#10775)ThibG
2019-05-17Minor optimizationThibaut Girka
2019-05-17Export fallback content type and use it as default in WebUIThibaut Girka
2019-05-17Properly escape HTML in code blocksThibaut Girka
2019-05-17Add option for default toot content-typeThibaut Girka
2019-05-17Fix autolinking, and newlines in code blocksThibaut Girka
Autolinking is now performed *after* the Markdown pass, by replacing HTML tags with zero-width spaces and running the twitter-text extractor as usual, except it does not auto-link URLs to avoid links in links…
2019-05-17Hide content-type dropdown by defaultThibaut Girka
2019-05-17Content-Type Dropdown: use the selected option icon for the menuHaelwenn (lanodan) Monnier
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17Support proper content-type in Delete & RedraftThibaut Girka
2019-05-17Add status content type dropdown to compose box.KokaKiwi
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17Add API support for setting status content-typeThibaut Girka
2019-05-17Serialize content-type on Delete & RedraftThibaut Girka
2019-05-17Add support for HTML-formatted tootsThibaut Girka
2019-05-17Add support for markdown-formatted tootsThibaut Girka
2019-05-17Add database row to hold status content typeThibaut Girka
2019-05-17Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.38.0...v1.39.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-17i18n: Update Corsican translation (#10770)Alix Rossi
* i18n: update Corsican translation * Fix typo in co.yml
2019-05-16Bump capybara from 3.19.1 to 3.20.0 (#10768)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.19.1...3.20.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-16Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.1...v1.38.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-15Merge pull request #1049 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-15Update simple_form.fr.yml (#10756)manuelviens
Remplacement des ' par des ’
2019-05-15Minor performance improvements and cleanup in formatter (#10765)ThibG
2019-05-15Adds click-able div that expands status (#10733) (#10766)Neil Moore
The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status.
2019-05-14Record account suspend/silence time and keep track of domain blocks (#10660)ThibG
* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
2019-05-14Update slovak simple_forms (#10763)Marek Ľach
2019-05-14Bump capybara from 3.18.0 to 3.19.1 (#10758)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-14Bump brakeman from 4.5.0 to 4.5.1 (#10757)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.0...v4.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-14Bump rubocop from 0.68.1 to 0.69.0 (#10762)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0. - [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.68.1...v0.69.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-13Fix rich text style in reply indicatorThibaut Girka
2019-05-13Fix rich text styling on public pagesThibaut Girka
2019-05-12Fix text color of some formatted elements in notificationsThibaut Girka