This repository has been archived on 2023-03-18. You can view files and clone it, but cannot push or open issues or pull requests.

Jarek Radosz 6b6ae207b8 Merge branch 'main' into a-pnpm ... # Conflicts: # app/assets/javascripts/bootstrap-json/package.json # app/assets/javascripts/dialog-holder/yarn.lock # app/assets/javascripts/discourse/package.json # app/assets/javascripts/package.json # app/assets/javascripts/yarn.lock # yarn.lock		2022-11-16 23:51:52 +01:00
..
app	FIX: Update user options only once (#19066)	2022-11-17 09:12:54 +11:00
config	DEV: Enable jquery-integration runtime deprecation (#18057)	2022-08-23 19:28:22 +01:00
lib	Merge branch 'main' into a-pnpm	2022-11-16 23:51:52 +01:00
public/assets/scripts	DEV: Load plugin CSS in tests (#18668)	2022-10-19 18:10:06 +01:00
scripts	DEV: Compile splash screen JS with ember-cli before inlining (#18150)	2022-09-01 09:58:48 +01:00
tests	DEV: Add withSilencedDeprecationsAsync for async functions (#19057)	2022-11-16 17:55:20 +00:00
.ember-cli	REFACTOR: Sync up master with changes for Ember-CLI (#11671)	2021-01-12 10:13:21 -05:00
.npmrc	DEV: Prevent npm usage (#13945)	2021-08-04 22:04:58 +02:00
ember-cli-build.js	DEV: Load client site settings YML into JS tests (#18413)	2022-11-08 09:17:43 +10:00
jsconfig.json	DEV: Add discourse/tests to jsconfig (#19031)	2022-11-15 11:33:56 +00:00
package.json	Merge branch 'main' into a-pnpm	2022-11-16 23:51:52 +01:00
testem.js	DEV: Move shouldLoadPluginTestJs() (#19045)	2022-11-16 11:07:58 +01:00