[Dolibarr-git] [Dolibarr/dolibarr] 8b6dea: Dolibarrize module

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8b6dea218b7c1d7bfae68875b2e15492f7dd80b2
      
https://github.com/Dolibarr/dolibarr/commit/8b6dea218b7c1d7bfae68875b2e15492f7dd80b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-11 (Sun, 11 Mar 2018)

  Changed paths:
    M htdocs/core/modules/modTicketsup.class.php
    M htdocs/ticketsup/class/actions_ticketsup.class.php
    M htdocs/ticketsup/class/api_ticketsups.class.php
    M htdocs/ticketsup/list.php
    M htdocs/ticketsup/new.php

  Log Message:
  -----------
  Dolibarrize module


  Commit: 70490e2b4ba838593d3889c5d66de56a9fa25441
      
https://github.com/Dolibarr/dolibarr/commit/70490e2b4ba838593d3889c5d66de56a9fa25441
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-11 (Sun, 11 Mar 2018)

  Changed paths:
    M htdocs/admin/ticketsup.php
    M htdocs/admin/ticketsup_extrafields.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formticketsup.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/ticketsup.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/ticketsup/mod_ticketsup_simple.php
    M htdocs/core/modules/ticketsup/mod_ticketsup_universal.php
    M htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_ticketsup.key.sql
    M htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql
    M htdocs/public/ticketsup/create_ticket.php
    M htdocs/public/ticketsup/list.php
    R htdocs/ticketsup/.gitignore
    M htdocs/ticketsup/card.php
    M htdocs/ticketsup/class/actions_ticketsup.class.php
    M htdocs/ticketsup/class/ticketsup.class.php
    M htdocs/ticketsup/index.php
    A htdocs/ticketsup/tpl/index.html
    M htdocs/ticketsup/tpl/linkedobjectblock.tpl.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/ticketsup/class/actions_ticketsup.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/33dda6c9b830...70490e2b4ba8