Commit Graph

11252 Commits

Author SHA1 Message Date
artica 63e0dc68a1 Auto-updated build strings. 2016-04-15 00:01:25 +02:00
artica 949e3a8d43 Auto-updated build strings. 2016-04-14 00:01:23 +02:00
m-lopez-f 59fdb8d297 Fixed problems with url in public console. Tiquet: #3556 2016-04-13 18:24:07 +02:00
m-lopez-f 2f9f932171 Fixed several problems of security. Tiquet: #3550
(cherry picked from commit 36ec5ca8f1)
2016-04-13 13:51:54 +02:00
artica 744e6adaeb Auto-updated build strings. 2016-04-13 00:01:23 +02:00
fermin831 1ea614dd7e Improved function agents_get_modules to decrease execution time TICKETS #3518 2016-04-12 17:29:22 +02:00
artica 05509f3f19 Auto-updated build strings. 2016-04-12 00:01:25 +02:00
artica eccc95a1fa Auto-updated build strings. 2016-04-11 00:01:22 +02:00
artica 744ace25dd Auto-updated build strings. 2016-04-10 00:01:23 +02:00
artica c402b8c70b Auto-updated build strings. 2016-04-09 00:01:26 +02:00
pandora-release 827b1e832c Updated version and build strings. 2016-04-08 11:51:29 +02:00
artica 9e5fbec9ee Auto-updated build strings. 2016-04-08 00:01:24 +02:00
pandora-release 01f6d85a8b Updated version and build strings. 2016-04-07 12:29:07 +02:00
m-lopez-f 50b8a2ee50 Re-Fixed warning at tentacle_serverd script
(cherry picked from commit e376341e16)
2016-04-07 11:35:30 +02:00
fbsanchez 303371c080 Fixed warning at tentacle_serverd script 2016-04-07 11:26:18 +02:00
artica 5a575eec17 Auto-updated build strings. 2016-04-07 00:01:25 +02:00
pandora-release 0f1b7f4c70 Updated version and build strings. 2016-04-06 15:17:51 +02:00
fermin831 932141f1bb Fixed a single error on module graphs TICKETS #3526 2016-04-06 10:30:59 +02:00
artica f3f5ce1345 Auto-updated build strings. 2016-04-06 00:01:24 +02:00
fermin831 8bb4950912 Fixed problems with undefined max interval on module graphs TICKETS #3392 2016-04-05 14:03:15 +02:00
artica 7aab28c452 Auto-updated build strings. 2016-04-05 00:01:32 +02:00
fermin831 8a63ef220e Fixed N/A warning or critical in module graphs TICKETS #3392 2016-04-04 19:02:24 +02:00
fermin831 451cb84606 Improved critical and warning superposition in module graphs TICKETS #3515 2016-04-04 18:41:37 +02:00
m-lopez-f 9076f4bda1 Firts change of logs in delete agent. Tiquet: #3511 2016-04-04 16:48:02 +02:00
fermin831 c12ec81bb7 Added DB Host Access option to localhost console installation TICKETS #3363 2016-04-04 12:23:27 +02:00
fermin831 b78c5a51f4 Fixed sql fail in snmp console TICKETS #3504 2016-04-04 12:14:57 +02:00
fermin831 45e9904f11 Substituted lines for intervals in modules graphs TICKETS #3392 2016-04-04 10:06:34 +02:00
m-lopez-f 83dd7703b2 Fixed output of two CLI funtions. Tiquet: #3510
(cherry picked from commit d4ebe9761c)
2016-04-04 09:06:53 +02:00
artica 693d959f1d Auto-updated build strings. 2016-04-04 00:01:22 +02:00
artica 794c2e2e1b Auto-updated build strings. 2016-04-03 00:01:22 +02:00
artica 5389e857ae Auto-updated build strings. 2016-04-02 00:01:41 +02:00
m-lopez-f 86bfcf3cf5 Fixed problems with kill procesess with tentacle. Tiquet: #3487
(cherry picked from commit d9600bb10e)
2016-04-01 09:59:56 +02:00
artica cff1c7423b Auto-updated build strings. 2016-04-01 00:01:35 +02:00
Ramon Novoa 6aa85d00a6 Added contact information to README.md.
(cherry picked from commit c861aa908a)
2016-03-31 14:06:49 +02:00
Axel 59df3a9605 Update Dockerfile
Added SSH client
2016-03-31 12:59:15 +02:00
artica ec7e766b14 Auto-updated build strings. 2016-03-31 00:01:58 +02:00
fermin831 bb732195c8 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-03-30 14:58:24 +02:00
fermin831 fb8c15e8c0 Fixed checks in availability reports TICKETS #3449 2016-03-30 14:55:57 +02:00
mdtrooper 2f9a31c370 Some fixes in the skins.
(cherry picked from commit 1facd4d69f)

Conflicts:
	pandora_console/include/functions_ui.php
2016-03-30 13:20:41 +02:00
m-lopez-f ccf7da77a9 Fixed warning in pandora_manage(CLI). Tiquet: #3496 2016-03-30 11:18:30 +02:00
m-lopez-f 0210afa536 Fixed problems with stop tentacle server, doen't stop all procesess. Tiquet: #3488 2016-03-30 09:21:44 +02:00
artica 6f60aa013f Auto-updated build strings. 2016-03-30 00:01:56 +02:00
Arturo Gonzalez a03815d611 Revert "Some changes in saml login system."
This reverts commit 502988c812.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/index.php
2016-03-29 16:40:55 +02:00
Arturo Gonzalez f59665fe4b Revert "New login method (saml). Ticket#3393"
This reverts commit 08569e64e3.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/include/constants.php
	pandora_console/index.php
2016-03-29 16:34:41 +02:00
mdtrooper 6215d027be Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170
(cherry picked from commit f253a16d9b)
2016-03-29 13:55:30 +02:00
mdtrooper a716b3aaa7 Fixed PHP Warnings.
(cherry picked from commit 1e0e18a399)
2016-03-29 13:53:40 +02:00
Arturo Gonzalez 502988c812 Some changes in saml login system.
(cherry picked from commit e9eb16a848)
2016-03-29 13:19:58 +02:00
Arturo Gonzalez 7a826e38d0 Changed data in saml login 2016-03-29 13:16:23 +02:00
Arturo Gonzalez 08569e64e3 New login method (saml). Ticket#3393
Conflicts:
	pandora_console/include/auth/mysql.php
2016-03-29 13:15:37 +02:00
m-lopez-f 4786db20e8 Only conecction timeout in login. Tiquet: #3485
(cherry picked from commit d88f7a9a27)
2016-03-29 13:04:33 +02:00