about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-27Fix initial value of volume slider in video player and handle volume changes ↵ThibG
(#9929) * Fix initial value of volume slider in video player and handle volume changes * Clean up dead/incorrect code
2019-01-27Implement missing hotkeys for notifications (#9927)ThibG
2019-01-27Merge pull request #899 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-27Revert to storing application info, and display it to the author via APIThibaut Girka
2019-01-27Make storing and displaying application used to toot opt-inThibaut Girka
2019-01-26Prevent posting toots with media attachments from someone else (#9921)ThibG
2019-01-26Merge pull request #897 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-25Merge pull request #896 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-25Fix SSO authentication not working due to missing agreement boolean (#9915)Eugen Rochko
Fix #9906
2019-01-25Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
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-25Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-24Rescue SSL error in verify link service (#9914)Renato "Lond" Cerqueira
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-24Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
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-23Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crashThibG
Fix crash in Direct Messages column settings
2019-01-23Fix crash in Direct Messages column settingsThibaut Girka
Fixes #892
2019-01-22Bump oj from 3.7.7 to 3.7.8 (#9900)dependabot[bot]
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-22Bump rubocop from 0.63.0 to 0.63.1 (#9899)dependabot[bot]
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-21Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-21Fix scheduled toot with media immediately creating a toot (#9894)ThibG
* 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-21Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)dependabot[bot]
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-21Bump pundit from 2.0.0 to 2.0.1 (#9890)dependabot[bot]
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-21Bump rspec-rails from 3.8.1 to 3.8.2 (#9889)dependabot[bot]
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-21Bump addressable from 2.5.2 to 2.6.0 (#9888)dependabot[bot]
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>
2019-01-21Merge pull request #889 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes (v2.7.0)
2019-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-20Merge pull request #888 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-20Fix multiple workers for the same scheduled status being queueable (#9875)Eugen Rochko
2019-01-20Fix directory showing tags that have no currently eligible accounts (#9872)Eugen Rochko
2019-01-20Remove unused locale string (#9873)Eugen Rochko
2019-01-20i18n: Update Japanese translations (#9871)mayaeh
* Update Japanese translations. * Delete unused translation.
2019-01-20Fix `tootctl accounts delete` not deleting user record as well (#9874)Eugen Rochko
2019-01-20[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width ↵Thibaut Girka
compensation Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
2019-01-20[Glitch] Hide floating action button on search and getting started pagesThibaut Girka
Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc
2019-01-20Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-20[Glitch] Fix new hashtag page's items not being full-width on mobileThibaut Girka
Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc
2019-01-20[Glitch] Add information about how to opt-in to the directory on the directoryThibaut Girka
Port SCSS changes from a492a9bcd355d4f0998990905177ac4f9699cc3c to glitch-soc
2019-01-20Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-20[Glitch] Improve the public hashtag pageThibaut Girka
Port 8b1990355974543542544e56d2046bc0c9c8716b to glitch-soc
2019-01-20[Glitch] Redesign public hashtag page to use a masonry layoutThibaut Girka
Port bc642ac24b49c14dca382e7aabbc16130293d2f4 to glitch flavour
2019-01-20Update CHANGELOG.mdEugen Rochko
2019-01-20Bump version to 2.7.0Eugen Rochko
2019-01-19Weblate translations (2019-01-19) (#9867)Eugen Rochko
* 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
2019-01-19Add translators to AUTHORS.md (#9865)Eugen Rochko
2019-01-19Fix error when `scheduled_at` attribute is malformed (#9866)Eugen Rochko
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-19Change CHANGELOG.md references from pull requests to authors (#9864)Eugen Rochko
Add `rake repo:changelog` to do that automatically
generated by cgit-pink (git 2.37.1) at 2024-11-30 02:49:54 +0000