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

1482 Commits

Author SHA1 Message Date
miguel angel rasteu 049e25f866 #8686 Add filter in managemnet tree group 2023-10-06 13:51:18 +02:00
daniel 588f19fa18 fix cv in mobile pandora_enterprise#12196 2023-10-06 12:59:33 +02:00
miguel angel rasteu 09cae778c5 #12153 Create event list graph 2023-10-04 16:28:40 +02:00
miguel angel rasteu 874cb9c52a #12153 Create button and ajax request 2023-10-04 12:41:23 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop' 
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
 2023-10-02 07:08:52 +00:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' 
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
 2023-09-28 10:05:15 +00:00
Daniel Cebrian 62d501e6d5 #10194 sections Alerts and Events 2023-09-27 13:30:56 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-25 14:08:43 +00:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
miguel angel rasteu d83c1a81d2 #12052 Fix filter alter detail view 2023-09-19 13:50:06 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' 
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
 2023-09-18 07:55:18 +00:00
Rafael Ameijeiras b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop' 
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
 2023-09-18 07:22:13 +00:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Jorge Rincon 35b5de57f1 The filter group is added in the Service View Widget settings. 2023-09-13 11:12:11 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Rafael Ameijeiras 0c6aaa6723 Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop' 
Ent 11993 user notifications esta roto

See merge request artica/pandorafms!6412
 2023-09-11 07:15:38 +00:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
miguel angel rasteu f445066d13 #11679 Fix linked module name 2023-09-07 16:29:18 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Matias Didier 96c722b816 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop' 
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6382
 2023-09-06 06:56:59 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
miguel angel rasteu 4911d84c76 #11993 Fix configration users notification 2023-09-05 11:52:16 +02:00
Calvo a8a201cf19 Agents show events 24h switch checked default 2023-09-04 16:47:01 +02:00
miguel angel rasteu dc520df039 #9946 Fix delete and copy 2023-09-04 11:09:58 +02:00
miguel angel rasteu 81610046e3 #9946 Fix url 2023-09-04 10:58:15 +02:00
miguel angel rasteu 5ca1c54792 #9946 Add search filter and change table to datatable 2023-09-04 10:49:29 +02:00
Calvo 2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
miguel angel rasteu 0194fbaa59 #11206 Fix custom field view 2023-08-22 11:16:17 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
miguel angel rasteu 817c3223be #11206 Fix custom field view 2023-08-21 15:11:13 +02:00
miguel angel rasteu a251046452 #11206 Fix conflict 2023-08-21 08:36:42 +02:00
Daniel Cebrian fa04db27a7 Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento 2023-08-18 10:40:29 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jonathan fb4ac30b57 #10598 show error on create web and check 2023-08-09 13:20:43 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Rafael Ameijeiras 75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop' 
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
 2023-07-31 13:10:53 +00:00
Rafael Ameijeiras 68b2fbd616 Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop' 
Ent 11467 bug en vista tree view

See merge request artica/pandorafms!6276
 2023-07-31 10:12:33 +00:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +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
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
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
Rafael Ameijeiras 1f52a2d466 Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop' 
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena

See merge request artica/pandorafms!6235
 2023-07-25 07:54:36 +00:00
Jorge Rincon 19c600fb9b #11467 fixed error message and advanced info section from tree view 2023-07-24 14:54:38 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
daniel 5707ec9e4b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-18 15:13:29 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras a8597e1cb4 Merge branch 'ent-11735-listado-de-modulos-rotos-en-develop' into 'develop' 
Ent 11735 listado de modulos rotos en develop

See merge request artica/pandorafms!6254
 2023-07-17 12:09:09 +00:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' 
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
 2023-07-17 07:53:10 +00:00
miguel angel rasteu 8d89ed90d3 #11735 Fix Agent view modules 2023-07-17 09:34:57 +02:00
Rafael Ameijeiras 3f9aea5fe4 Merge branch 'ent-7116-anadir-token-en-snmp-browser-para-poder-aplicar-ip-del-agente-a-los-modulos' into 'develop' 
Ent 7116 anadir token en snmp browser para poder aplicar ip del agente a los modulos

See merge request artica/pandorafms!6061
 2023-07-17 06:00:36 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
Jonathan ee37487b74 #10598 unknown create template and show 2023-07-14 11:44:37 +02:00
miguel angel rasteu 46f898c5a6 #11728 Fix module plugin server 2023-07-12 16:05:55 +02:00
miguel angel rasteu f6637e3827 #11031 fix audit log filter 2023-07-12 10:19:08 +02:00
miguel angel rasteu e3496a44b6 #11206 Add custom field view in nodes 2023-07-11 16:52:39 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' 
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
 2023-07-06 09:44:33 +00:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
Matias Didier 203446af70 Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop' 
Ent 11475 cambiar copyrights backend agentes

See merge request artica/pandorafms!6172
 2023-07-04 08:49:14 +00:00
Félix Suárez c926349c67 Update copyright years 2023-07-03 09:20:25 -06:00
Matias Didier b3d098794d Merge branch 'ent-10660-update-journal-usar-las-opciones-de-visual-styles' into 'develop' 
Ent 10660 update journal usar las opciones de visual styles

See merge request artica/pandorafms!5798
 2023-07-03 11:50:06 +00:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
Gorka Sanchez 64edf8bb66 Merge branch 'ent-11287-nombres-de-acciones-de-modulos-en-vista-de-agente-al-hacer-hover' into 'develop' 
Ent 11287 nombres de acciones de modulos en vista de agente al hacer hover

See merge request artica/pandorafms!5950
 2023-07-03 07:39:23 +00:00
Matias Didier 8e42ee6c82 Merge branch 'ent-11262-15597-modulos-deshabiitados-aparecen-en-el-widget-del-dashboard-de-reportes' into 'develop' 
Ent 11262 15597 modulos deshabiitados aparecen en el widget del dashboard de reportes

See merge request artica/pandorafms!5966
 2023-06-28 12:05:03 +00:00
Matias Didier 43e158011a Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop' 
Ent 11139 icono de lupa descolocado en alert details

See merge request artica/pandorafms!5877
 2023-06-27 08:37:39 +00:00
Daniel Cebrian adb7c33863 #10870 changed status from view details views when is agruped by extraid 2023-06-26 17:05:46 +02:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02:00
Rafael Ameijeiras 7065d8bb4d Merge branch 'ent-11550-widget-tactical-view-muestra-todos-los-datos-en-algunas-partes-aun-filtrando-por-grupo' into 'develop' 
Ent 11550 widget tactical view muestra todos los datos en algunas partes aun filtrando por grupo

See merge request artica/pandorafms!6096
 2023-06-26 07:35:24 +00:00
Félix Suárez e17e2ee66c Replace "Artica Soluciones Tecnol[o,ó]gicas S.L" 2023-06-23 15:08:07 -06:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' 
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
 2023-06-22 13:24:47 +00:00
miguel angel rasteu 5d4f90ca10 #11550 Fix tactical view widget 2023-06-21 16:10:13 +02:00
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Daniel Cebrian 308879fe05 #9771 moved discovery to open 2023-06-14 11:09:08 +02:00
Calvo 0c81c9fb59 Fix alert list queries performance 2023-06-13 18:34:57 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Pablo Aragon f207e4f9c1 7116-SNMP Browser - Token Use agent IP 2023-06-07 17:01:28 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
Jonathan ebdc735bd4 #10598 V2 wizard welcome 2023-06-02 13:32:47 +02:00
miguel angel rasteu 964c1f3142 #11287 Fix title icons 2023-06-02 12:03:29 +02:00
miguel angel rasteu d12d98d458 #11287 Fix title icons 2023-06-02 11:42:18 +02:00
Daniel Cebrian 54ba66e72a #11418 change graph in agent view 2023-06-01 14:53:45 +02:00
Daniel Cebrian f7c5d6b296 #11432 added tip in Threshold in alert popup 2023-06-01 10:43:48 +02:00
Daniel Cebrian 913775c0d3 #11262 added new token in modules by status for filter disabled modules 2023-05-26 08:57:45 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
miguel angel rasteu e783cd6f29 #11287 Add title to image 2023-05-23 15:20:30 +02:00
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop' 
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
 2023-05-23 10:07:14 +00:00
Matias Didier 47430f926e Merge branch 'ent-11140-algunos-wizards-siguen-sin-tener-los-estilos-aplicados' into 'develop' 
Ent 11140 algunos wizards siguen sin tener los estilos aplicados

See merge request artica/pandorafms!5883
 2023-05-22 11:38:53 +00:00
Jonathan 5fe0f7fb08 #11140 fix style message warning 2023-05-22 11:39:59 +02:00
Diego Muñoz-Reja 4a8e8f4ae1 Merge branch 'ent-11103-15535-agente-debe-de-ser-aplicado-cuando-ya-esta-aplicado' into 'develop' 
fixed modules adopted pandora_enterprise#11103

See merge request artica/pandorafms!5836
 2023-05-18 09:20:31 +00:00
Rafael Ameijeiras d57e9c4f16 Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' 
Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar

See merge request artica/pandorafms!5827
 2023-05-17 08:05:09 +00:00
Pablo Aragon f4cf8e769a 11094-Fix plugin data recovery 2023-05-16 16:00:17 +02:00
Rafael Ameijeiras eb0be5c2c7 Merge branch 'ent-11067-no-aparece-la-ip-al-hacer-hover-sobre-el-modulo' into 'develop' 
Ent 11067 no aparece la ip al hacer hover sobre el modulo

See merge request artica/pandorafms!5801
 2023-05-12 09:20:38 +00:00
Matias Didier e870f45e5c Merge branch 'ent-10947-cuando-un-modulo-esta-en-un-estado-que-no-sea-normal-en-la-vista-de-heatmap-se-descoloca' into 'develop' 
Ent 10947 cuando un modulo esta en un estado que no sea normal en la vista de heatmap se descoloca

See merge request artica/pandorafms!5769
 2023-05-11 12:36:55 +00:00
Jorge Rincon 4b5cce3343 #11139 fixed the position of the magnifying glass icon, in the template column 2023-05-10 16:24:22 +02:00
miguel angel rasteu f9b7ac523e #11067 Fix IP target title 2023-05-08 11:59:08 +02:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
miguel angel rasteu a40c04aa49 #10660 Update the function to create the warp journal table for check the variable config prominent time and prints the timestamp according this 2023-04-27 09:08:24 +02:00
Pablo Aragon 20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Jorge Rincon 9ef46ec9d5 #18085 fixed up error message 2023-04-17 08:52:36 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop' 
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
 2023-04-13 08:24:18 +00:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
Pablo Aragon b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
Jonathan ea6aa8629b Module check force 2023-03-27 14:07:36 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Daniel Maya e311c81f84 #8642 Fixed meta 2023-03-24 14:11:08 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Rafael Ameijeiras 4535fb85a3 Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop' 
fixes in event comments

See merge request artica/pandorafms!5591
 2023-03-22 17:05:54 +00:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Pablo Aragon 00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon 938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
 2023-03-13 10:43:38 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Jose Gonzalez bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
alejandro.campos@artica.es 5148dcdaef fixes in event comments 2023-03-09 17:17:54 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
Pablo Aragon 87e82c0410 10457-Audit log, save/load filters 2023-03-08 15:30:48 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00