Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Fixing Presence Conflicts #3320

Merged
merged 24 commits into from
Aug 3, 2024
Merged

Fixing Presence Conflicts #3320

merged 24 commits into from
Aug 3, 2024

Commits on Feb 5, 2024

  1. a

    @jjj333-p
    jjj333-p committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    a4c4fb9 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. write out caching logic

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    18bd660 View commit details
    Browse the repository at this point in the history

  2. "a" was never meant to be pushed 

    This reverts commit a4c4fb9.
    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    5f6dc39 View commit details
    Browse the repository at this point in the history

  3. fixed the wrong code

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    9a307fc View commit details
    Browse the repository at this point in the history

  4. nil maps :woozy:

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    a6827a3 View commit details
    Browse the repository at this point in the history

  5. add offline timeout

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    fea083b View commit details
    Browse the repository at this point in the history

  6. remove debugging logs

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    8093f1f View commit details
    Browse the repository at this point in the history

  7. fix recursion hell

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    de72738 View commit details
    Browse the repository at this point in the history

  8. add mutex locking to reduce race conditions

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    b9061b9 View commit details
    Browse the repository at this point in the history

  9. clear up some commenting and whatnot

    @jjj333-p
    jjj333-p committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    5b84d46 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. fix go mod and go sum

    @jjj333-p
    jjj333-p committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    93bf55d View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge branch 'matrix-org:main' into presence-optimization

    @jjj333-p
    jjj333-p authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4872d21 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Merge branch 'matrix-org:main' into presence-optimization

    @jjj333-p
    jjj333-p authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b436d43 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Merge branch 'matrix-org:main' into presence-optimization

    @jjj333-p
    jjj333-p authored Mar 23, 2024
    Configuration menu
    Copy the full SHA
    cb76da4 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'matrix-org:main' into presence-optimization

    @jjj333-p
    jjj333-p authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    00da9b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'matrix-org:main' into presence-optimization

    @jjj333-p
    jjj333-p authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    4d7d84b View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Some cleanup and moving around parts

    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f8f0531 View commit details
    Browse the repository at this point in the history

  2. Remove GMSL

    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    165af40 View commit details
    Browse the repository at this point in the history

  3. Fix oops

    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    01f5ddd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/jjj333-p/jendrite into pres… 

    …ence-optimization
    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    e008310 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'presence-optimization' of github.com:jjj333-p/jendrite … 

    …into presence-optimization
    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    12828a5 View commit details
    Browse the repository at this point in the history

  6. Disable tests for now

    @S7evinK
    S7evinK committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    96480c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Merge branch 'main' into presence-optimization

    @S7evinK
    S7evinK authored Aug 3, 2024
    Configuration menu
    Copy the full SHA
    84d57f1 View commit details
    Browse the repository at this point in the history

  2. Linter..

    @S7evinK
    S7evinK committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    ed1f7cb View commit details
    Browse the repository at this point in the history