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

1057 Commits

Author SHA1 Message Date
daniel 4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' 
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
 2022-06-28 13:47:05 +00:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +00:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Rodriguez 98dd5b81ce Merge branch 'ent-8766-POST-Error-al-crear-eventos-con-comentarios-que-tienen-salto-de-línea' into 'develop' 
Ent 8766 post error al crear eventos con comentarios que tienen salto de línea

See merge request artica/pandorafms!4796
 2022-06-02 07:33:10 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
Daniel Maya 79e7753cc8 #9021 Added offspring check 2022-05-30 11:29:17 +02:00
Daniel Barbero Martin d0a04177c0 add treshold pdf pandora_enterprise#1419 2022-05-18 17:17:31 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
Daniel Maya 4a6ab6ce95 #8766 Fixed event comments 2022-04-04 16:02:26 +02:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
Daniel Barbero Martin 863e6c887f Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-04 08:17:03 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Daniel Rodriguez 99b8fa0cf6 Merge branch 'ent-8458-heatmap-view' into 'develop' 
Ent 8458 heatmap view

See merge request artica/pandorafms!4695
 2022-04-01 07:46:25 +00:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Daniel Maya e796dc52bb #8458 Change in refresh value 2022-03-31 09:46:30 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Maya cab85cbfbd #8458 Fixed errors 2022-03-30 10:21:30 +02:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop' 
Fix dashboard events responses

See merge request artica/pandorafms!4759
 2022-03-30 07:45:07 +00:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
Calvo 4109d94853 Fix events dashboard user owner entities 2022-03-25 14:07:44 +01:00
Calvo 5e6bdaeb15 Fix events dashboard user owner entities 2022-03-25 14:05:38 +01:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
Daniel Maya 270bb433da added heatmap ajax and class 2022-03-07 13:11:54 +01:00
Daniel Maya 74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
Luis 4b1c93d7b3 Treeview not showing notinit agents when filter enabled 2022-02-14 17:55:29 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
Daniel Barbero Martin a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Barbero Martin 89931ef564 alert template schedule #3943 2022-01-26 16:52:48 +01:00
Daniel Barbero Martin 74f73e2004 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-26 08:10:40 +01:00
Daniel Barbero Martin 1a6127624e alert template schedule 2022-01-26 08:07:00 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
Daniel Rodriguez 7d51176641 Merge branch 'ent-7076-11432-Forzar-chequeos-remotos-en-Consolas-Visuales' into 'develop' 
Ent 7076 11432 forzar chequeos remotos en consolas visuales

See merge request artica/pandorafms!4598
 2022-01-11 10:09:35 +00:00
Daniel Rodriguez 3ec6ba0e6d Merge branch 'ent-8201-Bug-en-widget-latest-events-Dashboard-metaconsola' into 'develop' 
Ent 8201 bug en widget latest events dashboard metaconsola

See merge request artica/pandorafms!4571
 2021-12-23 12:11:08 +00:00
Daniel Maya db72cba1d2 #7076 Added force remote check 2021-12-21 09:33:55 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
Daniel Maya e24987d03e #8201 Fix dashboard event dialog 2021-12-07 12:17:26 +01:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Jose Gonzalez 64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
Jose Gonzalez 7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop' 
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
 2021-11-29 11:36:52 +00:00
Jose Gonzalez 5eb4a869cc Fix issue with metaconsole comments 2021-11-26 11:51:27 +01:00
Jose Gonzalez b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00:00
Calvo 6a2e249af7 Fix missing parameter meta on event comments ajax 2021-10-29 10:23:56 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
Daniel Rodriguez 04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Calvo 67e95f7f77 Merge remote-tracking branch 'origin/ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 
Merge open branch ACL step 2 to continue with STEP3
 2021-08-11 11:16:57 +02:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
Calvo 9d04933ca2 Added missing sec related to GET params to ACL enterprise 2021-08-06 10:29:38 +02:00
Daniel Rodriguez 45abf89e6b Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop' 
fixed minnor error when show event comment with filters

See merge request artica/pandorafms!4241
 2021-08-05 11:08:41 +00:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
fbsanchez 056bd1460a Sound alerts only for NEW events found 2021-07-09 14:40:03 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
marcos a225bbdafc fixed minnor error when show event comment with filters 2021-06-28 14:21:45 +02:00
Luis ebceaebb58 Ent 7253 opcion formato envio informes templates 2021-06-21 13:41:14 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00