Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openRin/Rin Loading
base: dev
Choose a base ref
...
head repository: IAn2018cs/Rin Loading
compare: dev
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 13 files changed
  • 3 contributors

Commits on Jun 12, 2024

  1. change favicon

    chenshuai committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    99b3eba View commit details
    Browse the repository at this point in the history

  2. set bun version

    chenshuai committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3988a6b View commit details
    Browse the repository at this point in the history

  3. remove friends

    chenshuai committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    abf000f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev

    chenshuai committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4163379 View commit details
    Browse the repository at this point in the history

  2. recover bun version

    chenshuai committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d31b262 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev 

    # Conflicts:
#	client/src/components/header.tsx
    chenshuai committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    0be33b7 View commit details
    Browse the repository at this point in the history

  2. merge upstream

    chenshuai committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    32aa81b View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev 

    # Conflicts:
#	client/src/components/header.tsx
    chenshuai committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    0bf9731 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev

    chenshuai committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cf4e143 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #208 from openRin/dev 

    fix: lock dependencies version
    @OXeu
    OXeu committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    709fdd1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev

    chenshuai committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c0ff5e2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #211 from openRin/dev 

    feat: add custom footer support
    @OXeu
    OXeu committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    77f90d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev

    chenshuai committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    bbb3a8a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #214 from openRin/dev 

    feat: new login ui
    @OXeu
    OXeu committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    5af550b View commit details
    Browse the repository at this point in the history

  3. fix: broken seo workflow (#215) 

    just because wrong puppeteer version
    @OXeu
    OXeu committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    cc6611d View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev 

    # Conflicts:
#	client/src/components/header.tsx
    chenshuai committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    30d933c View commit details
    Browse the repository at this point in the history

  2. formula overflow

    @dongguaguaguagua
    dongguaguaguagua committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    ed174b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #218 from dongguaguaguagua/main 

    公式及表格横向滚动视图
    @OXeu
    OXeu committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    c827475 View commit details
    Browse the repository at this point in the history

  4. fix: new database migration strategy (#219) 

    * formula overflow

* fix: new database migration strategy

* ci: add more error message

* fix: change typ to 'local' | 'remote'

---------

Co-authored-by: hzy <[email protected]>
    @OXeu @dongguaguaguagua
    OXeu and dongguaguaguagua committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    aacb021 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into dev

    chenshuai committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    77c3f31 View commit details
    Browse the repository at this point in the history
Loading