daniel
|
4c11595899
|
fix name token easter eggs pandora_enterprise#12201
|
2023-12-14 16:48:10 +01:00 |
|
daniel
|
27a83a8eb5
|
Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
pandora_console/include/functions_config.php
|
2023-12-14 16:36:11 +01:00 |
Jonathan
|
5fa9cd5877
|
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-12-13 11:19:32 +01:00 |
|
Jonathan
|
6e60d19193
|
#8365 ftp server ip
|
2023-12-12 15:46:42 +01:00 |
Jorge Rincon
|
725c5d964c
|
#12620 fixed blacklist items in setup
|
2023-12-07 13:09:42 +01:00 |
Matias Didier
|
874e60bf55
|
Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
Ent 12248 mover token de configuracion s flow a la seccion de netflow
See merge request artica/pandorafms!6621
|
2023-11-30 13:05:46 +00:00 |
|
Jonathan
|
75d57337af
|
#11705 Fix merge conflict
|
2023-11-30 08:10:32 +01:00 |
|
Jorge Rincon
|
1f51b0475e
|
#12201 Added configuration in the setup for easter egg
|
2023-11-24 13:12:12 +01:00 |
|
Jonathan
|
4f707a5a1b
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-23 09:27:46 +01:00 |
|
Jorge Rincon
|
e60b97c234
|
Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico
|
2023-11-20 15:32:06 +01:00 |
|
Jonathan
|
54514b043d
|
#12248 move nflow to netflow config
|
2023-11-03 11:35:22 +01:00 |
|
Jonathan
|
1362ff0967
|
Revert "#12248 change setup netflow tab"
This reverts commit 1412480b4d.
|
2023-11-03 11:32:54 +01:00 |
|
Jonathan
|
1412480b4d
|
#12248 change setup netflow tab
|
2023-11-03 09:54:56 +01:00 |
Daniel Cebrian
|
5e497db840
|
#11126 moved token vulnerabilities to enterprise
|
2023-10-25 11:48:49 +02:00 |
|
Daniel Cebrian
|
a862a8018c
|
#11126 added token in config agent and setup
|
2023-10-24 18:02:14 +02:00 |
|
Jonathan
|
70e3707b64
|
#11705 group extra id heredity event custom id
|
2023-09-25 12:22:10 +02:00 |
|
Jorge Rincon
|
01bf91f213
|
#11127 Added token Number of modules in queue
|
2023-09-22 13:13:06 +02:00 |
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
Daniel Rodriguez
|
4148074996
|
Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token
See merge request artica/pandorafms!6133
|
2023-07-21 07:23:33 +00:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
Diego Muñoz-Reja
|
57058c4f9c
|
Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771
See merge request artica/pandorafms!6001
|
2023-07-13 07:55:47 +00:00 |
|
daniel
|
d3412a7ad1
|
add filter events comments pandora_enterprise#11387
|
2023-07-10 16:26:33 +02:00 |
miguel angel rasteu
|
8ad4e8261e
|
#10563 Fix config enable feedback
|
2023-07-03 10:22:22 +02:00 |
|
miguel angel rasteu
|
ac92b5979c
|
#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality
|
2023-06-30 08:35:37 +02:00 |
|
alejandro.campos@artica.es
|
1499af3a2d
|
added setup token
|
2023-06-19 11:04:08 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
miguel angel rasteu
|
80aeaebfad
|
#11266 Add hint
|
2023-05-31 09:26:42 +02:00 |
|
miguel angel rasteu
|
08a4c28953
|
#11266 Fix location of console.log
|
2023-05-31 09:22:16 +02:00 |
|
Daniel Rodriguez
|
191c7d3098
|
Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop'
Ent 10820 15230 mantener el estado del evento anterior con extra
See merge request artica/pandorafms!5709
|
2023-04-28 06:07:10 +00:00 |
Daniel Maya
|
a8277dc19f
|
#10945 Fix timestamp
|
2023-04-13 12:25:18 +02:00 |
|
alejandro.campos@artica.es
|
23f0ffdf9e
|
Keep In process status for new events with same extra id
|
2023-04-12 17:46:10 +02:00 |
|
alejandro.campos@artica.es
|
2ca27ae15d
|
Keep In process status for new events with same extra id
|
2023-04-12 17:32:52 +02:00 |
|
Daniel Cebrian
|
b9fc352578
|
merge develop into ent-10633-pantalla-de-timeout
|
2023-03-30 09:15:10 +02:00 |
|
Daniel Cebrian
|
9dea38f440
|
Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos
|
2023-03-21 09:38:56 +01:00 |
Jose Gonzalez
|
8d7620e88d
|
Setup updates
|
2023-03-16 13:11:11 +01:00 |
|
Jose Gonzalez
|
21c263c7c4
|
Setup views
|
2023-03-16 11:58:35 +01:00 |
|
Jose Gonzalez
|
d2a807636e
|
General Setup view
|
2023-03-15 17:43:35 +01:00 |
|
Daniel Cebrian
|
d315d4cda7
|
#10633 added token for control check conexion interval
|
2023-03-14 13:16:58 +01:00 |
|
Daniel Cebrian
|
ca78f069f6
|
#9624 added support sflow
|
2023-03-10 17:12:38 +01:00 |
|
Jose Gonzalez
|
edbc9d8f6b
|
Icons review
|
2023-03-09 23:31:40 +01:00 |
|
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
|
Jonathan
|
ce45469f83
|
Fix setup visual bugs
|
2023-02-16 13:16:31 +01:00 |
|
Daniel Cebrian
|
aedf6986b3
|
#10253 added console alert for control variables performance
|
2023-02-06 15:22:39 +01:00 |
|
Daniel Cebrian
|
31acafc00f
|
#10253 Enforcement options in setup visuals and general setup
|
2023-02-06 09:06:34 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
Calvo
|
c8bbf1e2dc
|
Fix minor bug
|
2023-01-05 08:56:07 +01:00 |