about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-02-04Fix authorized applications list page design (#9969)rinsuki
2019-02-04Use video filesize limit with gifv (#9924)rinsuki
2019-02-04change "finish tutorial" text to "finish toot-orial" (#9905)mike castleman
2019-02-04Add featured hashtags to profiles (#9755)Eugen Rochko
* Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10
2019-02-03Add option to overwrite imported data (#9962)Eugen Rochko
* Add option to overwrite imported data Fix #7465 * Add import for domain blocks
2019-02-03Bump capybara from 3.12.0 to 3.13.2 (#9935)dependabot[bot]
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>
2019-02-03Bump httplog from 1.2.0 to 1.2.1 (#9942)dependabot[bot]
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>
2019-02-03Remove redundant “options” from “Compose box options”Thibaut Girka
Thanks @ariasuni.
2019-02-03Minor description correctionsMarek Ľach
2019-02-02Allow multiple files upload through web UI, including drag & drop (#9856)tmm576
* 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
2019-02-02Re-enable ignored translations that is needed (#7842)Jeong Arm
Some of strings should be translated.
2019-02-02Make displaying application used to toot opt-in (#9897)ThibG
* Make storing and displaying application used to toot opt-in * Revert to storing application info, and display it to the author via API
2019-02-02Create Redisable#redis (#9633)ysksn
* Create Redisable * Use #redis instead of Redis.current
2019-02-02Allow most kinds of characters in URL query (fixes #8408) (#8447)Jakub Mendyk
* Allow unicode characters in URL query strings Fixes #8408 * Alternative approach to unicode support in urls Adds PoC/idea to approch this problem.
2019-02-02Add WebP support (#9879)Acid Chicken (硫酸鶏)
* Add WebP support * Remove the changes to the tooltip refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
2019-02-02Upgrade new Web Share Target API (#9963)gol-cha
* Update manifest.json for new Web Share Target API. * fix code formatting
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