about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-02-03Minor description correctionsMarek Ľach
2019-02-01Merge pull request #904 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-01Fix link color in high-contrast theme, add underlines (#9949)Eugen Rochko
Improve sorting of default themes in the dropdown
2019-02-01[Glitch] Replace unlock-alt icon with unlockThibaut Girka
Port 6513f6c953cdaad9118ea24a21f22fd2978bed28 to glitch-soc
2019-02-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-01Do not mark toots as sensitive if they don't have any media attachedThibaut Girka
2019-02-01Fix hashtag processing when sending tootsThibaut Girka
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-01More corrections for the Slovak translation (#9959)Marek Ľach
2019-02-01Fix link color in high-contrast theme, add underlines (#9949)Eugen Rochko
Improve sorting of default themes in the dropdown
2019-02-01Refactor icons in web UI to use Icon component (#9951)Eugen Rochko
* 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-01Update the Slovak translation (#9958)Marek Ľach
2019-02-01Distinguish error messaging for mystyped URLs and deleted accounts (#9957)Marek Ľach
2019-01-31Replace unlock-alt icon with unlock (#9952)Clar Charr
2019-01-30Bump rails-i18n from 5.1.2 to 5.1.3 (#9943)dependabot[bot]
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-30i18n: Update Polish translation 🇵🇱 (#9945)marcin mikołajczak
* 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-28Bumps copyright year in README.md to 2019 (#9939)Sam Schlinkert
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
2019-01-28Merge pull request #901 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md: kept our version
2019-01-28Bump version to 2.7.1 (#9932)Eugen Rochko
2019-01-28Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930)Eugen Rochko
2019-01-28Add note that contributors may request reimbursement through OpenCollective ↵Eugen Rochko
(#9933)
2019-01-27Fix SUPERUSER postgres command (#9877)Stanislas
2019-01-27Merge pull request #900 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-27[Glitch] Fix initial value of volume slider in video player and handle ↵Thibaut Girka
volume changes Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc
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>
generated by cgit-pink (git 2.37.1) at 2024-12-15 16:50:53 +0000