Merge branch '7.1'

Conflicts: frontend/src/pages/search/advanced-search.js
2025-09-16 15:19:06 +00:00 · 2020-07-22 10:59:53 +08:00
parent 8c093b25d9 849fed5aaf
commit e55a602d57
58 changed files with 743 additions and 690 deletions
--- a/frontend/config/webpack.config.dev.js
+++ b/frontend/config/webpack.config.dev.js
@@ -59,6 +59,11 @@ module.exports = {
      require.resolve('react-dev-utils/webpackHotDevClient'),
      paths.appSrc + "/tc-accept.js",
    ],
+    TCView: [
+      require.resolve('./polyfills'),
+      require.resolve('react-dev-utils/webpackHotDevClient'),
+      paths.appSrc + "/tc-view.js",
+    ],
    userNotifications: [
      require.resolve('./polyfills'),
      require.resolve('react-dev-utils/webpackHotDevClient'),