4169 Commits

Author SHA1 Message Date
artica
3e6d9eb98a Auto-updated build strings. 2015-08-05 00:01:27 +02:00
m-lopez-f
599adf694c Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-08-04 09:31:14 +02:00
m-lopez-f
741442009d Change form to login when permission has changed to user. Tiquet: #2566 2015-08-04 09:30:53 +02:00
artica
7f5324b6f7 Auto-updated build strings. 2015-08-04 00:01:30 +02:00
m-lopez-f
395414c1c3 Fixed problems with advance configuration permissions of Active Directory. Tiquet: #2566 2015-08-03 13:50:32 +02:00
m-lopez-f
f6fed60832 Add new funcionality of remote login with Active Directory 2015-08-03 12:17:41 +02:00
crash890
4e193e1cf6 Update update_manager.ajax.php
This would be to include proxy configuration in the download process. Without this Proxy will work to check for downloads, but the actual download does not respect the proxy settings.
(cherry picked from commit 620d8e01b8aa49e8be867eb9fe385ef72b156230)
2015-08-03 08:42:59 +02:00
artica
571572660d Auto-updated build strings. 2015-08-03 00:01:27 +02:00
artica
2835d2cad3 Auto-updated build strings. 2015-08-02 00:01:28 +02:00
artica
3dd7c9bf5b Auto-updated build strings. 2015-08-01 00:01:28 +02:00
artica
e6799ad82b Auto-updated build strings. 2015-07-31 00:01:28 +02:00
m-lopez-f
e19c002470 Fixed LDAP connection when name containt space and data login is false
(cherry picked from commit fd7fc4eb00a085b4b252d6f1b89656671d68fa58)
2015-07-30 16:11:29 +02:00
artica
415a4f4373 Auto-updated build strings. 2015-07-30 00:01:29 +02:00
artica
c343ca36ef Auto-updated build strings. 2015-07-29 00:01:31 +02:00
artica
2673558495 Auto-updated build strings. 2015-07-28 00:01:29 +02:00
artica
54bcc8a7a4 Auto-updated build strings. 2015-07-27 00:01:28 +02:00
artica
546fb5de11 Auto-updated build strings. 2015-07-26 00:01:27 +02:00
artica
fdcd2cb1db Auto-updated build strings. 2015-07-25 00:01:29 +02:00
mdtrooper
c68da1de83 Fixed the numeric format of failed % in report. 2015-07-24 15:41:39 +02:00
artica
032acc5cb3 Auto-updated build strings. 2015-07-24 00:01:28 +02:00
artica
be13fa9aa4 Auto-updated build strings. 2015-07-23 00:01:33 +02:00
mdtrooper
39b667a879 Fixed the report item SLA with some configurations. 2015-07-22 16:56:06 +02:00
m-lopez-f
68b6120609 Add new options when render proc is active. Tiquet: #2503 2015-07-22 12:16:10 +02:00
artica
bc6ad60373 Auto-updated build strings. 2015-07-22 00:02:25 +02:00
mdtrooper
cca0c552a8 Fixed the availability item report. TICKET: #2423 2015-07-21 18:59:11 +02:00
mdtrooper
6629d0fe1c Added feature. The report items SLA, Availaibily and General do not show the not init modules. TICKET: #2510 2015-07-21 13:17:02 +02:00
mdtrooper
a64f1eda1d Added function 'modules_is_not_init'
(cherry picked from commit a8162a1876010359642611962a2d97e6ac8fb632)
2015-07-21 13:11:44 +02:00
mdtrooper
706971f763 Added a filter 'normal & critical' in severity into events.
(cherry picked from commit f1ada9076ed993ab80dbb2b30104b6f0aa4b1b07)

Conflicts:
	pandora_console/godmode/events/event_edit_filter.php
	pandora_console/include/constants.php
2015-07-21 10:48:29 +02:00
artica
0460e01188 Auto-updated build strings. 2015-07-21 00:01:33 +02:00
artica
30728f04ec Auto-updated build strings. 2015-07-20 00:01:30 +02:00
artica
8eef10d85b Auto-updated build strings. 2015-07-19 00:01:31 +02:00
artica
39a0c14ea1 Auto-updated build strings. 2015-07-18 00:01:33 +02:00
mdtrooper
6aa2d6c66c Fixed the general report in metaconsole with some agents disabled. 2015-07-17 17:26:37 +02:00
m-lopez-f
aeedcd0ec3 Fixed heigth in pure view when see a services map. Tiquet: #2470 2015-07-17 10:04:40 +02:00
artica
902dd189d5 Auto-updated build strings. 2015-07-17 00:02:00 +02:00
Alejandro Gallardo Escobar
f01c021b14 Fixed an error in the function 'planned_downtimes_stop' 2015-07-16 15:51:05 +02:00
Alejandro Gallardo Escobar
8f3973d934 Added some useful functions from the 6.0 version 2015-07-16 15:38:15 +02:00
Alejandro Gallardo Escobar
daedfa6a21 Fixed some general and ACL errors and improved some pieces of code
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
(cherry picked from commit 4d43033d466fd9ba52594162c9aa24fd7dce8e91)

Conflicts resolved:
	pandora_console/include/ajax/planned_downtime.ajax.php
2015-07-16 15:30:21 +02:00
Alejandro Gallardo Escobar
433fa3eaef Added a function to stop a planned downtime (once type) and recover the agent and modules status
(cherry picked from commit e8d68739b73e515703d3d4609d66dd05775ccf43)
2015-07-16 15:28:28 +02:00
artica
8115724e60 Auto-updated build strings. 2015-07-16 00:01:44 +02:00
artica
44a59bdb6b Auto-updated build strings. 2015-07-15 00:01:37 +02:00
Alejandro Gallardo Escobar
289bcefbe2 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property.
The 'attr' function is going to be deprecated an may cause errors in Firefox.
2015-07-14 11:48:30 +02:00
artica
e6e640524c Auto-updated build strings. 2015-07-14 00:01:34 +02:00
Alejandro Gallardo Escobar
c5b84f1d2b Added the 'required' attribute to the input text and input text password through a function parameter
(cherry picked from commit 4f2c35ac63dc2d922607f7cb915b065a9cf77446)
2015-07-13 16:25:35 +02:00
artica
f67ea5c694 Auto-updated build strings. 2015-07-13 00:01:30 +02:00
artica
3e3fae2b49 Auto-updated build strings. 2015-07-12 00:01:33 +02:00
artica
f2f972192f Auto-updated build strings. 2015-07-11 00:01:45 +02:00
artica
2c7c199bae Auto-updated build strings. 2015-07-10 00:01:39 +02:00
artica
36b423de7a Auto-updated build strings. 2015-07-09 00:01:42 +02:00
artica
c4f58fde0b Auto-updated build strings. 2015-07-08 00:01:36 +02:00