about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-06-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/settings/edit.html.haml Conflict on theme VS flavour/skin handling. Keep our version.
2019-06-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
2019-06-19Fix inconsistent interpolation in sk.yml (#11124)Eugen Rochko
2019-06-19Add label for admin theme selector (#11121)Alix Rossi
* Add simple_form default for admin theme selector * Revert "Add simple_form default for admin theme selector" This reverts commit 0b736f78a87d61075f9b9f774d8da80e1e897b47. * Add setting_theme label to admin theme selector
2019-06-19Change preferences link in local settings modal from sliders to cog for ↵Thibaut Girka
consistency
2019-06-19Fix bottom margin of lists in tootsThibaut Girka
2019-06-19Change plaintext icon in composer optionsThibaut Girka
2019-06-18New Crowdin translations (#11077)Eugen Rochko
* New translations en.json (Persian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations activerecord.en.yml (Dutch) [ci skip] * New translations devise.en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations activerecord.en.yml (Persian) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations activerecord.en.yml (Welsh) [ci skip] * New translations devise.en.yml (Welsh) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations devise.en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations activerecord.en.yml (Japanese) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations activerecord.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations activerecord.en.yml (Hungarian) [ci skip] * i18n-tasks normalize * yarn manage:translations
2019-06-18Fix rendering of emoji in public pagesThibaut Girka
2019-06-18Completely hide toots matched by “irreversible” filters even if they got ↵ThibG
to the client (#11113) Fixes #11090
2019-06-18Fix User#active scope only returning suspended users (#11111)ThibG
Fix a regression from #10660
2019-06-18Fix streaming server crashing when updating filtersThibaut Girka
2019-06-18Bump enzyme-adapter-react-16 from 1.7.1 to 1.14.0 (#11105)dependabot-preview[bot]
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.7.1 to 1.14.0. - [Release notes](https://github.com/airbnb/enzyme/releases) - [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.14.0/packages/enzyme-adapter-react-16) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-18Bump webpack-cli from 3.3.2 to 3.3.4 (#11106)dependabot-preview[bot]
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.2 to 3.3.4. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.2...v3.3.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-18Bump webpack from 4.29.6 to 4.34.0 (#11108)dependabot-preview[bot]
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.6 to 4.34.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.29.6...v4.34.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-18Bump enzyme from 3.8.0 to 3.10.0 (#11107)dependabot-preview[bot]
Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/airbnb/enzyme/releases) - [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/enzyme/commits/enzyme@3.10.0/packages/enzyme) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump capybara from 3.22.0 to 3.24.0 (#11100)dependabot-preview[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.24.0. - [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.22.0...3.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump file-loader from 3.0.1 to 4.0.0 (#11104)dependabot-preview[bot]
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 3.0.1 to 4.0.0. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v3.0.1...v4.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump ox from 2.10.1 to 2.11.0 (#11101)dependabot-preview[bot]
Bumps ox from 2.10.1 to 2.11.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump lograge from 0.11.1 to 0.11.2 (#11102)dependabot-preview[bot]
Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.1 to 0.11.2. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.11.1...v0.11.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump webmock from 3.5.1 to 3.6.0 (#11031)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.5.1...v3.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump rellax from 1.7.1 to 1.10.0 (#11040)dependabot-preview[bot]
Bumps [rellax](https://github.com/dixonandmoe/rellax) from 1.7.1 to 1.10.0. - [Release notes](https://github.com/dixonandmoe/rellax/releases) - [Commits](https://github.com/dixonandmoe/rellax/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump webpack-bundle-analyzer from 3.1.0 to 3.3.2 (#11039)dependabot-preview[bot]
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.1.0 to 3.3.2. - [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases) - [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.1.0...v3.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump autoprefixer from 9.5.1 to 9.6.0 (#11038)dependabot-preview[bot]
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.5.1 to 9.6.0. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/9.5.1...9.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump eslint-plugin-import from 2.14.0 to 2.17.3 (#11037)dependabot-preview[bot]
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.14.0 to 2.17.3. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.14.0...v2.17.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump httplog from 1.3.0 to 1.3.1 (#11034)dependabot-preview[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.0 to 1.3.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.3.0...v1.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump pghero from 2.2.0 to 2.2.1 (#11033)dependabot-preview[bot]
Bumps [pghero](https://github.com/ankane/pghero) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump rubocop-rails from 2.0.0 to 2.0.1 (#11032)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.0...v2.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.41.0...v1.42.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-16Fix sanitizer making block level elements unreadable (#10836)Eugen Rochko
Fix #10834
2019-06-16Fix styling of poll options on public pages in glitch flavourThibaut Girka
2019-06-16Merge pull request #1121 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-16Do not scroll in the compose panel on single-columnThibaut Girka
2019-06-16Fix check-i18n builds (#11084)Eugen Rochko
* Fix check-i18n builds * Remove check for missing plural forms
2019-06-16Do not scroll in the compose panel on single-column (#11093)ThibG
2019-06-16Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094)Yusuke Nakamura
Restore and change from 89096860
2019-06-16Fix composer buttons overflowing the composer box in single-columnThibaut Girka
2019-06-15[Glitch] Change full logo to use primary text color of the given themeEugen Rochko
Port 20dda5cca0a4015a743250b4e584a3101e7675f2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-14Fix replying not automatically switching to compose form on mobileThibaut Girka
2019-06-14Resync Nanobox files with the 2.9.0 release (#11083)Dan Hunsaker
2019-06-13Merge pull request #1111 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-13Include necessary JS in auth pagesThibaut Girka
2019-06-13[Glitch] List attachments in boost modalThibG
Port dd45c63921f6f64096fa6a1693cc84d6aa33c54f to glitch-soc
2019-06-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-13[Glitch] Fix ordering of keyboard access between CW field, textarea and ↵ThibG
emoji picker Port b4d67fe57af4d45082dc92eef20d5bb758bd8379 to glitch-soc
2019-06-13[Glitch] Only show profile directory link when it's enabledThibG
Port 1b4dcc3f7870f60089611c3b3d525978826953c3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13[Glitch] Fix border-bottom of active tab barsThibG
Port faafc3ae25378121148356b60d1bef6f57013069 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-13Fix notification badgeThibaut Girka
2019-06-13Fix multiple-column paddingThibaut Girka