10039 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thibaut Girka	bb9459774d	Add NavigationBar to getting started column in single-column mode ... Fixes #1131	2019-06-20 19:19:46 +02:00
ThibG	f717d7a92d	Merge pull request #1134 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2019-06-20 19:19:30 +02:00
Eugen Rochko	8f23726918	Fix converted media being saved with original extension and mime type (#11130)	2019-06-20 10:52:36 +02:00
Eugen Rochko	7696f77245	Add moderation API (#9387) ... Fix #8580 Fix #7143	2019-06-20 02:52:34 +02:00
Acid Chicken (硫酸鶏)	33144e132d	Fix layout of identity proofs settings (#11126)	2019-06-20 02:18:06 +02:00
Eugen Rochko	f7f23b4a19	Add audio uploads (#11123) ... * Add audio uploads Fix #4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads. * Improve code style	2019-06-19 23:42:38 +02:00
ThibG	3771a993b7	[Glitch] Completely hide toots matched by “irreversible” filters even if they got to the client	2019-06-19 19:16:13 +02:00
Thibaut Girka	032a669622	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml Conflict on theme VS flavour/skin handling. Keep our version.	2019-06-19 18:49:25 +02:00
Thibaut Girka	356e9150df	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock	2019-06-19 18:36:16 +02:00
Eugen Rochko	e9a11dca19	Fix inconsistent interpolation in sk.yml (#11124)	2019-06-19 18:25:06 +02:00
Alix Rossi	26d3b2efce	Add label for admin theme selector (#11121) ... * Add simple_form default for admin theme selector * Revert "Add simple_form default for admin theme selector" This reverts commit 0b736f78a8. * Add setting_theme label to admin theme selector	2019-06-19 17:30:08 +02:00
Thibaut Girka	f4b008906d	Change preferences link in local settings modal from sliders to cog for consistency	2019-06-19 15:19:23 +02:00
Thibaut Girka	ed2f0f6152	Fix bottom margin of lists in toots	2019-06-19 15:19:03 +02:00
Thibaut Girka	a06e7bc3fb	Change plaintext icon in composer options	2019-06-19 07:03:17 +02:00
Eugen Rochko	ede0be5dba	New Crowdin translations (#11077) ... * 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-18 22:58:18 +02:00
Thibaut Girka	5ea45351a0	Fix rendering of emoji in public pages	2019-06-18 20:14:08 +02:00
ThibG	c8fae508cf	Completely hide toots matched by “irreversible” filters even if they got to the client (#11113) ... Fixes #11090	2019-06-18 18:23:08 +02:00
ThibG	17747e2cd7	Fix User#active scope only returning suspended users (#11111) ... Fix a regression from #10660	2019-06-18 18:22:02 +02:00
Thibaut Girka	48ec6abaca	Fix streaming server crashing when updating filters	2019-06-18 16:50:04 +02:00
dependabot-preview[bot]	83dd4d4204	Bump enzyme-adapter-react-16 from 1.7.1 to 1.14.0 (#11105) ... 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-18 00:28:28 +09:00
dependabot-preview[bot]	b403c33fb4	Bump webpack-cli from 3.3.2 to 3.3.4 (#11106) ... 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-18 00:20:54 +09:00
dependabot-preview[bot]	7555a0017e	Bump webpack from 4.29.6 to 4.34.0 (#11108) ... 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-18 00:19:00 +09:00
dependabot-preview[bot]	85ec79cedf	Bump enzyme from 3.8.0 to 3.10.0 (#11107) ... 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-18 00:04:24 +09:00
dependabot-preview[bot]	54438042f1	Bump capybara from 3.22.0 to 3.24.0 (#11100) ... 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-17 23:23:13 +09:00
dependabot-preview[bot]	119cb4d473	Bump file-loader from 3.0.1 to 4.0.0 (#11104) ... 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-17 23:14:52 +09:00
dependabot-preview[bot]	9639a7f87a	Bump ox from 2.10.1 to 2.11.0 (#11101) ... Bumps ox from 2.10.1 to 2.11.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-06-17 22:50:20 +09:00
dependabot-preview[bot]	10c4c21298	Bump lograge from 0.11.1 to 0.11.2 (#11102) ... 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-17 21:23:29 +09:00
dependabot-preview[bot]	f4539845e0	Bump webmock from 3.5.1 to 3.6.0 (#11031) ... 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-17 21:17:45 +09:00
dependabot-preview[bot]	31eed31e37	Bump rellax from 1.7.1 to 1.10.0 (#11040) ... 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-17 21:17:32 +09:00
dependabot-preview[bot]	efb07f177d	Bump webpack-bundle-analyzer from 3.1.0 to 3.3.2 (#11039) ... 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-17 21:17:11 +09:00
dependabot-preview[bot]	bab2231470	Bump autoprefixer from 9.5.1 to 9.6.0 (#11038) ... 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-17 21:17:02 +09:00
dependabot-preview[bot]	a9ba6a880e	Bump eslint-plugin-import from 2.14.0 to 2.17.3 (#11037) ... 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-17 21:16:47 +09:00
dependabot-preview[bot]	e67f38020f	Bump httplog from 1.3.0 to 1.3.1 (#11034) ... 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-17 21:16:22 +09:00
dependabot-preview[bot]	04b4d2b4fa	Bump pghero from 2.2.0 to 2.2.1 (#11033) ... 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-17 21:16:15 +09:00
dependabot-preview[bot]	7b058c5687	Bump rubocop-rails from 2.0.0 to 2.0.1 (#11032) ... 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-17 21:16:03 +09:00
dependabot-preview[bot]	f765cd97b2	Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030) ... 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-17 21:15:33 +09:00
Eugen Rochko	103a9f4466	Fix sanitizer making block level elements unreadable (#10836) ... Fix #10834	2019-06-16 21:46:36 +02:00
Thibaut Girka	f57a0f89a8	Fix styling of poll options on public pages in glitch flavour	2019-06-16 21:33:27 +02:00
ThibG	118701b548	Merge pull request #1121 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2019-06-16 21:25:37 +02:00
Thibaut Girka	5717f75340	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-16 21:09:19 +02:00
Thibaut Girka	d3aaacb6d4	Do not scroll in the compose panel on single-column	2019-06-16 19:13:22 +02:00
Eugen Rochko	65efe892cf	Fix check-i18n builds (#11084) ... * Fix check-i18n builds * Remove check for missing plural forms	2019-06-16 19:12:12 +02:00
ThibG	01e362316c	Do not scroll in the compose panel on single-column (#11093)	2019-06-16 18:46:55 +02:00
Yusuke Nakamura	0828126784	Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094) ... Restore and change from 89096860	2019-06-16 18:36:47 +02:00
Thibaut Girka	a29ab6f1bd	Fix composer buttons overflowing the composer box in single-column	2019-06-16 15:55:55 +02:00
Eugen Rochko	b6f76d1306	[Glitch] Change full logo to use primary text color of the given theme ... Port 20dda5cca0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2019-06-15 18:49:44 +02:00
Thibaut Girka	e433386545	Fix replying not automatically switching to compose form on mobile	2019-06-14 20:37:54 +02:00
Dan Hunsaker	54192a9b6f	Resync Nanobox files with the 2.9.0 release (#11083)	2019-06-14 14:52:31 +02:00
ThibG	c0e5f32d13	Merge pull request #1111 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2019-06-13 23:53:21 +02:00
Thibaut Girka	0fd7a8b63d	Include necessary JS in auth pages	2019-06-13 22:38:22 +02:00