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

25808 Commits

Author SHA1 Message Date
artica 23e333f58d Auto-updated build strings. 2023-02-28 01:00:26 +01:00
Diego Muñoz-Reja 0f635c8206 Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop' 
Ent 10127 14800 anadir id nodo a llamada api validate events

See merge request artica/pandorafms!5479
 2023-02-27 16:53:01 +00:00
Matias Didier 47ec49280c Merge branch 'ent-10335-15016-edicion-comunidad-snmp-desdes-operaciones-masivas' into 'develop' 
Ent 10335 15016 edicion comunidad snmp desdes operaciones masivas

See merge request artica/pandorafms!5520
 2023-02-27 14:39:49 +00:00
Matias Didier 86b7e278ad Merge branch 'ent-10493-reinicio-de-la-paginacion-al-interactuar-con-un-elemento' into 'develop' 
Ent 10493 reinicio de la paginacion al interactuar con un elemento

See merge request artica/pandorafms!5556
 2023-02-27 11:08:42 +00:00
Rafael Ameijeiras b649d13d3f Merge branch 'ent-10337-GUARDIA-Problema-con-el-db-interface-de-meta' into 'develop' 
fixed node connection

See merge request artica/pandorafms!5517
 2023-02-27 08:51:19 +00:00
Matias Didier 1d30123d53 Merge branch 'ent-10259-control-de-configuracion-en-tagent_acess' into 'develop' 
Ent 10259 control de configuracion en tagent acess

See merge request artica/pandorafms!5504
 2023-02-27 08:45:00 +00:00
artica 491958a105 Auto-updated build strings. 2023-02-27 01:00:21 +01:00
artica ce5b0abda6 Auto-updated build strings. 2023-02-26 01:00:21 +01:00
artica e38504d3df Auto-updated build strings. 2023-02-25 01:00:27 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
Daniel Cebrian c7e53f5a1a #10259 resolve conflics 2023-02-24 12:07:37 +01:00
Diego Muñoz-Reja 76dbaf46d2 Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop' 
Ent 10321 limitacion del numero de eventos

See merge request artica/pandorafms!5513
 2023-02-24 10:06:44 +00:00
artica 4fdd5296a0 Auto-updated build strings. 2023-02-24 01:02:05 +01:00
artica 1babcb408d Auto-updated build strings. 2023-02-23 01:01:56 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop' 
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
 2023-02-22 15:09:19 +00:00
Daniel Cebrian 2980e180d8 Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2023-02-22 10:45:38 +00:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop' 
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
 2023-02-22 10:36:00 +00:00
Matias Didier c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop' 
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
 2023-02-22 10:15:26 +00:00
Daniel Cebrian 2b7b49db20 #10493 fixed pagination in tags 2023-02-22 09:29:55 +01:00
Daniel Cebrian 2f1060af56 #10493 fixed pagination in collection 2023-02-22 09:05:27 +01:00
artica 53ca822779 Auto-updated build strings. 2023-02-22 01:02:03 +01:00
Daniel Cebrian dfadbb0f80 #10493 added pagination in group module 2023-02-21 16:51:05 +01:00
Matias Didier 8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop' 
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
 2023-02-21 15:31:31 +00:00
Daniel Cebrian f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Daniel Cebrian 2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
Rafael Ameijeiras 776f0a69f5 Merge branch 'ent-10459-no-aplica-la-politica-de-contrasenas-en-el-cambio-de-password-usuario-admin' into 'develop' 
Draft: Ent 10459 no aplica la politica de contrasenas en el cambio de password usuario admin

See merge request artica/pandorafms!5549
 2023-02-21 09:03:33 +00:00
Rafael Ameijeiras 0fa39af4a9 Merge branch 'ent-10483-falla-el-csrf-en-login-despues-de-hacer-logout' into 'develop' 
Draft: Ent 10483 falla el csrf en login despues de hacer logout

See merge request artica/pandorafms!5550
 2023-02-21 09:02:40 +00:00
artica 490d3db086 Auto-updated build strings. 2023-02-21 01:01:52 +01:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop' 
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
 2023-02-20 23:00:29 +00:00
Jimmy Olano 34f66ae6f8 Merge branch 'ent-10283-arreglar-layout-de-filtro-de-la-vista-de-consola-de-traps' into 'develop' 
Ent 10283 arreglar layout de filtro de la vista de consola de traps

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10283

See merge request artica/pandorafms!5495
 2023-02-20 16:11:29 +00:00
Rafael Ameijeiras 8d13e873cc Merge branch 'ent-10217-disable-admin-s-account-via-cross-site-request-forgery' into 'develop' 
Ent 10217 disable admin s account via cross site request forgery

See merge request artica/pandorafms!5503
 2023-02-20 15:03:42 +00:00
Jimmy Olano 30604d50a6 Merge branch 'ent-10296-anadir-hora-del-servidor-live-en-general-setup-de-la-consola' into 'develop' 
Ent 10296 anadir hora del servidor live en general setup de la consola

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10296

See merge request artica/pandorafms!5515
 2023-02-20 13:56:55 +00:00
Daniel Cebrian f67bf4d084 #10416 added name agent in filter event 2023-02-20 13:10:00 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Daniel Cebrian 1d0046b3c1 #10459 activate Apply password policy to admin users default by default 2023-02-20 10:07:10 +01:00
artica c24bf70cc2 Auto-updated build strings. 2023-02-20 01:01:37 +01:00
artica 5a56dc0121 Auto-updated build strings. 2023-02-19 01:02:04 +01:00
artica 8db5ef0789 Auto-updated build strings. 2023-02-18 01:01:14 +01:00
artica 4962c0e769 Auto-updated build strings. 2023-02-17 01:01:21 +01:00
artica 09d0415654 Updated version and build strings. 2023-02-16 10:36:23 +01:00
Matias Didier c6f6a6b9d3 Merge branch 'ent-10410-Carga-muy-lenta-de-comentarios-de-eventos-en-tyr-saga' into 'develop' 
fixed comment loading in event dialog

See merge request artica/pandorafms!5543
 2023-02-16 09:34:35 +00:00
Daniel Rodriguez ef6059ed1e Merge branch 'ent-10432-actualizacion-traducciones' into 'develop' 
Ent 10432 actualizacion traducciones

See merge request artica/pandorafms!5542
 2023-02-16 08:46:15 +00:00
artica 204480bca1 Auto-updated build strings. 2023-02-16 01:02:18 +01:00
alejandro.campos@artica.es 5c57954b50 fixed comment loading in event dialog 2023-02-15 19:38:57 +01:00
Daniel Rodriguez 10d275c2a5 Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop' 
Fix showing all modules on monitors view on firt load

See merge request artica/pandorafms!5541
 2023-02-15 15:04:30 +00:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop' 
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
 2023-02-15 14:34:17 +00:00
Daniel Maya 18ac39f2c4 #10432 translation updates 2023-02-15 15:05:17 +01:00
Calvo 70291758c8 Fix showing all modules on monitors view on firt load 2023-02-15 14:25:43 +01:00
Diego Muñoz-Reja 472ffdf443 Merge branch 'ent-10118-creacion-de-mapas-de-red' into 'develop' 
Ent 10118 creacion de mapas de red

See merge request artica/pandorafms!5531
 2023-02-15 12:55:43 +00:00
Daniel Maya 845a2d08c3 #10118 Changed id_group 2 2023-02-15 13:42:19 +01:00