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

4505 Commits

Author SHA1 Message Date
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 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 529ce88d00 Merge branch 'ent-9131-Falla-carga-de-eventos-v762-ante-eventos-especificos' into 'develop' 
Fix possible custom_data with null strings

See merge request artica/pandorafms!4952
 2022-06-21 08:31:53 +00:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop' 
Fix black theme issues

See merge request artica/pandorafms!4873
 2022-06-20 09:38:25 +00:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Calvo 5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
Daniel Rodriguez ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop' 
Improve event names

See merge request artica/pandorafms!4951
 2022-06-16 06:41:07 +00:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +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 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Rodriguez 3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop' 
Change selector size

See merge request artica/pandorafms!4920
 2022-06-13 09:22:22 +00: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
José González 73a124b299 Fix possible custom_data with null strings 2022-06-09 14:00:53 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02:00
José González bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
Daniel Rodriguez a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop' 
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
 2022-06-08 09:11:54 +00:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' 
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
 2022-06-07 11:52:37 +00:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
edu.corral 9d7b047e72 9037 fixed agent view controls 2022-06-03 14:15:51 +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 3945cfe07a Merge branch 'ent-8737-Filtro-eventos-se-pierde-al-poner-pantalla-completa' into 'develop' 
Fix fb64 forgiven severity params

See merge request artica/pandorafms!4815
 2022-06-02 07:09:40 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya 6c48717627 #9038 filter remake 2022-06-01 15:07:51 +02:00
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
Daniel Maya f4784f4922 #9031 Fixed css filter 2022-05-31 17:09:15 +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
José González 24ff171f7f Change selector size 2022-05-27 12:17:26 +02:00
José González 353e8773f8 Hide inventory view if agent dont have inventory modules 2022-05-26 08:13:30 +02:00
Daniel Barbero Martin a77699b251 fixed update legend hover chart pandora_enterprise#8895 2022-05-12 09:10:39 +02:00
Daniel Rodriguez 7168f1d848 Merge branch 'ent-8735-vista-de-interfaces-referencia-mal-los-agentes' into 'develop' 
Ent 8735 vista de interfaces referencia mal los agentes

See merge request artica/pandorafms!4800
 2022-05-11 06:20:02 +00:00
José González 758933a211 Fix black theme issues 2022-05-06 14:23:24 +02:00
Daniel Maya 3dd96d6e91 #8903 Fixed padding 2022-04-28 14:58:33 +02:00
José González 77636d68ff Fix fb64 forgiven severity params 2022-04-11 15:22:37 +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 Maya 165f3ff598 #8735 Fixed interface view 2022-04-05 13:00:15 +02:00