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

271 Commits

Author SHA1 Message Date
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
daniel 95575b4e90 remove old format events sounds pandora_enterprise#10208 2023-01-27 12:37:25 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-13 11:42:41 +00:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
jose.gonzalez@pandorafms.com f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Maya 74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
Daniel Maya 3c50164270 WIP heatmap 2022-02-11 14:50:57 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
 2021-11-22 15:54:05 +00: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 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
Jose Gonzalez b61e7c6c58 Fixed visual with browsers with more zoom 2021-10-19 17:04:39 +02:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
alejandro.campos@artica.es 93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Luis Calvo 778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
Luis Calvo 210f2057cd Removes event_statistics view 2020-12-21 17:56:24 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
vgilc f4372bb766 Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop' 
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales

See merge request artica/pandorafms!2861
 2019-12-10 11:43:46 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente 32f4ad2c4f Changed name of variable filter in menu 2019-11-05 11:20:57 +01: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