Code

Master#12

Code

Merged

jben94 merged 82 commits intojben94:masterjben94/centreon:masterfrom centreon:mastercentreon/centreon-archived:masterCopy head branch name to clipboardJul 11, 2017

+86,832-81,080

Commits

Commits on May 19, 2017

• Proposal to pause Ajax requests to the WEB server, when the user is not on the page.

  

  jben94

  committed
  110581e

• Small change

  

  jben94

  committed
  6c7dd9a

Commits on Jun 28, 2017

• Retrieve API test reports in HTML.

  

  Matthieu Kermagoret

  committed
  f95de98

• Update LdapConfiguration.feature

  Show description for 806b2e0
  MatthieuMan

  authored
  806b2e0

• Update SpecialCharactersInContact.feature

  Show description for 94aeaa1
  MatthieuMan

  authored
  94aeaa1

• Revert "Retrieve API test reports in HTML."

  Show description for d37f610
  

  Matthieu Kermagoret

  committed
  d37f610

• Tweak REST API txt report file.

  

  Matthieu Kermagoret

  committed
  6763693

• Merge pull request #5256 from jben94/proposal_breakjs_Otherpage

  Show description for 104b260
  Dacchi

  authored
  104b260

• fix ldap acceptance tests

  kduret

  committed
  28d9ff1

Commits on Jun 29, 2017

• Update ContactConfiguration acceptance test.

  

  Matthieu Kermagoret

  committed
  2c6e60b

• Update codestyle target in build.xml to include tests files.

  

  Matthieu Kermagoret

  committed
  151a299

• #5388 Add possibility to configure timezone in poller + improve config generation

  kduret

  committed
  bfe22ef

• Merge branch 'master' of https://github.com/centreon/centreon

  kduret

  committed
  156723e

• * Fix wrong clapi function name in doc #5343

  loiclau

  committed
  94e66a9

• Postman tests on Engine CFG fixed

  loiclau

  committed
  c557a7d

• fix timezone getter when host has not yet been checked

  kduret

  committed
  892274a

Commits on Jun 30, 2017

• Name of Engine Cfg in Postman tests changed (#5395)

  

  mariegallardo

  authored and

  loiclau

  committed
  9ef6486

• Resource CFG tests Postman fixed (#5392)

  Show description for e36a348
  

  mariegallardo

  authored and

  loiclau

  committed
  e36a348

Commits on Jul 3, 2017

• fix syntax error in acceptance tests

  kduret

  committed
  9724e9b

• Acceptance test to check login (#5393)

  Show description for 98914c8
  

  MatthieuMan

  authored and

  kduret

  committed
  98914c8

• Fix display of hosts and services in metaservices with non admin user (#5391)

  

  Guillaume28

  authored and

  kduret

  committed
  f845b57

• #5400 Remove deprecated field : service_inherit_contact_from_host (#5396)

  Show description for 359835f
  

  Guillaume28

  authored and

  kduret

  committed
  359835f

• Fix: Add metric for no admin (#5142)

  

  Jean-Baptiste

  authored and

  kduret

  committed
  e73037f

• fix javascript on ldap manual import page

  kduret

  committed
  c5df97d

Commits on Jul 4, 2017

• retrieve deprecated columns for module compatibility

  kduret

  committed
  2f898a7

• * fix query and set variables type

  loiclau

  committed
  fa2a0d1

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  cc87a71

• Ldap manual import (#5381)

  Show description for 29ede94
  

  MatthieuMan

  authored and

  kduret

  committed
  29ede94

• * fix disabled row style

  loiclau

  committed
  07dba0d

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  f2a8bef

Commits on Jul 5, 2017

• Fix: Select All don't work on service categories (#5389)

  kduret

  committed
  e8b4ab2

• * fix style

  loiclau

  committed
  3b0d58e

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  618e698

• fix 2.9 sql upgrade

  kduret

  committed
  c8e934a

• Merge branch 'master' of https://github.com/centreon/centreon

  kduret

  committed
  25484cd

• drop foreign key before drop column

  kduret

  committed
  f7fde1c

• * fix style

  loiclau

  committed
  bb82d32

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  82a566c

• * fix style config-generate

  loiclau

  committed
  ef20d80

• * fix style configServers

  loiclau

  committed
  5f9e9d8

Commits on Jul 6, 2017

• Remove timeouts in timezone printing acceptance test.

  

  Matthieu Kermagoret

  committed
  880e13a

• fix: Select All don't work on service categories (#5412)

  kduret

  committed
  561e32e

• Merge branch 'master' of https://github.com/centreon/centreon

  kduret

  committed
  d2960a1

• * fix static method

  loiclau

  committed
  3ebd2af

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  fe50bbf

• fix timezone acceptance test

  kduret

  committed
  156733d

• Merge branch 'master' of https://github.com/centreon/centreon

  kduret

  committed
  0ce6eb4

• Properly reorder installation steps in documentation.

  

  Matthieu Kermagoret

  committed
  726f44a

• Merge branch 'master' of ssh://github.com/centreon/centreon

  

  Matthieu Kermagoret

  committed
  9da8f7c

• * fix style centreon class

  loiclau

  committed
  1daa4e7

• * fix syle in acceptance context a to k

  loiclau

  committed
  249cb4b

• * fix style rest api test

  loiclau

  committed
  fc4209b

• * fix selector Configure_Centreon_Engine

  loiclau

  committed
  d666c93

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  2690d98

• New Feature ACLMenuAccess (#5411)

  Show description for 65b1534
  

  mariegallardo

  authored and

  kduret

  committed
  65b1534

• * fix style componentTemplate

  loiclau

  committed
  a402a93

• * fix delete api acceptance

  loiclau

  committed
  bb6525e

• * fix style in objectDetails

  loiclau

  committed
  c388c16

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  bc193f5

• * fix style centreon clapi

  loiclau

  committed
  9b0e8df

Commits on Jul 7, 2017

• * fix style config object service

  loiclau

  committed
  9a8efaf

• Use a MIB file in REST API acceptance test.

  

  Matthieu Kermagoret

  committed
  7b7bc0f

• Restore /failover/ Broker configuration field in base configuration.

  

  Matthieu Kermagoret

  committed
  3a8b849

• Merge branch 'master' of https://github.com/centreon/centreon

  loiclau

  committed
  6313895

• * fix style acceptance context

  loiclau

  committed
  4c9d4fd

• * fix style common

  loiclau

  committed
  a8e4788

Commits on Jul 10, 2017

• * add clapi Contact/Contact group additive inheritance action for host group service

  loiclau

  committed
  2862cd2

• * fix hostgroup service delmacro

  loiclau

  committed
  2bdcff0

• * add clapi hostgroup service severity

  loiclau

  committed
  d0cb1dd

• * fix style configObject contact

  loiclau

  committed
  592cceb

• Host group services postman tests updated (#5425)

  Show description for 579c4fe
  

  mariegallardo

  authored and

  loiclau

  committed
  579c4fe

• Delmacro added (#5427)

  

  mariegallardo

  authored and

  loiclau

  committed
  55f4f07

Commits on Jul 11, 2017

• Test fixed (#5424)

  

  mariegallardo

  authored and

  kduret

  committed
  dbb60a0

• * fix style

  loiclau

  committed
  a9abbf9

• * fix style centreonWidget params

  loiclau

  committed
  38fe830

• * fix style centreonWidget params connector

  loiclau

  committed
  f2581f5

• Severity from Hgservice added (#5428)

  Show description for 3b2cbd8
  

  mariegallardo

  authored and

  loiclau

  committed
  3b2cbd8

• NonAdmincontactCreation script added (#5365)

  Show description for 27744cf
  

  mariegallardo

  authored and

  loiclau

  committed
  27744cf

• Add acceptance test Modify_Default_Page_Connection (#5382)

  Show description for 0db23cd
  

  mariegallardo

  authored and

  loiclau

  committed
  0db23cd

• * fix style

  loiclau

  committed
  5c127cc

• * fix style

  loiclau

  committed
  ab4f46d

• fix legend when metric name contains blank space

  kduret

  committed
  7e3e68e