treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
9,365 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9365 Commits (e21662d37054ebfa4494c7c9c7165faea1d37235)

Author SHA1 Message Date
Thibaut Girka e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG 6f6382d81c Merge pull request #1054 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-19 21:52:27 +02:00
ThibG 4ad004d2ef Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Marek Ľach 7a88a5b44a sk.yml grammar update (#10786) 
* sk.yml grammar update

* bundle exec i18n-tasks normalize
 2019-05-20 02:27:32 +09:00
Hinaloe 4de9bd3870 fix `isSubmitting` prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Marek Ľach 875d18d636 Small corrections for sk translation (#10784) 2019-05-19 22:42:10 +09:00
ThibG b96cc31682 Add post-deployment migration script to delete public-boosts-of-private-toots (#10783) 2019-05-19 13:49:31 +02:00
Shlee decaffc020 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 2019-05-19 11:29:26 +02:00
Aditoo17 7660ac5008 I18n: Update Czech translation (#10781) 2019-05-19 14:39:16 +09:00
Ben Lubar 8ec309ee64 add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
Eugen Rochko 3a4761c665 Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Yusuke Nakamura bf0766358b Remove 'Weblate' from CONTRIBUTING.md (#10778) 
The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)
 2019-05-18 14:40:55 +02:00
ThibG 66430720c1 Merge pull request #1053 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-18 10:18:52 +02:00
Thibaut Girka 08a793cbd9 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
ThibG 1fec2ff78f Prevent from publicly boosting one's own private toots (#10775) 2019-05-18 00:28:51 +02:00
Thibaut Girka d48d1ed534 Minor optimization 2019-05-17 23:51:14 +02:00
Thibaut Girka b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka 3d03d084cd Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka 7aece1eec5 Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka ee3dfdf6a1 Fix autolinking, and newlines in code blocks 
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-17 23:51:14 +02:00
Thibaut Girka dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier 76d58bf63e Content-Type Dropdown: use the selected option icon for the menu 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 8a49df8ede Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi 08a981dd25 Add status content type dropdown to compose box. 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 91ab9e2e4f Add API support for setting status content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka 20c98d7a27 Serialize content-type on Delete & Redraft 2019-05-17 23:51:14 +02:00
Thibaut Girka c9696ef8a5 Add support for HTML-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 8313ee07f6 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 105f03a988 Add database row to hold status content type 2019-05-17 23:51:14 +02:00
dependabot[bot] 893176c07c Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773) 
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-17 15:23:21 +09:00
Alix Rossi b34a562b63 i18n: Update Corsican translation (#10770) 
* i18n: update Corsican translation

* Fix typo in co.yml
 2019-05-17 06:32:46 +02:00
dependabot[bot] 6b5543715e Bump capybara from 3.19.1 to 3.20.0 (#10768) 
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-16 16:13:52 +09:00
dependabot[bot] 9b63b0df57 Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769) 
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-16 15:00:24 +09:00
ThibG 38272bbeb1 Merge pull request #1049 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-15 18:44:21 +02:00
Thibaut Girka 422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
manuelviens 7898b67b3d Update simple_form.fr.yml (#10756) 
Remplacement des ' par des ’
 2019-05-15 14:52:11 +09:00
ThibG 85a991cfa7 Minor performance improvements and cleanup in formatter (#10765) 2019-05-15 06:54:06 +02:00
Neil Moore 59f6637559 Adds click-able div that expands status (#10733) (#10766) 
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
 2019-05-15 06:53:23 +02:00
ThibG f1a3135809 Record account suspend/silence time and keep track of domain blocks (#10660) 
* 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-14 19:05:02 +02:00
Marek Ľach 0aaca064a6 Update slovak simple_forms (#10763) 2019-05-14 19:55:47 +09:00
dependabot[bot] 82a5359072 Bump capybara from 3.18.0 to 3.19.1 (#10758) 
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-14 15:01:47 +09:00
dependabot[bot] 90ef9cf9b0 Bump brakeman from 4.5.0 to 4.5.1 (#10757) 
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-14 15:01:22 +09:00
dependabot[bot] e6f8b1ca09 Bump rubocop from 0.68.1 to 0.69.0 (#10762) 
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-14 15:00:58 +09:00
Thibaut Girka d8e9a04354 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka 9f0ff9b6ea Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka 6e625755a6 Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws f79d089b65 Fix some colors in light theme (#10754) 
* Fix typo in light theme

* Fix background color of empty column
 2019-05-12 05:15:42 +02:00
ThibG cfb69164ad Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG ac5e68e918 Merge pull request #1044 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 22:05:39 +02:00