tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,507 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

3650 Commits

Author SHA1 Message Date
vgilc 3a4f3a38be Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1538
 2018-06-14 10:12:05 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
vgilc d42d8a2fd7 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports-2' into 'develop' 
Always group All in custom reports and custom graphs

See merge request artica/pandorafms!1528
 2018-06-12 15:56:09 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
vgilc 9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop' 
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
 2018-06-04 10:10:56 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 063865e179 [Rebranding] Refactorized logos preview in nodo 2018-05-24 12:50:24 +02:00
fermin831 acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
fermin831 2c97232f90 [Rebranding] Miscelaneous rebranding 2018-05-22 19:22:37 +02:00
fermin831 9935b7f8a3 [Rebranding] Added custom logo to node request new license 2018-05-22 16:49:49 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
Alejandro Gallardo Escobar f0f331be4e Moved a button 2018-05-21 16:22:38 +02:00
Alejandro Gallardo Escobar 447958144e Error fix 2018-05-21 16:00:54 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin 3497132517 [Rebranding] Moved rebranding to visual styles section 2018-05-21 11:56:16 +02:00
Fermin ef07eff769 [Rebranding] Added enable update manager option 2018-05-21 11:07:39 +02:00
vgilc b283cb2469 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop' 
Improvements and fixes into the internal audit view

See merge request artica/pandorafms!1468
 2018-05-21 08:50:11 +02:00
enriquecd deb1cebeca Show warning modal window when change snmp or satellite module name - #2251 2018-05-11 16:13:56 +02:00
fermin831 c3beafc499 [Rebranding] Open godmode/update_manager and godmode/users 2018-05-10 17:15:37 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00