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
Yusuke Nakamura
2c12620adb
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
ThibG
4beb8d7788
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
Thibaut Girka
6e227ecb04
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
ThibG
a1519a8ef5
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
9ca21e93cc
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
56245a2a72
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
dd5bf40b97
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
a6b7c23f6f
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
0be93820f3
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
Thibaut Girka
9df1ef87c2
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
Haelwenn (lanodan) Monnier
c2fa36bbae
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
Thibaut Girka
93d98f62a8
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
KokaKiwi
f34a402a94
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
14d7ddcb1c
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
b3e68de4d2
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
d7520f8175
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
94aef563b9
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
Thibaut Girka
bfc509f44a
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
dependabot[bot]
e976a9dfbd
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
Alix Rossi
520cfde793
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]
2310dd40fa
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
dependabot[bot]
90093f1795
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
ThibG
c1cf8c1636
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
Thibaut Girka
6badf2d252
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
manuelviens
f4f22391b2
Update simple_form.fr.yml ( #10756 )
...
Remplacement des ' par des ’
2019-05-15 14:52:11 +09:00