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: lanket/mdmPiTerminalModule
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: Ver2
Choose a base ref
...
head repository: lanket/mdmPiTerminalModule
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.
  • 15 commits
  • 4 files changed
  • 3 contributors

Commits on Dec 14, 2018

  1. Ведется разработка модуля для поддержки второй версии термиала https:… 

    …//github.com/Aculeasis/mdmTerminal2

Как будет  готов модуль для второй версии
после обновления первая версия терминала будет несовместима.
Разработка терминала ведет Anaki http://majordomo.smartliving.ru/forum/memberlist.php?mode=viewprofile&u=46679
gitHub 2й версии терминала https://github.com/Aculeasis/mdmTerminal2
gitHub сырого модуля https://github.com/lanket/mdmPiTerminalModule/tree/Ver2
    @lanket
    lanket committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    5a59887 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2019

  1. Merge pull request #12 from lanket/Ver2 

    Поддержка только 2й версии терминала
    @lanket
    lanket authored Jan 5, 2019
    Configuration menu
    Copy the full SHA
    a6a306e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. Merge pull request #13 from lanket/Ver2 

    Исправил косяки с сохранением параметров boolian,
    @lanket
    lanket authored Jan 6, 2019
    Configuration menu
    Copy the full SHA
    92c7ef4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from lanket/Ver2 

    Добавил функцию в мажор sendToMpt($command, $data, $target)
    @lanket
    lanket authored Jan 6, 2019
    Configuration menu
    Copy the full SHA
    8c1a7ab View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Update for new database format 

    Теперь вместо MAJORDROID_API используется CANTTS. Поставил оба для совместимости.
    @Aculeasis
    Aculeasis authored May 2, 2019
    Configuration menu
    Copy the full SHA
    55b5361 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from Aculeasis/master 

    Fix terminal search
    @lanket
    lanket authored May 2, 2019
    Configuration menu
    Copy the full SHA
    dff5389 View commit details
    Browse the repository at this point in the history

  3. Show only support majorordroid API 

    Да, наверное так правильнее
    @Aculeasis
    Aculeasis authored May 2, 2019
    Configuration menu
    Copy the full SHA
    38534fb View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Merge pull request #17 from Aculeasis/master 

    Show only support majorordroid API
    @lanket
    lanket authored May 3, 2019
    Configuration menu
    Copy the full SHA
    4d7b32b View commit details
    Browse the repository at this point in the history

  2. Update mpt_edit.inc.php 

    Добавлены пропущенные кавычки в SQL
    @lanket
    lanket authored May 3, 2019
    Configuration menu
    Copy the full SHA
    7c6a734 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Update mdmPiTerminal.class.php 

    add settings
    @directman66
    directman66 authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    f131810 View commit details
    Browse the repository at this point in the history

  2. Update mpt_edit.inc.php

    @directman66
    directman66 authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    3b57c9f View commit details
    Browse the repository at this point in the history

  3. Update mpt_edit.html 

    add new settings
    @directman66
    directman66 authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    390a5ae View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Merge pull request #19 from directman66/patch-1 

    Update mdmPiTerminal.class.php
    @lanket
    lanket authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    ee5f53d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from directman66/patch-2 

    Update mpt_edit.inc.php
    @lanket
    lanket authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    0194091 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from directman66/patch-3 

    Update mpt_edit.html
    @lanket
    lanket authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    796dc22 View commit details
    Browse the repository at this point in the history
Loading