about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-08-13Merge branch 'glitch' into productionReverite
2019-08-12Honor `system_emoji_font` in the Emoji PickerThibaut Girka
2019-08-12Add option to disable emoji replacementsThibaut Girka
Fixes #647 The option is found in `/settings` (because that was easier to write it this way) but only affects the glitch-soc front-end.
2019-08-12Merge pull request #1196 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-12Revert bcrypt to 3.1.12 (#11555)ThibG
2019-08-12[Glitch] Fix "cancel follow request" button having unreadable text in web UIEugen Rochko
Port e823b492147a7d7fca7a5a91dacc201fa2064e2c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-12Bump sass from 1.22.7 to 1.22.9 (#11545)dependabot-preview[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.7 to 1.22.9. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.22.7...1.22.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump parallel_tests from 2.29.1 to 2.29.2 (#11549)dependabot-preview[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.1 to 2.29.2. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump devise-two-factor from 3.0.3 to 3.1.0 (#11550)dependabot-preview[bot]
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/tinfoil/devise-two-factor/releases) - [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md) - [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump puma from 4.0.1 to 4.1.0 (#11548)dependabot-preview[bot]
Bumps [puma](https://github.com/puma/puma) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump faker from 2.1.0 to 2.1.2 (#11547)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.0 to 2.1.2. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump webpack-dev-server from 3.7.2 to 3.8.0 (#11546)dependabot-preview[bot]
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.7.2 to 3.8.0. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.7.2...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump css-loader from 3.1.0 to 3.2.0 (#11544)dependabot-preview[bot]
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.1.0...v3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12Bump terser-webpack-plugin from 1.3.0 to 1.4.1 (#11542)dependabot-preview[bot]
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.3.0...v1.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-11[Security] Bump nokogiri from 1.10.3 to 1.10.4 (#11540)dependabot-preview[bot]
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.4. **This update includes a security fix.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-11Fix ActivityPub and REST API queries setting cookies and preventing caching ↵ThibG
(#11539) Regression from #8657
2019-08-11Fix some emojis in profile metadata labels are not emojified. (#11534)kedama
2019-08-11Fix account search always returning exact match on paginated results (#11525)Eugen Rochko
Fix #11365
2019-08-08Fix crash when saving invalid domain name (#11528)Eugen Rochko
Fix #7629
2019-08-08Fix pinned statuses API returning pagination headers (#11526)Eugen Rochko
Fix #10227
2019-08-08Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)Eugen Rochko
Fix percentages in usage breakdown having too many digits Change trending hashtags to only ask for review if a hashtag enters the top 3 position in the set, since it's the only items shown in the default web UI
2019-08-08Add GIF and WebP support for custom emojis (#11519)Eugen Rochko
Fix #11466
2019-08-08Merge branch 'glitch' into productionReverite
2019-08-08Fix “read more” button behing hidden (regression from #11404) (#11522)ThibG
* Fix “read more” button behing hidden (regression from #11404) This has the side-effect of putting the “Read more” button below possibly trunctated polls instead of putting the poll below the “Read more” * Remove dead code
2019-08-08Merge pull request #1194 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-08Fix domain block edition in glitch-socThibaut Girka
2019-08-08Fix "cancel follow request" button having unreadable text in web UI (#11521)Eugen Rochko
Fix #11478
2019-08-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-07Fix acct URIs with IDN domains not being resolved (#11520)Eugen Rochko
Fix #11494
2019-08-07Add breakdown of usage by source to admin UI for hashtags (#11517)Eugen Rochko
Allows determining where the majority of posts in a hashtag come from on a given day at a glance.
2019-08-07Add domain block notes (#11515)ThibG
* Add database columns for adding notes to domain blocks/restrctions * Add admin UI to set private and public comments when blocking a domain * Add text for private and public comments on domain blocks * Show domain block comments in admin UI * Add comments to the domain block undo page * Make UnblockDomainService more robust regarding upgraded domain blocks * Allow editing domain blocks * Rename button from “undo domain block” to “view domain block” in account admin UI * Change test to unsilence silenced users from upgraded blocks
2019-08-07Merge pull request #1193 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-07Fix trending tags returning less items than requested sometimes (#11513)Eugen Rochko
Add better sorting defaults to the hashtags admin UI Add "not reviewed" filter to hashtags admin UI
2019-08-07Add number of pending accounts and pending hashtags to admin dashboard (#11514)Eugen Rochko
2019-08-07[Glitch] Fix hashtag links always being lowercaseEugen Rochko
Port 5e35aa82802b09a63d4625fa9c1837ad75178553 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-07[Glitch] Improve focus handling with dropdown menusThibG
Port 396b8cdd0f071fab85b09855f882b19c07cccd44 to glitch-soc
2019-08-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-07Improve focus handling with dropdown menus (#11511)ThibG
- Focus first item when activated via keyboard - When the dropdown menu closes, give back the focus to the actual element which was focused prior to opening the menu
2019-08-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml
2019-08-07Fix account tags not being saved correctly (#11507)Eugen Rochko
* Fix account tags not being saved correctly Regression from f371b32 Fix Tag#discoverable not returning tags where listable is nil instead of true Add notice when saving hashtags in admin UI Change public hashtag and directory pages to return 404 for forbidden tags * Remove unused locale string
2019-08-07Fix non-lowercase hashtags not being picked up by the streaming API (#11508)Eugen Rochko
Regression from f371b32 Fix hashtag links always being lowercase
2019-08-07Fix featured tags not finding the right tag on save (#11504)Eugen Rochko
Regression from f371b32
2019-08-06Fix admin dashboard missing latest features (#11505)Eugen Rochko
Fix redis-namespace deprecation warning about administrative commands
2019-08-06Add trends UI with admin and user settings (#11502)Eugen Rochko
2019-08-06Merge pull request #1191 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-06Implement keyboard navigation in glitch-soc composerThibaut Girka
2019-08-06Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)Yusuke Nakamura
* Bump faker from 1.9.6 to 2.1.0 Bumps [faker](https://github.com/stympy/faker) from 1.9.6 to 2.1.0. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use faker api v2 https://github.com/stympy/faker/releases/tag/2.0
2019-08-06Refactor composer Dropdown's component a bit to make it closer to upstreamThibaut Girka