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

35574 Commits

Author SHA1 Message Date
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Jorge Rincon 2fb9634c4b #11772 Fixed netflow server image 2023-07-31 09:02:46 +02:00
Rafael Ameijeiras 3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop' 
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
 2023-07-31 06:57:32 +00:00
Rafael Ameijeiras 6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' 
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
 2023-07-31 06:40:38 +00:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
Félix Suárez 3434b2e621 Fix on where clause 2023-07-30 10:48:57 -06:00
Félix Suárez f9e1480c56 Fix on table selection 2023-07-30 10:44:38 -06:00
Félix Suárez 9287c34008 Add _dataunit_ macro 2023-07-30 10:39:13 -06:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
Jorge Rincon 89f604a602 #11771 Fixed plugin type fields 2023-07-28 14:03:24 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
miguel angel rasteu 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +02:00
miguel angel rasteu cf7b123eb0 #11795 Prevent XSS attack in site news page 2023-07-28 12:36:10 +02:00
alejandro.campos@artica.es 75219fb465 keep user id 2023-07-28 12:31:20 +02:00
miguel angel rasteu 014d32181c #10875 Fix title 2023-07-28 12:12:14 +02:00
Enrique Martin 27bab031c3 Added add_monitoring_data function 2023-07-28 12:02:34 +02:00
Enrique Martin df36ea608a Updated README 2023-07-28 11:22:02 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +02:00
Enrique Martin f1938cdb76 Updated README example 2023-07-28 10:00:40 +02:00
Enrique Martin 1b2312ce9a Updated README example 2023-07-28 09:59:28 +02:00
Enrique Martin 64917608d5 Updated README example 2023-07-28 09:52:16 +02:00
Rafael Ameijeiras 319a4e1743 Merge branch 'ent-10478-problemas-con-repositorio-pandora-fms-y-agente-unix-linux' into 'develop' 
Added agent binary RPM spec

See merge request artica/pandorafms!6282
 2023-07-28 07:05:13 +00:00
Rafael Ameijeiras f7df38a0c4 Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop' 
Ent 11174 graficas descolocadas en diagnostic info

See merge request artica/pandorafms!6147
 2023-07-28 05:14:18 +00:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
Félix Suárez 06bba6c2b2 Add events and notifications 2023-07-27 11:58:06 -06:00
Enrique Martin 2098daa909 Added param default_values for init_agent 2023-07-27 16:04:27 +02:00
Enrique Martin e4ac6cb4ac Merge conflict fix 2023-07-27 16:00:26 +02:00
Enrique Martin 2ca114f844 Organization and new functions for pandoraPluginTools 2023-07-27 15:53:10 +02:00
alejandro.campos@artica.es cf26f4c32a fix inherit ack timestamp feature 2023-07-27 15:11:15 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop' 
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
 2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 8029125929 fix inherit ack timestamp feature 2023-07-27 15:04:22 +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
alejandro.campos@artica.es d7ad90dabf fixed api call 2023-07-27 12:58:57 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
alejandro 909d05b300 fix readme.md 2023-07-27 12:07:24 +02:00
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Jorge Rincon 03feeebbdf #11768 Fixed the style of the checkbox in the modal save filter 2023-07-27 11:09:24 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Pablo Aragon 5dbf61b424 11174-Timezone iana graph firefox 2023-07-27 09:46:29 +02:00
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop' 
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
 2023-07-27 07:24:09 +00:00
Pablo Aragon b45a563308 Merge branch 'develop' into ent-11174-graficas-descolocadas-en-diagnostic-info 2023-07-27 08:44:06 +02:00
Rafael Ameijeiras 77aaba52fc Merge branch 'ent-9869-no-desactivar-validate_password-en-nuevas-instalaciones' into 'develop' 
9869 adding check for mysql password validation to online installers

See merge request artica/pandorafms!6278
 2023-07-27 06:32:45 +00:00
rafael 622b5ea65b adding snmptrapd install to ubuntu 2023-07-27 08:30:15 +02:00
rafael 05b8df628c Merge branch 'develop' into ent-9869-no-desactivar-validate_password-en-nuevas-instalaciones 2023-07-27 07:50:49 +02:00
Rafael Ameijeiras 9f888643bf Merge branch 'ent-11602-vista-de-traps-no-mantiene-el-ancho-ni-traps-abiertas' into 'develop' 
Ent 11602 vista de traps no mantiene el ancho ni traps abiertas

See merge request artica/pandorafms!6146
 2023-07-27 05:46:57 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
alejandro b526b10200 add readme.md and minor changes 2023-07-26 15:28:44 +02:00