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

22407 Commits

Author SHA1 Message Date
Daniel Rodriguez 5f463e51b8 Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop' 
Fixed issue with instructions in events view

See merge request artica/pandorafms!2752
 2019-10-03 16:59:03 +02:00
Daniel Rodriguez b2157f4b32 Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop' 
add condition in query

See merge request artica/pandorafms!2710
 2019-10-03 16:41:15 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos 
Conflicts:
	pandora_console/include/functions_events.php
 2019-10-03 15:59:15 +02:00
Daniel Rodriguez 4f81ffbf62 Merge branch 'ent-4583-hint-mal-construido-en-editar-usuario-home-screen' into 'develop' 
chaged hint from home screen

See merge request artica/pandorafms!2704
 2019-10-03 14:53:37 +02:00
Daniel Rodriguez eba64ce0e7 Merge branch 'ent-4669-fallo-escritura-notificacion-serialize-precision' into 'develop' 
Fixed notifiation text  misprint

See merge request artica/pandorafms!2737
 2019-10-03 14:35:32 +02:00
marcos.alconada ec86380ee7 changed hint from home screen edit user 2019-10-03 14:27:10 +02:00
marcos.alconada 6f14aa3d2a Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen 2019-10-03 14:17:23 +02:00
Alejandro Fraguas e42932ad19 Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop' 
fixed summatory series custom graph

See merge request artica/pandorafms!2754
 2019-10-03 13:38:18 +02:00
Alejandro Fraguas e174f8dda9 Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop' 
Fixed CSV custom graphs export

See merge request artica/pandorafms!2694
 2019-10-03 12:59:30 +02:00
Alejandro Fraguas a40592b041 Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop' 
Fixed bug in list graphs view

See merge request artica/pandorafms!2711
 2019-10-03 10:37:49 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
artica 8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
artica c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
artica b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica 7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica 15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
Daniel Rodriguez 03b34d9af8 Merge branch 'ent-4461-Problema-logo-integria' into 'develop' 
fixed integria logo redirection in integria setup

See merge request artica/pandorafms!2768
 2019-09-27 09:20:26 +02:00
alejandro-campos 5e0b7fc2b7 fixed integria logo redirection in integria setup 2019-09-27 09:07:09 +02:00
artica dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
daniel e7fefd5fae Merge branch 'ramita-qa-daniel-mrs' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2763
 2019-09-26 16:50:17 +02:00
Daniel Barbero Martin 2ee725b204 fixed minor error 2019-09-26 16:43:31 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +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 2ec562fcc0 changed help in setup integria 2019-09-26 13:36:14 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Luis 84611c7d29 Merge branch 'develop' into 'ent-4669-fallo-escritura-notificacion-serialize-precision' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2019-09-26 11:44:56 +02:00
alejandro-campos 0fdf3874d4 Add ACL in integria ticket dashboard 2019-09-26 11:05:27 +02:00
alejandro-campos 93b176269c remove acl check in integria ticket dashboard 2019-09-26 10:38:12 +02:00
alejandro-campos ca184faaa0 minor visual fix in integria ticket creation 2019-09-26 10:10:55 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
artica 0dd0c4c36d Auto-updated build strings. 2019-09-26 00:01:08 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
Alejandro Fraguas 970cbbb4be Merge branch 'ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker' into 'develop' 
module_interval in broker (linux agents)

See merge request artica/pandorafms!2709
 2019-09-25 15:34:48 +02:00
Tatiana Llorente 188fce7174 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:52:58 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
Daniel Rodriguez e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' 
fixed error percentil label

See merge request artica/pandorafms!2734
 2019-09-25 10:27:13 +02:00
artica 0a6c5352e6 Auto-updated build strings. 2019-09-25 00:01:10 +02:00
fbsanchez 3be05cf385 added module_interval feature to broker agents 2019-09-24 19:13:55 +02:00
fbsanchez afe730d4c4 Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker 2019-09-24 19:09:33 +02:00
Alejandro Fraguas 8cca9d5f64 Merge branch 'ent-4616-discovery-en-windows' into 'develop' 
Windows: Revisión general Pandora - Discovery

See merge request artica/pandorafms!2715
 2019-09-24 19:07:55 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Barbero Martin 43aa13b4e5 fixed summatory series custom graph 2019-09-24 17:39:11 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
Daniel Rodriguez 8e728eed6b Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop' 
changed style on tables pdf report

See merge request artica/pandorafms!2718
 2019-09-24 12:33:46 +02:00
fbsanchez ce19ac529f Merge remote-tracking branch 'origin/develop' into ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker 2019-09-24 12:27:38 +02:00
Daniel Rodriguez 2798512208 Merge branch 'ent-4680-fallos-en-los-reports-de-eventos' into 'develop' 
Fixed bug in report items

See merge request artica/pandorafms!2750
 2019-09-24 12:06:14 +02:00
Daniel Rodriguez 8327cbc794 Merge branch 'ent-4615-implementar-cifrado-en-los-contenedores-de-credenciales-usando-el-sistema-de-cifrado-interno-de-pandora' into 'develop' 
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora

See merge request artica/pandorafms!2744
 2019-09-24 11:25:53 +02:00