tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,284 Commits 34 Branches 30 Tags
Commit Graph

11284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 d4ebe9761cabde7ccfed411a8fecbf47f2ba6cff)
 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 d9600bb10ea32d9b907de2b7b485d17671d3e1cf)
 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 c861aa908a16c06583e1c87c23265516c2712e4d)
 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 1facd4d69f5db994b7cc2723bf90777ca672644b)

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 502988c8122b3b1a30d3b43bc734b8e48e38d380.

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 08569e64e3d47828abfbf7f77d6ca9550a106fb8.

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 f253a16d9bafe1c1d5ce64154e59e83809b44eba)
 2016-03-29 13:55:30 +02:00
mdtrooper
a716b3aaa7 Fixed PHP Warnings. 
(cherry picked from commit 1e0e18a3999176752ddaa7bdaf2266ebadea1f29)
 2016-03-29 13:53:40 +02:00
Arturo Gonzalez
502988c812 Some changes in saml login system. 
(cherry picked from commit e9eb16a84870a588b88f29af050d354aa1a70956)
 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 d88f7a9a272c0af96767ed7fde5b2dc707170d11)
 2016-03-29 13:04:33 +02:00
m-lopez-f
427d5da2c1 Revert "Only conecction timeout in login. Tiquet: #3485" 
This reverts commit 21b3c370b1ccbb7bd80101faa7043e7f59636c78.
 2016-03-29 13:01:53 +02:00
m-lopez-f
21b3c370b1 Only conecction timeout in login. Tiquet: #3485 2016-03-29 13:00:20 +02:00
m-lopez-f
d66db9212b Fixed problems with created modules synthetic. Tiquet: #3034 
(cherry picked from commit fcfd6e4070dba59d8c5a9a297832a241b28b2fa7)
 2016-03-29 12:40:50 +02:00
artica
c50e578ef9 Auto-updated build strings. 2016-03-29 00:01:41 +02:00
artica
738d8af0e5 Auto-updated build strings. 2016-03-28 00:01:25 +02:00
artica
70e2b2c151 Auto-updated build strings. 2016-03-27 00:01:22 +01:00
artica
dd331782b8 Auto-updated build strings. 2016-03-26 00:01:39 +01:00
artica
277c17d0ed Auto-updated build strings. 2016-03-25 00:01:41 +01:00
artica
89b8cf1754 Auto-updated build strings. 2016-03-24 00:02:40 +01:00
m-lopez-f
951856d837 Re-fixed problems with visual console. Tiquet: #3492 2016-03-23 15:13:31 +01:00
m-lopez-f
bff7d3ef8f Fixed problems with autoupdate enterprise in login when no connect with artica.es 
(cherry picked from commit 82174f0baec7b90ad842ce394aeb15c8f3a7ef6d)
 2016-03-23 14:02:12 +01:00
axl89
3f065143c1 Included the Dockerfile and its dependencies for server, console and database Docker images 2016-03-23 11:46:40 +01:00
artica
acd2015f51 Auto-updated build strings. 2016-03-23 00:01:28 +01:00
Hirofumi Kosaka
dc6fc32c63 Fixed a bug that custom "interval values" had not been used as default 
module interval (you can add custom ones at 'visual styles' configuration).
 2016-03-22 13:25:15 +09:00
artica
bf0ceeb3f1 Auto-updated build strings. 2016-03-22 00:01:46 +01:00
artica
3346f3419e Auto-updated build strings. 2016-03-21 00:01:21 +01:00
artica
1c1b657386 Auto-updated build strings. 2016-03-20 00:01:23 +01:00
artica
baff36cd5d Auto-updated build strings. 2016-03-19 00:01:53 +01:00