diff --git a/.github/cfp_headers b/.github/cfp_headers index fb619d57f90..761771c6a12 100644 --- a/.github/cfp_headers +++ b/.github/cfp_headers @@ -2,10 +2,12 @@ ! Access-Control-Allow-Origin X-XSS-Protection: 1; mode=block X-Content-Type-Options: nosniff - X-Frame-Options: SAMEORIGIN + X-Frame-Options: sameorigin Content-Security-Policy: frame-ancestors 'self' Strict-Transport-Security: max-age=31536000; includeSubDomains; preload - permissions-policy: accelerometer=(), gyroscope=(), magnetometer=(), usb=(), interest-cohort=() + permissions-policy: autoplay=(*), screen-wake-lock=(*), interest-cohort=() + X-Robots-Tag: noindex + Referrer-Policy: no-referrer-when-downgrade Cache-Control: no-cache /version @@ -28,10 +30,10 @@ Cache-Control: no-cache /home - Cache-Control: no-cache + Cache-Control: no-store /sites - Cache-Control: no-cache + Cache-Control: no-store /index.html - Cache-Control: no-cache \ No newline at end of file + Cache-Control: no-store \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19317607ca8..0218d7091e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,12 +93,15 @@ jobs: echo "cf_branch=test" >> $GITHUB_ENV elif [[ "${{ github.event.pull_request.base.ref }}" == "release" ]]; then echo "cf_branch=preview" >> $GITHUB_ENV + echo "cf_domain=https://preview.elecord.app / " >> $GITHUB_ENV fi elif [[ "${{ github.event_name }}" == "push" ]]; then if [[ "${{ github.ref_name }}" == "master" ]]; then echo "cf_branch=dev" >> $GITHUB_ENV + echo "cf_domain=https://dev.elecord.app / " >> $GITHUB_ENV elif [[ "${{ github.ref_name }}" == "release" ]]; then echo "cf_branch=release" >> $GITHUB_ENV + echo "cf_domain=https://web.elecord.app / " >> $GITHUB_ENV fi fi @@ -128,13 +131,6 @@ jobs: reactions: -1 mode: recreate - # When deploying to the preview branch, add the preview URL - - name: Add preview URL - run: | - if [[ "${{ env.cf_branch }}" == "preview" ]]; then - echo -e "cf_preview=https://preview.elecord.app / " >> $GITHUB_ENV - fi - - name: Update status comment (Success) if: ${{ github.event_name == 'pull_request' && success() }} uses: thollander/actions-comment-pull-request@v3 @@ -145,8 +141,13 @@ jobs: | **Latest commit** | ${{ github.event.pull_request.head.sha || github.sha }} | |-------------------|:-:| | **Status** | ✅ Deployed! | - | **URL** | ${{ env.cf_preview }}${{ steps.cf.outputs.deployment-url != '' && steps.cf.outputs.deployment-url || 'Not available' }} | + | **URL** | ${{ env.cf_domain }}${{ steps.cf.outputs.deployment-url != '' && steps.cf.outputs.deployment-url || 'Not available' }} | pr-number: ${{ github.event.pull_request.number }} comment-tag: CFPages-deployment reactions: rocket - mode: recreate \ No newline at end of file + mode: recreate + + - name: Add URL to summary + if: ${{ steps.cf.outputs.deployment-url != '' }} + run: | + echo "${{ env.cf_domain }}${{ steps.cf.outputs.deployment-url }}" >> $GITHUB_STEP_SUMMARY diff --git a/config.json b/config.json index f26c0613f0b..552dcc60469 100644 --- a/config.json +++ b/config.json @@ -1,8 +1,7 @@ { - "default_server_name": "matrix.org", "default_server_config": { "m.homeserver": { - "base_url": "https://matrix-client.matrix.org" + "base_url": "https://matrix.org" }, "m.identity_server": { "base_url": "https://vector.im" @@ -18,8 +17,6 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "bug_report_endpoint_url": "https://element.io/bugreports/submit", - "uisi_autorageshake_app": "element-auto-uisi", "show_labs_settings": false, "room_directory": { "servers": ["matrix.org", "gitter.im"] @@ -40,14 +37,29 @@ ], "privacy_policy_url": "https://element.io/cookie-policy", "setting_defaults": { - "RustCrypto.staged_rollout_percent": 100 + "RustCrypto.staged_rollout_percent": 100, + "use_system_theme": false, + "showRedactions": false, + "showTwelveHourTimestamps": true, + "urlPreviewsEnabled_e2ee": true, + "useOnlyCurrentProfiles": true }, "features": { "feature_video_rooms": true, "feature_group_calls": true, - "feature_element_call_video_rooms": true + "feature_element_call_video_rooms": true, + "feature_custom_themes": true, + "feature_html_topic": true }, "element_call": { - "url": "https://call.element.io" + "url": "https://call.element.io", + "use_exclusively": true + }, + "default_theme": "dark", + "disable_3pid_login": true, + "disable_guests": true, + "force_verification": true, + "embedded_pages": { + "login_for_welcome": true } } \ No newline at end of file diff --git a/res/css/structures/_BackdropPanel.pcss b/res/css/structures/_BackdropPanel.pcss index ee2fcf943d5..cb93bd5d6ed 100644 --- a/res/css/structures/_BackdropPanel.pcss +++ b/res/css/structures/_BackdropPanel.pcss @@ -6,6 +6,7 @@ Please see LICENSE files in the repository root for full details. */ .mx_BackdropPanel { + display: none; position: absolute; left: 0; top: 0; diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index 0042169f45c..f9bc5b34100 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -301,7 +301,7 @@ class LoggedInView extends React.Component { private loadResizerPreferences(): void { let lhsSize = parseInt(window.localStorage.getItem("mx_lhs_size")!, 10); if (isNaN(lhsSize)) { - lhsSize = 350; + lhsSize = 204; } this.resizer?.forHandleWithId("lp-resizer")?.resize(lhsSize); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f2ad5ce7ac2..49f82a62ec1 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -318,7 +318,7 @@ "reset_password_title": "Reset your password", "server_picker_custom": "Other homeserver", "server_picker_description": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.", - "server_picker_description_matrix.org": "Join millions for free on the largest public server", + "server_picker_description_matrix.org": "Join for free on the largest public server", "server_picker_dialog_title": "Decide where your account is hosted", "server_picker_explainer": "Use your preferred Matrix homeserver if you have one, or host your own.", "server_picker_failed_validate_homeserver": "Unable to validate homeserver", diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts index 64a6a27f581..c2e71956b6d 100644 --- a/src/settings/watchers/FontWatcher.ts +++ b/src/settings/watchers/FontWatcher.ts @@ -26,7 +26,7 @@ export class FontWatcher implements IWatcher { /** * Default delta added to the ${@link DEFAULT_SIZE} */ - public static readonly DEFAULT_DELTA = 0; + public static readonly DEFAULT_DELTA = 2; private dispatcherRef?: string; diff --git a/src/vector/index.html b/src/vector/index.html index a2b80a61324..e1ccf65e099 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -21,7 +21,7 @@ - +