dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 581ea0: adding resource in contact ty

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 581ea0: adding resource in contact type list
Date: Fri, 29 Apr 2016 09:31:43 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 581ea0f36b3bd90b3c9f271136c2f353ce8339ab
      
https://github.com/Dolibarr/dolibarr/commit/581ea0f36b3bd90b3c9f271136c2f353ce8339ab
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  adding resource in contact type list


  Commit: 4c025d432316ac7958faf3605b29625500b1c1c9
      
https://github.com/Dolibarr/dolibarr/commit/4c025d432316ac7958faf3605b29625500b1c1c9
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/core/lib/resource.lib.php

  Log Message:
  -----------
  Adding additional tabs


  Commit: d1018760dfdd3e233707e09cb2aa461f56e54e7f
      
https://github.com/Dolibarr/dolibarr/commit/d1018760dfdd3e233707e09cb2aa461f56e54e7f
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/core/lib/resource.lib.php

  Log Message:
  -----------
  Update resource.lib.php


  Commit: c34fd7b354c2b21227beadcabcc884c16c152564
      
https://github.com/Dolibarr/dolibarr/commit/c34fd7b354c2b21227beadcabcc884c16c152564
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    A htdocs/resource/contact.php

  Log Message:
  -----------
  add contact tabs on resource


  Commit: 265f01806cdcd6eb61b38f3d7ff1d81363e973f4
      
https://github.com/Dolibarr/dolibarr/commit/265f01806cdcd6eb61b38f3d7ff1d81363e973f4
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    A htdocs/resource/document.php

  Log Message:
  -----------
  add document feature on resource modules


  Commit: f4a6945aa099b8c2de8358503cfe10c968e0d3d0
      
https://github.com/Dolibarr/dolibarr/commit/f4a6945aa099b8c2de8358503cfe10c968e0d3d0
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    A htdocs/resource/note.php

  Log Message:
  -----------
  add note feature on resource module


  Commit: 91e46b1d35385a4b2722a5a13bd56a8fa664cf1c
      
https://github.com/Dolibarr/dolibarr/commit/91e46b1d35385a4b2722a5a13bd56a8fa664cf1c
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_resource.sql

  Log Message:
  -----------
  add somes fields on resource


  Commit: b47065862a3f0f125f3ec457dc43832219aaab94
      
https://github.com/Dolibarr/dolibarr/commit/b47065862a3f0f125f3ec457dc43832219aaab94
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_resource.sql

  Log Message:
  -----------
  Update llx_resource.sql


  Commit: 1fbfdbfefd33a979bf5250c28ed730cf814fedad
      
https://github.com/Dolibarr/dolibarr/commit/1fbfdbfefd33a979bf5250c28ed730cf814fedad
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  add new ressources fields


  Commit: f6dc4757d0f4115aead107a1cd13cf457293190e
      
https://github.com/Dolibarr/dolibarr/commit/f6dc4757d0f4115aead107a1cd13cf457293190e
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_element_resources.sql

  Log Message:
  -----------
  add fields for resource tracking


  Commit: e2404b57b3d78bbe17b4ed2e6f15ec2d568a2c1b
      
https://github.com/Dolibarr/dolibarr/commit/e2404b57b3d78bbe17b4ed2e6f15ec2d568a2c1b
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  adding additionnal fields for tracking resource use


  Commit: ceb1cd57984f77be68ab736b9839a6a2172b48d4
      
https://github.com/Dolibarr/dolibarr/commit/ceb1cd57984f77be68ab736b9839a6a2172b48d4
  Author: PeartreeG <address@hidden>
  Date:   2016-01-31 (Sun, 31 Jan 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  Update 3.9.0-4.0.0.sql


  Commit: 4e83abba30d11a3c7ce99f8949cbaed2219fda2b
      
https://github.com/Dolibarr/dolibarr/commit/4e83abba30d11a3c7ce99f8949cbaed2219fda2b
  Author: PeartreeG <address@hidden>
  Date:   2016-02-01 (Mon, 01 Feb 2016)

  Changed paths:
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Update element_resource.php


  Commit: c1ff21c30a860bcf9431f0a537bacb7b140d89fc
      
https://github.com/Dolibarr/dolibarr/commit/c1ff21c30a860bcf9431f0a537bacb7b140d89fc
  Author: PeartreeG <address@hidden>
  Date:   2016-02-01 (Mon, 01 Feb 2016)

  Changed paths:
    M htdocs/core/lib/fichinter.lib.php

  Log Message:
  -----------
  add fichinter link to resources


  Commit: 62b35ffa455acbf9e80a26172d3f076b92b490cc
      
https://github.com/Dolibarr/dolibarr/commit/62b35ffa455acbf9e80a26172d3f076b92b490cc
  Author: PeartreeG <address@hidden>
  Date:   2016-02-01 (Mon, 01 Feb 2016)

  Changed paths:
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  add fichinter tabs on resource element link


  Commit: 6bb6e66e134efb3cf53a5e332db25da4482250bb
      
https://github.com/Dolibarr/dolibarr/commit/6bb6e66e134efb3cf53a5e332db25da4482250bb
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  element name used to create the clas...


  Commit: 4c0f29d23460d27b1b4824d1fdb04af3d64e846f
      
https://github.com/Dolibarr/dolibarr/commit/4c0f29d23460d27b1b4824d1fdb04af3d64e846f
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/core/lib/fichinter.lib.php

  Log Message:
  -----------
  Update fichinter.lib.php


  Commit: 835c2725c517527cd09031cca6cb0181f2156896
      
https://github.com/Dolibarr/dolibarr/commit/835c2725c517527cd09031cca6cb0181f2156896
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Update element_resource.php


  Commit: b0579cc39b8a8b1574e867c6a5ccb2c43e08867d
      
https://github.com/Dolibarr/dolibarr/commit/b0579cc39b8a8b1574e867c6a5ccb2c43e08867d
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  Update 3.9.0-4.0.0.sql


  Commit: cc8af4fba118481eb86eac8e840da86cc791a7ca
      
https://github.com/Dolibarr/dolibarr/commit/cc8af4fba118481eb86eac8e840da86cc791a7ca
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_element_resources.sql

  Log Message:
  -----------
  Update llx_element_resources.sql


  Commit: ea5b8a409c243ce45159792bcee21bbd80d0791e
      
https://github.com/Dolibarr/dolibarr/commit/ea5b8a409c243ce45159792bcee21bbd80d0791e
  Author: PeartreeG <address@hidden>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M htdocs/resource/card.php

  Log Message:
  -----------
  little forget...


  Commit: 19162fc8d544e72d02b7ee0fcf17adf1b963ab64
      
https://github.com/Dolibarr/dolibarr/commit/19162fc8d544e72d02b7ee0fcf17adf1b963ab64
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/resource.lib.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_element_resources.sql
    M htdocs/install/mysql/tables/llx_resource.sql
    M htdocs/resource/card.php
    A htdocs/resource/contact.php
    A htdocs/resource/document.php
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php
    A htdocs/resource/note.php

  Log Message:
  -----------
  Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
PeartreeG-patch-1

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql
        htdocs/resource/element_resource.php


  Commit: 1799af29723739f83ac83a2938a195baa2f5f692
      
https://github.com/Dolibarr/dolibarr/commit/1799af29723739f83ac83a2938a195baa2f5f692
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/resource.lib.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_element_resources.sql
    M htdocs/install/mysql/tables/llx_resource.sql
    M htdocs/resource/card.php
    A htdocs/resource/contact.php
    A htdocs/resource/document.php
    M htdocs/resource/element_resource.php
    M htdocs/resource/list.php
    A htdocs/resource/note.php

  Log Message:
  -----------
  git push origin developMerge branch 'PeartreeG-patch-1' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/466404d96860...1799af297237
reply via email to
[Prev in Thread] Current Thread [Next in Thread]