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: uCtrl/Software
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: uCtrl/Software
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mobile
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 39 files changed
  • 1 contributor

Commits on Nov 27, 2014

  1. changing navbar 

    changing home page
    @krapskill
    krapskill committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    5ad4d5c View commit details
    Browse the repository at this point in the history

  2. Remodeling of Sensor.qml

    @krapskill
    krapskill committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    ff0fd5f View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2014

  1. porting to mobile

    @krapskill
    krapskill committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    c0c4902 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into mobile 

    Conflicts:
	src/uCtrlDesktop/Resources.qrc
	src/uCtrlDesktop/qml/device/type/LightSensor.qml
    @krapskill
    krapskill committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    a61fa75 View commit details
    Browse the repository at this point in the history

  3. fixed temperature, sensors, device section, settings sections and show 

    advanced informations
    @krapskill
    krapskill committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    05e2c44 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into mobile 

    Conflicts:
	src/uCtrlDesktop/qml/device/Device.qml
	src/uCtrlDesktop/qml/device/DeviceListItem.qml
	src/uCtrlDesktop/qml/device/type/Sensor.qml
    @krapskill
    krapskill committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    aa073d1 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2014

  1. ...

    @krapskill
    krapskill committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    5d6e1f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2014

  1. Merge branch 'master' into mobile 

    Conflicts:
	src/uCtrlDesktop/qml/platform/Platforms.qml
    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    e610f90 View commit details
    Browse the repository at this point in the history

  2. Changed platform list size

    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    634b9b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into mobile

    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    f54178a View commit details
    Browse the repository at this point in the history

  4. resized textbox, recommandations ...

    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    e1fb030 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'globalStats' of https://github.com/uCtrl/Software into … 

    …globalStats
    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    c5d1bb1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'globalStats' into mobile

    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    4603038 View commit details
    Browse the repository at this point in the history

  7. starting resizing global stats

    @krapskill
    krapskill committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    9735946 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2014

  1. Merge branch 'master' into mobile 

    Conflicts:
	src/uCtrlDesktop/Resources.qrc
	src/uCtrlDesktop/qml/device/Device.qml
	src/uCtrlDesktop/qml/platform/Platform.qml
    @krapskill
    krapskill committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    50a5148 View commit details
    Browse the repository at this point in the history

  2. resized scenarios, device informations

    @krapskill
    krapskill committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    4017638 View commit details
    Browse the repository at this point in the history

  3. resized USlider, tasks, and start resinig of global stats

    @krapskill
    krapskill committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    19a055e View commit details
    Browse the repository at this point in the history
Loading