d14c276e58
Add option to overwrite imported data ( #9962 )
...
* Add option to overwrite imported data
Fix #7465
* Add import for domain blocks
6 years ago
c5071f2d78
Bump capybara from 3.12.0 to 3.13.2 ( #9935 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.12.0 to 3.13.2.
- [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.12.0...3.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7e33d6d192
Bump httplog from 1.2.0 to 1.2.1 ( #9942 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c9d261753a
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni .
6 years ago
a0a8203a0b
Minor description corrections
6 years ago
750c67660d
Allow multiple files upload through web UI, including drag & drop ( #9856 )
...
* Allow drag and drop uploads of multiple files to compose
* Calculate aggregate upload progress for single action
* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
6 years ago
582f86ab32
Re-enable ignored translations that is needed ( #7842 )
...
Some of strings should be translated.
6 years ago
ed30110618
Make displaying application used to toot opt-in ( #9897 )
...
* Make storing and displaying application used to toot opt-in
* Revert to storing application info, and display it to the author via API
6 years ago
bcfff65195
Create Redisable#redis ( #9633 )
...
* Create Redisable
* Use #redis instead of Redis.current
6 years ago
6a5e3da6b0
Allow most kinds of characters in URL query ( fixes #8408 ) ( #8447 )
...
* Allow unicode characters in URL query strings
Fixes #8408
* Alternative approach to unicode support in urls
Adds PoC/idea to approch this problem.
6 years ago
5092d17f29
Add WebP support ( #9879 )
...
* Add WebP support
* Remove the changes to the tooltip
refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
6 years ago
b253d3e0c2
Upgrade new Web Share Target API ( #9963 )
...
* Update manifest.json for new Web Share Target API.
* fix code formatting
6 years ago
1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
663593b508
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
6 years ago
2e93f87c9f
[Glitch] Replace unlock-alt icon with unlock
...
Port 6513f6c953
6 years ago
e87bd6d94a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
Two changes too close to each other, took both changes
6 years ago
f611da4899
Do not mark toots as sensitive if they don't have any media attached
6 years ago
762e4fdf55
Fix hashtag processing when sending toots
...
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
6 years ago
3de63b3c35
More corrections for the Slovak translation ( #9959 )
6 years ago
ad8c71c985
Fix link color in high-contrast theme, add underlines ( #9949 )
...
Improve sorting of default themes in the dropdown
6 years ago
1f95190202
Refactor icons in web UI to use Icon component ( #9951 )
...
* Refactor uses of icons to an Icon component in web UI
* Refactor options passed to the Icon component
* Make tests work with absolute component paths
6 years ago
3383ed7573
Update the Slovak translation ( #9958 )
6 years ago
0167659f5f
Distinguish error messaging for mystyped URLs and deleted accounts ( #9957 )
6 years ago
6513f6c953
Replace unlock-alt icon with unlock ( #9952 )
6 years ago
6c513c75ef
Bump rails-i18n from 5.1.2 to 5.1.3 ( #9943 )
...
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n ) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases )
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md )
- [Commits](https://github.com/svenfuchs/rails-i18n/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4079b831e6
i18n: Update Polish translation 🇵🇱 ( #9945 )
...
* Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* normalize
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* inconsistentInterpolations--
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
7e81bca500
Bumps copyright year in README.md to 2019 ( #9939 )
...
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
6 years ago
48d00ac0d9
Merge pull request #901 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
42713b9710
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md: kept our version
6 years ago
28866d329b
Bump version to 2.7.1 ( #9932 )
6 years ago
5d312ef9c7
Fix slow fallback of CopyAccountStats migration setting stats to 0 ( #9930 )
6 years ago
d4300c3b98
Add note that contributors may request reimbursement through OpenCollective ( #9933 )
6 years ago
01bc2f84a9
Fix SUPERUSER postgres command ( #9877 )
6 years ago
e488faaa4a
Merge pull request #900 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
f35d790480
[Glitch] Fix initial value of volume slider in video player and handle volume changes
...
Port a53dcaa298
6 years ago
72bab194ad
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a53dcaa298
Fix initial value of volume slider in video player and handle volume changes ( #9929 )
...
* Fix initial value of volume slider in video player and handle volume changes
* Clean up dead/incorrect code
6 years ago
ec5bd8b8bb
Implement missing hotkeys for notifications ( #9927 )
6 years ago
f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
7251bc3853
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
f938800ef4
Revert to storing application info, and display it to the author via API
6 years ago
05415fa5d3
Make storing and displaying application used to toot opt-in
6 years ago
e2a5be6e9a
Prevent posting toots with media attachments from someone else ( #9921 )
6 years ago
64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
80d954ec10
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9519d55332
Fix SSO authentication not working due to missing agreement boolean ( #9915 )
...
Fix #9906
6 years ago
8ef0498f1c
Fix Firefox scrollbar color regression in #9210 ( #9908 )
...
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210 .
6 years ago
77394156dd
Apply style for .landing-page strong ( #9892 )
6 years ago
04e2c67389
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko