alejandro-campos
|
a06f56a413
|
added function to convert cidr prefixes to mask
|
2019-10-23 17:22:18 +02:00 |
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +02:00 |
Daniel Rodriguez
|
c9cfbf0bf2
|
Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
Ent 4461 configuracion integracion integria
See merge request artica/pandorafms!2732
|
2019-09-26 14:34:50 +02:00 |
|
alejandro-campos
|
f73cd80336
|
minor changes in integria integration
|
2019-09-23 15:16:31 +02:00 |
|
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +02:00 |
|
alejandro-campos
|
0df2447770
|
added comment management and fixed some errors in incident edition
|
2019-09-20 12:37:47 +02:00 |
Tatiana Llorente
|
8acdde9f3a
|
Added date filter - #4642
|
2019-09-18 18:19:29 +02:00 |
|
Tatiana Llorente
|
eb271a93eb
|
Added button for export to csv - #4642
|
2019-09-18 15:32:36 +02:00 |
|
Daniel Barbero Martin
|
84d1979c9e
|
fixed error percentil label
|
2019-09-18 11:15:55 +02:00 |
|
alejandro-campos
|
f2a6dbb60e
|
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
|
2019-09-17 14:56:54 +02:00 |
|
alejandro-campos
|
87f8badc18
|
completed integria setup and incident creation and update
|
2019-09-17 13:38:17 +02:00 |
|
Tatiana Llorente
|
027f9fd9d4
|
New view - List of Integria IMS tickets - #4642
|
2019-09-17 12:59:29 +02:00 |
|
Tatiana Llorente
|
ca6fe42298
|
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
|
2019-09-13 12:00:04 +02:00 |
|
alejandro-campos
|
11cb53582c
|
backup changes
|
2019-09-02 17:01:41 +02:00 |
|
Daniel Rodriguez
|
c46686981e
|
Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop'
modified function to export audit csv to decode entities as separator
See merge request artica/pandorafms!2692
|
2019-08-30 14:29:44 +02:00 |
|
alejandro-campos
|
f423ddc42f
|
modified function to export audit csv to decode entities as separator
|
2019-08-30 09:42:58 +02:00 |
Alejandro Fraguas
|
fadccf0ff3
|
Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop'
Fixed bug in public visual console view
See merge request artica/pandorafms!2672
|
2019-08-26 13:12:31 +02:00 |
manuel
|
e439e7349f
|
Fixed bug in public visual console view
|
2019-08-21 09:22:13 +02:00 |
Jose Gonzalez
|
5ab2bfacbd
|
Modified date formatting to avoid entities
|
2019-07-25 15:43:46 +02:00 |
|
Jose Gonzalez
|
5cdfb871a1
|
Modified the divider in print_audit_csv function
|
2019-07-25 15:35:57 +02:00 |
|
Daniel Barbero Martin
|
7fa95d3e43
|
PHP-FPM
|
2019-07-17 17:20:09 +02:00 |
fbsanchez
|
fc0d9463d5
|
Fixed
|
2019-06-25 12:07:56 +02:00 |
|
Daniel Rodriguez
|
265202f1ed
|
Merge branch 'ent-4136-button-styles' into 'develop'
Review 1
See merge request artica/pandorafms!2470
|
2019-06-20 16:35:12 +02:00 |
|
fbsanchez
|
4424189632
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-19 10:51:34 +02:00 |
|
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
|
fbsanchez
|
419a90d69c
|
wip event list
|
2019-06-07 17:35:13 +02:00 |
Daniel Maya
|
419b3f4fb1
|
Fixed module_manager with Agent limit surpassed or license expired
|
2019-06-03 10:47:54 +02:00 |
|
fbsanchez
|
eb5ee75d33
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-03 09:18:49 +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 |
|
fbsanchez
|
4fe7680694
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-05-22 15:33:13 +02:00 |
|
fbsanchez
|
bd88cbd42d
|
1st approach simplifying MC management
|
2019-05-22 15:31:59 +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 |
manuel.montes
|
d0e7b86112
|
Fixed bug in deleted policies from the metaconsole
|
2018-09-18 09:41:05 +02:00 |
|
fermin831
|
764b1125bd
|
Generate session csrf code to avoid attacks in user edition
|
2018-09-13 15:19:08 +02:00 |
|
daniel
|
f117d1af43
|
fixed heigth charts for reports
|
2018-09-11 09:33:24 +02:00 |
Alejandro Gallardo Escobar
|
21bad5330b
|
Bug fix
|
2018-09-04 17:24:03 +02:00 |
|
fbsanchez
|
ae6d7139b4
|
is_management_allowed fix
|
2018-07-24 18:24:03 +02:00 |
|
fbsanchez
|
581cf7c5a0
|
Added management_allowed
|
2018-07-24 17:55:33 +02:00 |
|
fermin831
|
001861b746
|
Hide policy edition on centralized management on node
|
2018-07-17 08:51:39 +02:00 |
|
daniel
|
23ef9c8f53
|
Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola
|
2018-07-12 14:49:59 +02:00 |
|
daniel
|
fce669ae21
|
fixed minor errors in legend charts
|
2018-07-10 17:53:19 +02:00 |
|
fermin831
|
aaf8173b8a
|
Added is_central_policies function
|
2018-07-10 17:49:46 +02:00 |
|
Alejandro Gallardo Escobar
|
de58fe7b90
|
Fixes
|
2018-07-06 14:03:05 +02:00 |
|
daniel
|
0dd39f1f00
|
fixed errors in graph slice for uncompresed
|
2018-07-05 11:52:52 +02:00 |
|
daniel
|
eaf5abd476
|
fixed keep alive bool type module 100
|
2018-06-25 15:35:12 +02:00 |
|
daniel
|
aa4f13d17a
|
fixed errors in graphs
|
2018-06-20 11:31:43 +02:00 |
|
fbsanchez
|
73567f1859
|
Trying to adjust graph render sizes
|
2018-06-19 19:19:38 +02:00 |
|
danielmaya
|
4214577eea
|
Added new token for static graph height
|
2018-06-19 18:27:04 +02:00 |
|
danielmaya
|
9bff4f28f4
|
Fixed graph with https
|
2018-06-19 15:00:39 +02:00 |
|
daniel
|
7d4a29cbe2
|
fixed errors in meta and windows
|
2018-06-14 19:19:58 +02:00 |
|
daniel
|
9e229e6228
|
fixed minor errors
|
2018-06-14 18:14:54 +02:00 |
|
daniel
|
80ddcbe1b6
|
fixed security error phantomjs
|
2018-06-14 16:47:23 +02:00 |
|
daniel
|
46c23f9deb
|
fixed minor errors in graphs: tree, labels, tocken meta
|
2018-06-14 12:17:16 +02:00 |