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: CSC207-2025F-UofT/LostInTranslation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: phamali/Lab3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 9 files changed
  • 2 contributors

Commits on Sep 23, 2024

  1. changes to JSONDemo

    @TiffF25
    TiffF25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b47f502 View commit details
    Browse the repository at this point in the history

  2. changes to JSONDemo

    @TiffF25
    TiffF25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    15933ce View commit details
    Browse the repository at this point in the history

  3. changes to JSONDemo

    @TiffF25
    TiffF25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    2f93013 View commit details
    Browse the repository at this point in the history

  4. changes to JSONDemo

    @TiffF25
    TiffF25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    ffcf308 View commit details
    Browse the repository at this point in the history

  5. changes to JSONDemo

    @TiffF25
    TiffF25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    766b8c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Comment to check merge

    @phamali
    phamali committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8d26015 View commit details
    Browse the repository at this point in the history

  2. Deleted extra comments and did TODOs in InLabByHandTranslator.java

    @TiffF25
    TiffF25 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c05d9f7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' 

    # Conflicts:
#	src/main/java/org/translation/JSONDemo.java
    @TiffF25
    TiffF25 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    a862c72 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Deleted extra comments and did TODOs in InLabByHandTranslator.java

    @TiffF25
    TiffF25 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    4a1d8aa View commit details
    Browse the repository at this point in the history

  2. edits to JSONDemo JSONTranslationExample JSONTranslator and Main

    @TiffF25
    TiffF25 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    339528c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' 

    # Conflicts:
#	src/main/java/org/translation/JSONDemo.java
    @TiffF25
    TiffF25 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    7b8f0ce View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. added MainTest.java and changes to main

    @TiffF25
    TiffF25 committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    181207a View commit details
    Browse the repository at this point in the history

  2. changes to main

    @TiffF25
    TiffF25 committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    6fc14d4 View commit details
    Browse the repository at this point in the history

  3. changes to main

    @TiffF25
    TiffF25 committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    106a6c2 View commit details
    Browse the repository at this point in the history
Loading