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

Commits on Jul 19, 2018

  1. Create AlarmServer.py 

    Example alarm server realisation for xm devices
    NeiroNx authored Jul 19, 2018
    Configuration menu
    Copy the full SHA
    9457a4b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2018

  1. Update DeviceManager.py 

    Porting to Python 3.x
    NeiroNx authored Aug 12, 2018
    Configuration menu
    Copy the full SHA
    dd3af64 View commit details
    Browse the repository at this point in the history

  2. Update DeviceManager.py 

    Correct porting to python 3.x
    NeiroNx authored Aug 12, 2018
    Configuration menu
    Copy the full SHA
    99b72b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2018

  1. Add ChannelTitle camera modification

    @viewpointsa
    viewpointsa committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    cb1799e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from viewpointsa/ChannelTitle 

    Add ChannelTitle camera modification
    NeiroNx authored Sep 5, 2018
    Configuration menu
    Copy the full SHA
    9ecae57 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2018

  1. Исправил для работы в питоне 3.x

    @NeiroNz
    NeiroNz committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    0826ea8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/NeiroNx/python-dvr

    @NeiroNz
    NeiroNz committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    7a31fd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2018

  1. Delete KIvy - it very slow

    @NeiroNz
    NeiroNz committed Nov 4, 2018
    Configuration menu
    Copy the full SHA
    b009e47 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. Add multi address search 

    Add multi address search, configuring may not work
    NeiroNx authored Jul 8, 2019
    Configuration menu
    Copy the full SHA
    aaadcef View commit details
    Browse the repository at this point in the history

  2. Fix linux errors

    NeiroNx authored Jul 8, 2019
    Configuration menu
    Copy the full SHA
    c343fd4 View commit details
    Browse the repository at this point in the history
Loading