Commit Graph

8515 Commits

Author SHA1 Message Date
Marek Ľach a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
ThibG 1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-02-01 18:24:36 +01:00
Eugen Rochko 663593b508 Fix link color in high-contrast theme, add underlines (#9949)
Improve sorting of default themes in the dropdown
2019-02-01 16:23:13 +01:00
Thibaut Girka 2e93f87c9f [Glitch] Replace unlock-alt icon with unlock
Port 6513f6c953 to glitch-soc
2019-02-01 16:15:44 +01:00
Thibaut Girka 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
2019-02-01 16:12:20 +01:00
Thibaut Girka f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka 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.
2019-02-01 12:37:28 +01:00
Marek Ľach 3de63b3c35 More corrections for the Slovak translation (#9959) 2019-02-01 09:18:40 +09:00
Eugen Rochko ad8c71c985
Fix link color in high-contrast theme, add underlines (#9949)
Improve sorting of default themes in the dropdown
2019-02-01 00:15:38 +01:00
Eugen Rochko 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
2019-02-01 00:14:05 +01:00
Marek Ľach 3383ed7573 Update the Slovak translation (#9958) 2019-02-01 08:13:47 +09:00
Marek Ľach 0167659f5f Distinguish error messaging for mystyped URLs and deleted accounts (#9957) 2019-02-01 00:07:08 +01:00
Clar Charr 6513f6c953 Replace unlock-alt icon with unlock (#9952) 2019-01-31 13:45:15 +01:00
dependabot[bot] 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>
2019-01-30 04:22:59 +09:00
marcin mikołajczak 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>
2019-01-30 04:21:15 +09:00
Sam Schlinkert 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.
2019-01-28 22:57:42 +01:00
ThibG 48d00ac0d9
Merge pull request #901 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-28 21:40:38 +01:00
Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
Eugen Rochko 28866d329b
Bump version to 2.7.1 (#9932) 2019-01-28 04:24:12 +01:00
Eugen Rochko 5d312ef9c7
Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930) 2019-01-28 04:18:35 +01:00
Eugen Rochko d4300c3b98
Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Stanislas 01bc2f84a9 Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
ThibG e488faaa4a
Merge pull request #900 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-27 22:24:29 +01:00
Thibaut Girka f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes
Port a53dcaa298 to glitch-soc
2019-01-27 22:02:59 +01:00
Thibaut Girka 72bab194ad Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG 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
2019-01-27 21:18:15 +01:00
ThibG ec5bd8b8bb Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
ThibG f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-27 14:23:24 +01:00
Thibaut Girka 7251bc3853 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka f938800ef4 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka 05415fa5d3 Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG e2a5be6e9a Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
ThibG 64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-26 18:47:48 +01:00
Thibaut Girka 80d954ec10 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
ThibG 270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-25 22:42:21 +01:00
Eugen Rochko 9519d55332
Fix SSO authentication not working due to missing agreement boolean (#9915)
Fix #9906
2019-01-25 12:36:54 +01:00
trwnh 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.
2019-01-25 11:48:27 +01:00
Jeong Arm 77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka 04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira e1ec3a9f09 Rescue SSL error in verify link service (#9914)
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
trwnh c87863bdd1 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.
2019-01-24 13:32:23 +01:00
ThibG afec6b43eb
Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
Fix crash in Direct Messages column settings
2019-01-23 18:53:36 +01:00
Thibaut Girka c30da25c5f Fix crash in Direct Messages column settings
Fixes #892
2019-01-23 18:29:18 +01:00
dependabot[bot] 306e1572e8 Bump oj from 3.7.7 to 3.7.8 (#9900)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.7...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:33:20 +09:00
dependabot[bot] 2eae2d271f Bump rubocop from 0.63.0 to 0.63.1 (#9899)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.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.63.0...v0.63.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:32:49 +09:00
Jeong Arm d50e824168 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
ThibG 061feb63ed Fix scheduled toot with media immediately creating a toot (#9894)
* Add test for not persisting status when attaching media to scheduled toot

* Prevent status used for validation from being persisted to the database

Fixes #9893

Thanks to tateisu for the help investigating this.
2019-01-21 20:03:04 +01:00
dependabot[bot] dd8a00a3cc Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:52 +09:00
dependabot[bot] 3fc0abf8dd Bump pundit from 2.0.0 to 2.0.1 (#9890)
Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:00 +09:00
dependabot[bot] c59b45bf3a Bump rspec-rails from 3.8.1 to 3.8.2 (#9889)
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:37 +09:00