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

merged 29 commits into from
Mar 20, 2023

Commits on Mar 17, 2023

  1. Resolve conflit between Tchap and Element Web 1.11.25

    @jdauphant
    jdauphant committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    197effe View commit details
    Browse the repository at this point in the history

  2. Add patch-package to package.json

    @jdauphant
    jdauphant committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    04f0575 View commit details
    Browse the repository at this point in the history

  3. Move patches temporary to other path

    @jdauphant
    jdauphant committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    13831b0 View commit details
    Browse the repository at this point in the history

  4. Remove unnecessary patch

    @jdauphant
    jdauphant committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    b514b15 View commit details
    Browse the repository at this point in the history

  5. Fix patch-package position in package.json

    @jdauphant
    jdauphant committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    f9aba8d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Move back patches-unfixed to patches

    @jdauphant
    jdauphant committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    2535379 View commit details
    Browse the repository at this point in the history

  2. Add merge script

    @jdauphant
    jdauphant committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    5a1652f View commit details
    Browse the repository at this point in the history

  3. Adaptation of 15 patches

    @jdauphant
    jdauphant committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    4a5ed6e View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Update merge Script

    @jdauphant
    jdauphant committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    c9dbbaf View commit details
    Browse the repository at this point in the history

  2. Adapt Hide Location patch

    @jdauphant
    jdauphant committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    1a0898e View commit details
    Browse the repository at this point in the history

  3. Remove patch user-friendlier-encrypted-messages

    @jdauphant
    jdauphant committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    174f6ee View commit details
    Browse the repository at this point in the history

  4. activate-cross-signing-and-secure-storage-react - to test : checkDevi… 

    …ceTrust without isCrossSigningSupported
    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    20d7024 View commit details
    Browse the repository at this point in the history

  5. add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    328aaca View commit details
    Browse the repository at this point in the history

  6. remove old patch activate-cross-signing-and-secure-storage-react

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    4e595d4 View commit details
    Browse the repository at this point in the history

  7. patch : auto-accept-tac

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3d76023 View commit details
    Browse the repository at this point in the history

  8. update patch better-help-settings

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    faa51ec View commit details
    Browse the repository at this point in the history

  9. update patch : cross signing ui

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    f49bc05 View commit details
    Browse the repository at this point in the history

  10. patch update : disable-access-options

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    21f740a View commit details
    Browse the repository at this point in the history

  11. update patch : forgot-password, removed one file from patch

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    75e1bd9 View commit details
    Browse the repository at this point in the history

  12. remove old patch : hide-location-if-no-map-server

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    1a23b4e View commit details
    Browse the repository at this point in the history

  13. update patch : login

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    d15d124 View commit details
    Browse the repository at this point in the history

  14. Adapt patch simplify-exchange-key-message

    @jdauphant
    jdauphant committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    2a5379d View commit details
    Browse the repository at this point in the history

  15. update patch : password-policy

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    953cb3d View commit details
    Browse the repository at this point in the history

  16. Merge branch 'upgrade/element-web-v1.11.25-resolv-conflict' of https:… 

    …//github.com/tchapgouv/tchap-web-v4 into upgrade/element-web-v1.11.25-resolv-conflict
    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    70e06b0 View commit details
    Browse the repository at this point in the history

  17. restore Tchap configuration

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    31c6fa3 View commit details
    Browse the repository at this point in the history

  18. remove lint error

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    c654148 View commit details
    Browse the repository at this point in the history

  19. change version to 4.2.0

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    2f3a21c View commit details
    Browse the repository at this point in the history

  20. remove conf files from eslint

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    21d8f8d View commit details
    Browse the repository at this point in the history

  21. reactivate patch

    @odelcroi
    odelcroi committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    fc3de71 View commit details
    Browse the repository at this point in the history