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

23194 Commits

Author SHA1 Message Date
artica 60a4d1cfc0 Auto-updated build strings. 2021-12-27 01:00:14 +01:00
artica 78657f0e7e Auto-updated build strings. 2021-12-26 01:00:15 +01:00
artica 2d0531e0a6 Auto-updated build strings. 2021-12-25 01:00:19 +01:00
Jose Gonzalez e9b619f507 Fix issue with output 2021-12-24 12:08:25 +01:00
artica 3da9a8ab91 Auto-updated build strings. 2021-12-24 01:00:22 +01:00
Daniel Rodriguez f102460978 Merge branch 'ent-8131-items-sql-graph-no-se-ajustan-a-tamano-setup' into 'develop' 
Setted graph_image_height

Closes pandora_enterprise#8131

See merge request artica/pandorafms!4600
 2021-12-23 12:24:06 +00:00
Daniel Rodriguez f0562980f7 Merge branch 'ent-7925-Bugs-de-capas-en-mapas-GIS' into 'develop' 
Ent 7925 bugs de capas en mapas gis

See merge request artica/pandorafms!4579
 2021-12-23 12:23:07 +00:00
Daniel Rodriguez e0a925c2c1 Merge branch 'ent-8384-error-sql-ordenar-agent-id' into 'develop' 
Added php8 function and solve issue with agent id sorting in events

Closes pandora_enterprise#8384

See merge request artica/pandorafms!4592
 2021-12-23 12:19:24 +00:00
Daniel Rodriguez 7f78a5b514 Merge branch 'ent-8179-Mensaje-anti-hacking-al-intentar-eliminar-modulos' into 'develop' 
minor fix

See merge request artica/pandorafms!4562
 2021-12-23 12:16:54 +00:00
Daniel Rodriguez 7c09ce1a6d Merge branch 'ent-8295-Meter-spinner-en-visualizador-de-graficas-combinadas' into 'develop' 
Ent 8295 meter spinner en visualizador de graficas combinadas

See merge request artica/pandorafms!4563
 2021-12-23 12:13:05 +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 Rodriguez 5a0c25b3fc Merge branch 'ent-8207-Elemento-Grupo-se-descuadra-Consola-Visual' into 'develop' 
Ent 8207 elemento grupo se descuadra consola visual

See merge request artica/pandorafms!4568
 2021-12-23 12:00:50 +00:00
Daniel Rodriguez 31a90c4170 Merge branch 'ent-8255-Al-editar-una-acción-de-alerta-no-se-cargan-los-boxes-de-los-fields-creados-con-tags' into 'develop' 
Ent 8255 al editar una acción de alerta no se cargan los boxes de los fields creados con tags

See merge request artica/pandorafms!4561
 2021-12-23 11:59:58 +00:00
Daniel Rodriguez 04f06b13be Merge branch 'ent-8262-12695-Bug-en-paginación-de-accciones-de-alerta-META' into 'develop' 
Ent 8262 12695 bug en paginación de accciones de alerta meta

See merge request artica/pandorafms!4552
 2021-12-23 10:09:37 +00:00
Daniel Rodriguez 7c18becd10 Merge branch 'ent-7897-Bug-en-widget-Agent-Module-view-Dashboard-metaconsola' into 'develop' 
Ent 7897 bug en widget agent module view dashboard metaconsola

See merge request artica/pandorafms!4596
 2021-12-23 10:05:20 +00:00
Daniel Rodriguez b8a1602aaf Merge branch 'ent-8260-Bug-en-edición-de-acción-de-alerta-Create-Integria-IMS-ticket-metaconsola' into 'develop' 
Ent 8260 bug en edición de acción de alerta create integria ims ticket metaconsola

See merge request artica/pandorafms!4553
 2021-12-23 10:03:51 +00:00
Daniel Rodriguez f8b90c21ed Merge branch 'ent-8180-Bug-en-widget-Network-map-Dashboard-metaconsola' into 'develop' 
Ent 8180 bug en widget network map dashboard metaconsola

See merge request artica/pandorafms!4573
 2021-12-23 10:02:24 +00:00
Daniel Rodriguez dab6763ce7 Merge branch 'ent-8195-Bug-en-fullscreen-consolas-visuales-metaconsola' into 'develop' 
Ent 8195 bug en fullscreen consolas visuales metaconsola

See merge request artica/pandorafms!4572
 2021-12-23 10:00:23 +00:00
artica e7949e3480 Auto-updated build strings. 2021-12-23 01:00:17 +01:00
Jose Gonzalez 7ea195c9c7 WIP: Setted graph_image_height 2021-12-22 11:06:11 +01:00
artica f534f8357d Auto-updated build strings. 2021-12-22 01:00:19 +01:00
Daniel Maya 7767e9aae2 #8295 Fixed data 2021-12-21 15:22:22 +01:00
artica ed4e1e4be4 Auto-updated build strings. 2021-12-21 01:00:19 +01:00
Daniel Maya c77b62e13d #7897 Fixed css 2021-12-20 10:15:57 +01:00
artica 0c1829a555 Auto-updated build strings. 2021-12-20 01:00:16 +01:00
artica 0d3d666a52 Auto-updated build strings. 2021-12-19 01:00:17 +01:00
artica b808f6fa0b Auto-updated build strings. 2021-12-18 01:00:21 +01:00
artica 95b85284dd Auto-updated build strings. 2021-12-17 01:00:21 +01:00
fbsanchez 757f9b7510 Recovered servers fix 2021-12-16 18:29:27 +01:00
fbsanchez 54576be543 Warn if different MR on centralised environments 2021-12-16 17:46:45 +01:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
Daniel Maya d1455efc81 #8199 Fixed legend 2021-12-16 14:52:57 +01:00
fbsanchez 1053062f72 Update pandora_console/extras/mr/51.sql 2021-12-16 11:48:03 +00:00
Daniel Barbero Martin 935c7f6937 fixed MR 2021-12-16 11:45:42 +01:00
Calvo 0bad3761a7 Fix db lock stopping policy apply 2021-12-16 10:26:45 +01:00
artica 231221830b Auto-updated build strings. 2021-12-16 01:00:18 +01:00
Daniel Barbero Martin 2431067e2c fixed automatic graph templates reports #8383 2021-12-15 15:13:33 +01:00
Daniel Barbero Martin b4131431af fixed mr 2021-12-15 09:55:03 +01:00
artica 34204d4224 Auto-updated build strings. 2021-12-15 01:00:23 +01:00
artica 6d054051ea Updated version and build strings. 2021-12-14 15:32:04 +01:00
Daniel Rodriguez a8b205f0a7 Merge branch 'ent-8373-actualizar-traducciones' into 'develop' 
Upadted po mo

See merge request artica/pandorafms!4584
 2021-12-14 14:10:48 +00:00
Daniel Rodriguez f5f35f0f40 Merge branch 'ent-8355-12617-GUARDIA-Problemas-de-visualización-de-eventos' into 'develop' 
Ent 8355 12617 guardia problemas de visualización de eventos

See merge request artica/pandorafms!4577
 2021-12-14 14:07:46 +00:00
Calvo b50b06ae34 Upadted po mo 2021-12-14 14:01:41 +01:00
Jose Gonzalez 73c7fea94e Fixed issue with enterprise feature in community 2021-12-14 12:22:00 +01:00
Jose Gonzalez 4924e0d6bc Updated audit logs view and added controller 2021-12-14 12:06:20 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez fa6690b55a Merge branch 'ent-8368-Faltan-mayusculas-en-nuevo-item-de-informes-Actions-alert-report' into 'develop' 
report alert action ucfirst th table #8368

See merge request artica/pandorafms!4580
 2021-12-14 09:48:23 +00:00
Daniel Rodriguez fab73dc290 Merge branch 'ent-5188-IPAM-Implementacion-de-Sites' into 'develop' 
Ent 5188 ipam implementacion de sites

See merge request artica/pandorafms!4575
 2021-12-14 09:47:39 +00:00
Daniel Barbero Martin 6cb26d2547 report alert action ucfirst th table #8368 2021-12-14 08:33:24 +01:00
artica 859c632132 Auto-updated build strings. 2021-12-14 01:00:20 +01:00
Daniel Rodriguez c773f5abd2 Merge branch 'ent-8321-formularios-modulos-de-tendencias-ticket-7456' into 'develop' 
Ent 8321 formularios modulos de tendencias ticket 7456

See merge request artica/pandorafms!4565
 2021-12-13 16:14:15 +00:00
Daniel Maya ae5a98ef67 #7925 Fixed group select 2021-12-13 15:09:22 +01:00
Calvo 6c94cc5e15 Fix visual bug 2021-12-13 12:00:24 +01:00
artica 88fe0b69cc Auto-updated build strings. 2021-12-13 01:00:16 +01:00
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
Calvo f6c0f50a90 Added missin param and Fixed error message and default interval 2021-12-10 18:00:33 +01:00
fbsanchez f8883151f3 allow datatable to export all columns but latest one 2021-12-10 13:43:05 +01:00
Daniel Maya 002ae85d64 #8355 replace in_array 2021-12-10 10:58:14 +01:00
Daniel Barbero Martin b55679cbfd Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites 2021-12-10 08:18:46 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
Daniel Rodriguez 76bcbd3c33 Merge branch 'ent-8324-desincronizacion-entornos-metaconsola-transacciones' into 'develop' 
force db_process_sql

See merge request artica/pandorafms!4570
 2021-12-09 17:45:43 +00:00
Daniel Rodriguez 92f789945a Merge branch 'ent-8075-Informe-de-acciones-de-alerta' into 'develop' 
WIP new report alert fired actions

See merge request artica/pandorafms!4531
 2021-12-09 17:31:42 +00:00
alejandro.campos@artica.es d3e99b315f fixed interface wizard selectors 2021-12-09 18:00:39 +01:00
Daniel Barbero Martin b97ecda12b db changes 2021-12-09 16:19:05 +01:00
fbsanchez 5c25fa8406 mr updates and a pretty icon 2021-12-09 15:07:35 +01:00
fbsanchez e37cdc4459 Improvements in Entity class 2021-12-09 14:57:37 +01:00
fbsanchez cb6184a943 mr fix 2021-12-09 14:02:06 +01:00
fbsanchez 2cbfca2cdd mr rev + timap_sites 2021-12-09 13:51:20 +01:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +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 57cd3d7309 #8171 Fixed server type in metaconsole 2021-12-07 16:21:20 +01:00
Daniel Barbero Martin ffc3728f2a fix minor error 2021-12-07 15:50:34 +01:00
Daniel Maya 765a36f913 #8180 Fix map select in metaconsole 2021-12-07 15:48:49 +01:00
Daniel Maya 2e8a1ecdc8 #8195 Fix z-index in full screen mode 2021-12-07 14:11:33 +01:00
fbsanchez 0d08e27865 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-07 13:03:10 +01:00
Daniel Maya e24987d03e #8201 Fix dashboard event dialog 2021-12-07 12:17:26 +01:00
Daniel Barbero Martin c20b3bacc8 wip reports alert actions 2021-12-07 11:00:48 +01:00
Daniel Barbero Martin b19bc9c8ab wip reports alert actions 2021-12-07 09:05:50 +01:00
Daniel Barbero Martin 118b1e1b80 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-07 08:34:03 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
fbsanchez 6d469912fa some fixes 2021-12-03 14:24:00 +01:00
fbsanchez 5b06415235 errata fix 2021-12-03 13:58:14 +01:00
fbsanchez a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
Calvo f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Daniel Maya be587c5294 #8207 Fixed group item 2021-12-03 10:38:27 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
Daniel Maya 6ead6b8a48 #8232 Fixed value in password 2021-12-03 09:22:39 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Daniel Barbero Martin eb8b89f22e wip reports alert actions 2021-12-02 17:17:21 +01:00
Daniel Barbero Martin 5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
Daniel Barbero Martin 94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
fbsanchez 00d79b553c missing in merge mr 2021-12-02 14:46:31 +01:00
Daniel Barbero Martin ec21d9d08a wip reports alert actions 2021-12-02 14:27:24 +01:00
Daniel Barbero Martin d030b3b924 wip reports alert actions 2021-12-02 14:16:01 +01:00