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: ActiveStack/ActiveServerDockerConfig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ActiveStack/ActiveServerDockerConfig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: socketio_09
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 44 files changed
  • 2 contributors

Commits on Oct 5, 2015

  1. Updated the gateway

    @jonnysamps
    jonnysamps committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    b5494c1 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. Updated the gateway server, put the Pulse activeserver jar and config… 

    …s in place
    @jonnysamps
    jonnysamps committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    38143ee View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. Updated the jar with valid models and dao

    @jonnysamps
    jonnysamps committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    4950632 View commit details
    Browse the repository at this point in the history

  2. Removed old jar

    @jonnysamps
    jonnysamps committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    103a950 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. updated the jar

    @jonnysamps
    jonnysamps committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    521ce95 View commit details
    Browse the repository at this point in the history

  2. Woring model through Timecard

    @jonnysamps
    jonnysamps committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    f6c3405 View commit details
    Browse the repository at this point in the history

  3. Fixed up some of the docker files and configs

    @percerojenkins
    percerojenkins committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    f1c2926 View commit details
    Browse the repository at this point in the history

  4. Reverted the dockerfiles

    @jonnysamps
    jonnysamps committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    f7a31d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. New jar and some port changes in the composition

    @jonnysamps
    jonnysamps committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    88401ac View commit details
    Browse the repository at this point in the history

  2. Modified socketio settings and updatetable settings

    @jonnysamps
    jonnysamps committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    96f8dcc View commit details
    Browse the repository at this point in the history

  3. Updated the gateway code

    @jonnysamps
    jonnysamps committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    e05c629 View commit details
    Browse the repository at this point in the history

  4. Trying to get docker to work with original gateway

    @jonnysamps
    jonnysamps committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    8a54adc View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2015

  1. Removed dependency on webkit-devtools

    @jonnysamps
    jonnysamps committed Oct 10, 2015
    Configuration menu
    Copy the full SHA
    75e1846 View commit details
    Browse the repository at this point in the history
Loading