f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
7251bc3853
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
f938800ef4
Revert to storing application info, and display it to the author via API
5 years ago
05415fa5d3
Make storing and displaying application used to toot opt-in
5 years ago
e2a5be6e9a
Prevent posting toots with media attachments from someone else ( #9921 )
5 years ago
64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
80d954ec10
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
9519d55332
Fix SSO authentication not working due to missing agreement boolean ( #9915 )
Fix #9906
5 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 .
5 years ago
77394156dd
Apply style for .landing-page strong ( #9892 )
5 years ago
04e2c67389
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
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.
5 years ago
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 .
5 years ago
afec6b43eb
Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
Fix crash in Direct Messages column settings
5 years ago
c30da25c5f
Fix crash in Direct Messages column settings
Fixes #892
5 years ago
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>
5 years ago
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>
5 years ago
d50e824168
Apply style for .landing-page strong ( #9892 )
5 years ago
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.
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
c30287cf7c
Bump addressable from 2.5.2 to 2.6.0 ( #9888 )
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
5 years ago
6f53c4fc79
Merge pull request #889 from ThibG/glitch-soc/merge-upstream
Merge upstream changes (v2.7.0)
5 years ago
9dfbcf941e
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
aa362ab73d
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
31e7940de5
Fix multiple workers for the same scheduled status being queueable ( #9875 )
5 years ago
6b91da97bb
Fix directory showing tags that have no currently eligible accounts ( #9872 )
5 years ago
70405db63c
Remove unused locale string ( #9873 )
5 years ago
c80b89c2a8
i18n: Update Japanese translations ( #9871 )
* Update Japanese translations.
* Delete unused translation.
5 years ago
e9cd3636c6
Fix `tootctl accounts delete` not deleting user record as well ( #9874 )
5 years ago
5145c81620
[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
Port 3b3a4d8a17
5 years ago
e9060b04d4
[Glitch] Hide floating action button on search and getting started pages
Port 30af4ee65f
5 years ago
9b5810b3e9
Allow event defaults on index for text data transfer ( #9840 )
5 years ago
a93cb340bd
[Glitch] Fix new hashtag page's items not being full-width on mobile
Port b506ce1197
5 years ago
8001a9b97b
[Glitch] Add information about how to opt-in to the directory on the directory
Port SCSS changes from a492a9bcd3
5 years ago
6dbb10c4b7
Fix slightly cropped font on settings page dropdowns when using system font ( #9839 )
5 years ago
02295257b3
[Glitch] Improve the public hashtag page
Port 8b19903559
5 years ago
3e8b623975
[Glitch] Redesign public hashtag page to use a masonry layout
Port bc642ac24b
5 years ago
d891b0b007
Update CHANGELOG.md
5 years ago
7cf85c0133
Bump version to 2.7.0
5 years ago
c3f57188ae
Weblate translations (2019-01-19) ( #9867 )
* Translated using Weblate (Serbian)
Currently translated at 85.0% (91 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* Translated using Weblate (Serbian)
Currently translated at 86.9% (93 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* Translated using Weblate (Serbian)
Currently translated at 93.6% (707 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/
* Translated using Weblate (Greek)
Currently translated at 99.9% (754 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Korean)
Currently translated at 100.0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Czech)
Currently translated at 99.9% (754 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (French)
Currently translated at 99.1% (748 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Galician)
Currently translated at 100,0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Arabic)
Currently translated at 98.9% (352 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 93.5% (100 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (French)
Currently translated at 100.0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Arabic)
Currently translated at 92.6% (699 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 94.7% (715 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Dutch)
Currently translated at 99.5% (751 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Serbian)
Currently translated at 93.5% (100 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* Translated using Weblate (Serbian)
Currently translated at 96.8% (61 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/
* Translated using Weblate (Serbian)
Currently translated at 95.6% (722 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/
* Translated using Weblate (Arabic)
Currently translated at 97.2% (104 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Latvian)
Currently translated at 16.9% (60 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/
* Translated using Weblate (Indonesian)
Currently translated at 55.6% (198 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/
* Translated using Weblate (Polish)
Currently translated at 96.8% (61 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/
* Translated using Weblate (Dutch)
Currently translated at 99.1% (106 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Asturian)
Currently translated at 48.6% (52 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/
* Translated using Weblate (Italian)
Currently translated at 82.8% (625 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Slovak)
Currently translated at 99.6% (752 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (German)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 99.9% (754 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Occitan)
Currently translated at 99.7% (753 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (753 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Occitan)
Currently translated at 99.9% (754 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (107 of 107 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (755 of 755 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (356 of 356 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* i18n-tasks normalize
* yarn manage:translations
* Fix pluralizations
* Fix inconsistent interpolation
5 years ago
9fd6443487
Add translators to AUTHORS.md ( #9865 )
5 years ago
6ca9015789
Fix error when `scheduled_at` attribute is malformed ( #9866 )
5 years ago
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
No conflicts.
5 years ago
7c3fddeab4
Change CHANGELOG.md references from pull requests to authors ( #9864 )
Add `rake repo:changelog` to do that automatically
5 years ago
57e79eb1c2
Bump to 2.7.0rc3
5 years ago
80768e2840
Fix missing account association in tombstone model ( #9857 )
5 years ago
b59818d4ab
Bump version to 2.7.0rc2 ( #9836 )
5 years ago
ThibG
Eugen Rochko
trwnh
Jeong Arm
Renato "Lond" Cerqueira
dependabot[bot]
mayaeh
tmm576
Mélanie Chauvel (ariasuni)