15166 Commits

Author SHA1 Message Date
Daniel Maya
0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
marcos
915c039fcd fixed sql error with secundary groups ZOS 2020-11-12 12:13:57 +01:00
artica
834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
alejandro-campos
2632256c10 fixed agent creation with unique ip condition 2020-11-11 17:45:21 +01:00
Luis Calvo
78df603c07 Fixed alert count bug on tactical view 2020-11-11 17:07:03 +01:00
alejandro-campos
c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
fbsanchez
b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
alejandro-campos
fc429efce2 fixed wrong error message: recon task is not necessarily linked to script 2020-11-11 09:52:15 +01:00
artica
33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
Jose Gonzalez
702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Jose Gonzalez
665deaa5c8 WIP: Backup upload 2020-11-10 12:23:50 +01:00
Daniel Maya
ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00
artica
2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica
767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica
4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica
5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
fbsanchez
067a19f69b WIP sticky lines 2020-11-06 20:37:37 +01:00
Jose Gonzalez
8a6a11fee6 WIP: Backup upload 2020-11-06 12:38:35 +01:00
Jose Gonzalez
22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
artica
2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
artica
6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
Daniel Rodriguez
b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
SAML with pandora sessions

See merge request artica/pandorafms!3533
2020-11-04 18:42:42 +01:00
Luis
2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Jose Gonzalez
b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez
a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -

See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
artica
081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
fbsanchez
c59042c034 WIP 2020-11-03 18:01:24 +01:00
Jose Gonzalez
938860dff2 Added wrapper attributes 2020-11-03 17:15:01 +01:00
fbsanchez
b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
alejandro-campos
241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Daniel Rodriguez
6a31a28679 Merge branch 'ent-6410-Wizard-SNMP-SNMP-Interfaces-y-WMI-no-autocompletan-Target-IP-con-IP-del-agente' into 'develop'
Ent 6410 wizard snmp snmp interfaces y wmi no autocompletan target ip con ip del agente

See merge request artica/pandorafms!3588
2020-11-03 10:26:24 +01:00
artica
58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica
d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica
4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica
3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
Daniel Rodriguez
4f1faf6a14 Merge branch 'ent-6677-error-sql-en-item-group-alert-report-metaconsola' into 'develop'
fix group alert report

See merge request artica/pandorafms!3587
2020-10-30 14:43:28 +01:00
Daniel Rodriguez
946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel
c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
Luis
25de1b686a Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug 2020-10-30 14:41:33 +01:00
fbsanchez
90f199c5ad WIP NetworkLink 2020-10-30 14:07:44 +01:00
fbsanchez
6267af774b Merge branch 'develop' into 'ent-6677-error-sql-en-item-group-alert-report-metaconsola'
Conflicts:
pandora_console/include/functions_alerts.php
2020-10-30 13:33:52 +01:00
daniel
b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez
79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop'
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
2020-10-30 13:28:35 +01:00
Daniel Maya
bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
daniel
4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
Daniel Rodriguez
64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop'
fix charts

See merge request artica/pandorafms!3581
2020-10-30 13:23:03 +01:00
marcos
07e2d5f4aa Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' of https://brutus.artica.es:8081/artica/pandorafms into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-10-30 11:34:34 +01:00
Daniel Rodriguez
a047ca8181 Merge branch 'ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan' into 'develop'
fixes in event macros (responses)

See merge request artica/pandorafms!3560
2020-10-30 11:32:09 +01:00
fbsanchez
2376ef408b Update functions_events.php resolve entities for group_name in event responses 2020-10-30 11:22:39 +01:00