Skip to content

Commit

Permalink
Merge pull request #11 from elecordapp/element-triage
Browse files Browse the repository at this point in the history
Element triage
  • Loading branch information
hazzuk authored Dec 13, 2024
2 parents bae5994 + 9772db8 commit 3b4a5a3
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 25 deletions.
12 changes: 7 additions & 5 deletions .github/cfp_headers
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Cache-Control: no-store
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -145,8 +141,13 @@ jobs:
| **Latest commit** | <code>${{ github.event.pull_request.head.sha || github.sha }}</code> |
|-------------------|:-:|
| **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
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
26 changes: 19 additions & 7 deletions config.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"]
Expand All @@ -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
}
}
1 change: 1 addition & 0 deletions res/css/structures/_BackdropPanel.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/structures/LoggedInView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class LoggedInView extends React.Component<IProps, IState> {
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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/settings/watchers/FontWatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/vector/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
<meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
<meta name="theme-color" content="#191b1c">
<meta name="theme-color" content="#202020">
<meta property="og:image" content="https://web.elecord.app/themes/element/img/logos/opengraph.png" />
<meta http-equiv="Content-Security-Policy" content="
default-src 'none';
Expand Down

0 comments on commit 3b4a5a3

Please sign in to comment.