Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve conflit between Tchap and Element Web 1.11.25 #475

Merged
merged 29 commits into from
Mar 20, 2023
Merged

Resolve conflit between Tchap and Element Web 1.11.25 #475

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
197effe
Resolve conflit between Tchap and Element Web 1.11.25
jdauphant Mar 17, 2023
04f0575
Add patch-package to package.json
jdauphant Mar 17, 2023
13831b0
Move patches temporary to other path
jdauphant Mar 17, 2023
b514b15
Remove unnecessary patch
jdauphant Mar 17, 2023
f9aba8d
Fix patch-package position in package.json
jdauphant Mar 17, 2023
2535379
Move back patches-unfixed to patches
jdauphant Mar 19, 2023
5a1652f
Add merge script
jdauphant Mar 19, 2023
4a5ed6e
Adaptation of 15 patches
jdauphant Mar 19, 2023
c9dbbaf
Update merge Script
jdauphant Mar 20, 2023
1a0898e
Adapt Hide Location patch
jdauphant Mar 20, 2023
174f6ee
Remove patch user-friendlier-encrypted-messages
jdauphant Mar 20, 2023
20d7024
activate-cross-signing-and-secure-storage-react - to test : checkDevi…
odelcroi Mar 20, 2023
328aaca
add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq
odelcroi Mar 20, 2023
4e595d4
remove old patch activate-cross-signing-and-secure-storage-react
odelcroi Mar 20, 2023
3d76023
patch : auto-accept-tac
odelcroi Mar 20, 2023
faa51ec
update patch better-help-settings
odelcroi Mar 20, 2023
f49bc05
update patch : cross signing ui
odelcroi Mar 20, 2023
21f740a
patch update : disable-access-options
odelcroi Mar 20, 2023
75e1bd9
update patch : forgot-password, removed one file from patch
odelcroi Mar 20, 2023
1a23b4e
remove old patch : hide-location-if-no-map-server
odelcroi Mar 20, 2023
d15d124
update patch : login
odelcroi Mar 20, 2023
2a5379d
Adapt patch simplify-exchange-key-message
jdauphant Mar 20, 2023
953cb3d
update patch : password-policy
odelcroi Mar 20, 2023
70e06b0
Merge branch 'upgrade/element-web-v1.11.25-resolv-conflict' of https:…
odelcroi Mar 20, 2023
31c6fa3
restore Tchap configuration
odelcroi Mar 20, 2023
c654148
remove lint error
odelcroi Mar 20, 2023
2f3a21c
change version to 4.2.0
odelcroi Mar 20, 2023
21d8f8d
remove conf files from eslint
odelcroi Mar 20, 2023
fc3de71
reactivate patch
odelcroi Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module.exports = {
},
overrides: [
{
<<<<<<< HEAD
files: [
"src/**/*.{ts,tsx}",
"test/**/*.{ts,tsx}",
Expand All @@ -32,10 +31,6 @@ module.exports = {
"plugin:matrix-org/typescript",
"plugin:matrix-org/react",
],
=======
files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
>>>>>>> v1.11.25
// NOTE: These rules are frozen and new rules should not be added here.
// New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
rules: {
Expand Down
30 changes: 0 additions & 30 deletions .github/deactivated_workflows/triage-priority-bugs.yml
View file
Open in desktop

This file was deleted.

Loading