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

495 Commits

Author SHA1 Message Date
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Alejandro Fraguas 3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' 
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
 2019-05-14 17:56:43 +02:00
marcos.alconada 35c7ea1f48 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews 
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
 2019-05-14 17:14:02 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
manuel 827ebcfbc5 Fix helps 
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
 2019-05-14 13:09:49 +02:00
manuel b89751e647 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php


Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
 2019-05-14 11:50:07 +02:00
Alejandro Fraguas 8ff62a58ce Merge branch 'ent-3695-ipam-oids' into 'develop' 
IPAM vlan wizard ExtremeXOS

See merge request artica/pandorafms!2409

Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
 2019-05-14 11:30:55 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
manuel 43ce4f9883 Added helps 2019-05-09 17:20:27 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
Daniel Rodriguez ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' 
Added module units in module graphs

See merge request artica/pandorafms!2237
 2019-05-08 16:36:43 +02:00
fbsanchez 9bc5a2d346 IPAM vlan wizard ExtremeXOS 2019-05-08 14:17:40 +02:00
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
manuel 00b5fc0a2c Added helps 
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
 2019-05-06 16:59:31 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
manuel b1dd6edc64 Added changes in helps 
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
 2019-04-30 12:28:11 +02:00
manuel 7045e59e87 Added changes in helps 
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
 2019-04-30 10:44:53 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting 
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
 2019-04-29 16:42:26 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
fermin831 9ee095406b Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php

Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
 2019-03-27 11:59:25 +01:00
Ramon Novoa d740b32810 Add support for DESTDIR. 
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
 2019-03-26 11:47:20 +01:00
samucarc 00eb2766a9 Fixed labels in automatic combined graphs 
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
 2019-03-05 18:06:50 +01:00
Fermin 942b160a3d Use multiples in network explorer table 
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
 2019-03-05 08:03:18 +01:00
samucarc 7d88af625e Added module units in module graphs 
Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813
 2019-03-04 15:53:47 +01:00
fbsanchez e397353f71 minor fix get_parameter_switch 
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
 2019-02-15 14:03:16 +01:00
fbsanchez efdc17b801 WIP: H&D 
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
 2019-02-15 13:08:44 +01:00
fbsanchez f4c22d2250 added extra arguments to get_snmpwalk 
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
 2019-02-07 13:01:21 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
daniel 61c9603ae8 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
 2019-01-25 09:55:09 +01:00
fermin831 072ad0a1ea Add return value to generate_hash_to_api function 
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
 2019-01-24 13:38:13 +01:00
daniel dc2b738776 IPAM supernet 
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
 2019-01-21 09:24:00 +01:00
daniel 1c8d846574 WIP IPAM Supernet 
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
 2019-01-17 15:49:41 +01:00
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
 2018-12-20 18:17:57 +01:00
daniel 807f7a0b74 fixed minor error 
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
 2018-12-13 17:24:01 +01:00
daniel a76895f20e fixed error metaconsole template send template 
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
 2018-12-13 12:47:22 +01:00
daniel 07f5455e28 fixed errors in cron jobs 
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
 2018-12-12 10:46:28 +01:00
fbsanchez c728cb1412 fixed related changes in phantomjs interface 2018-11-29 17:26:41 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
fermin831 06830c9f69 Added profiller to docker 2018-11-13 12:55:25 +01:00
manuel.montes df8c5e8bf9 Fixed bug in deleted policies 2018-11-06 13:52:03 +01:00
Ramon Novoa 6353af0482 Merge remote-tracking branch 'github/develop' into develop 2018-10-29 13:20:48 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
manuel.montes 972f4b1e89 Added unit in label graphs 2018-10-19 14:03:15 +02:00
Ramón Novoa 3e584747b3
Merge pull request #104 from sofwerx/https-proxy 
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
 2018-10-11 09:34:26 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00