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

Commits on Apr 11, 2013

  1. Merge remote-tracking branch 'javihernandez/orca' into pilot 

    * javihernandez/orca:
  Now we're restore settings properly
  Adding support for nested JSON objects
  code-style: homogenizing the use of quotes
  Use XDG_DATA_HOME if exists or use the default one
  Setting startingProfile in user-settings.conf
  Adding the GPII Orca Settings Handler
    @yzen
    yzen committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    d5cf987 View commit details
    Browse the repository at this point in the history

  2. Pilot Testing: Updated the build script to point to the correct pilot… 

    … branch of universal.
    @yzen
    yzen committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    50cbd8c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. SP-19: Created startup scripts for linux branch

    Kasper Markus committed Apr 22, 2013
    Configuration menu
    Copy the full SHA
    7f1d5a8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'kaspermarkus/SP-19' into pilot 

    * kaspermarkus/SP-19:
  SP-19: Created startup scripts for linux branch
    @yzen
    yzen committed Apr 22, 2013
    Configuration menu
    Copy the full SHA
    9e3224d View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2013

  1. Fixing RB and ST start scripts 

    deployment.statistical.mm.json -> statistical.mm.production.json
see commit:
GPII/universal@8d51f42

Marking the RB and ST start scripts as executable files
    @javihernandez
    javihernandez committed Apr 25, 2013
    Configuration menu
    Copy the full SHA
    ae0d791 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'javihernandez/pilot-start-scripts-issue… 

    …s' into pilot

* javihernandez/pilot-start-scripts-issues:
  Fixing RB and ST start scripts
    @yzen
    yzen committed Apr 25, 2013
    Configuration menu
    Copy the full SHA
    06b2e57 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2013

  1. GPII-78: USB Listener for Linux is unresponsive 

    see JIRA: http://issues.gpii.net/browse/GPII-78

Removed the "partition number" restriction from the GPII's udev rule.
    @javihernandez
    javihernandez committed May 20, 2013
    Configuration menu
    Copy the full SHA
    6c765bc View commit details
    Browse the repository at this point in the history

Commits on May 29, 2013

  1. Merge pull request #23 from javihernandez/GPII-78 

    GPII-78: USB Listener for Linux is unresponsive
    Kasper Markus committed May 29, 2013
    Configuration menu
    Copy the full SHA
    20227f7 View commit details
    Browse the repository at this point in the history
Loading