Comparing develop...feature/media-player · hexatomic/hexatomic · GitHub
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: hexatomic/hexatomic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: hexatomic/hexatomic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feature/media-player
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 11 files changed
  • 2 contributors

Commits on Sep 7, 2022

  1. Add empty media player project

    @thomaskrause
    thomaskrause committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    ca942a8 View commit details
    Browse the repository at this point in the history

  2. Load a template for the video/audio player HTML when the media player… 

    … editor is loaded
    @thomaskrause
    thomaskrause committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    fc43b84 View commit details
    Browse the repository at this point in the history

  3. Add selection manager to media player

    @thomaskrause
    thomaskrause committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    93e65c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Merge branch 'develop' into feature/media-player 

    # Conflicts:
#	releng/ide/org.corpus_tools.hexatomic.product.launch
#	tests/org.corpus_tools.hexatomic.it.tests/UI Integration Test.launch
    @thomaskrause
    thomaskrause committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    0c2f660 View commit details
    Browse the repository at this point in the history
Loading