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

920 Commits

Author SHA1 Message Date
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00: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
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00: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 Maya 90d4cfa0db #8252 Move up and down fields 2022-06-08 13:24:27 +02: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
Daniel Maya 6c48717627 #9038 filter remake 2022-06-01 15:07:51 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
José González 0a99b608c5 Fix several issues with SNMP Alert view 2022-05-25 17:53:58 +02:00
Daniel Barbero Martin 2de0875d9f fixed visual error sql graph pandora_enterprise#8970 2022-05-17 13:20:40 +02:00
Daniel Maya 3dd96d6e91 #8903 Fixed padding 2022-04-28 14:58:33 +02:00
Daniel Barbero Martin 502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Daniel Rodriguez 9da8be71bc Merge branch 'ent-8533-Mostrar-valores-en-elementos-Agents-modules' into 'develop' 
Ent 8533 mostrar valores en elementos agents modules

See merge request artica/pandorafms!4764
 2022-03-31 14:26:51 +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
Daniel Maya 59db8f3daf #8533 style changes 2022-03-29 10:46:44 +02:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Calvo 8cae675841 Hide menu title when screen is too small 2022-03-23 17:55:52 +01:00
Calvo 24b6394c83 Merge remote-tracking branch 'origin/develop' into ent-8651-fallos-menores-de-usabilidad-en-setup 2022-03-23 09:25:17 +01:00
Daniel Barbero Martin 93e0a261f9 fixed visual dashboard pandora_enterprise#8645 2022-03-21 14:52:32 +01:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
Calvo 3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Barbero Martin 5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin 0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-02-01 11:36:33 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
Calvo 5b624fc388 Added searchbar to select multiple modules on custom graph 2022-01-26 11:52:49 +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
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
Calvo 96d0194009 Merge remote-tracking branch 'origin/develop' into ent-8206-busqueda-de-modulos-en-graficas-personalizadas 2022-01-25 15:39:58 +01:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop' 
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
 2022-01-25 10:29:00 +00:00
Daniel Barbero Martin 2519335637 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-25 10:40:37 +01:00
Calvo 328a9db1fb Added select filtered modulo to custom graphs conf menu 2022-01-21 12:56:14 +01:00
Calvo c16499720e Added combo with all export formats to report html view 2022-01-18 14:54:10 +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
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Jose Gonzalez 32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Daniel Barbero Martin a803b5fa90 WIP #3943 2021-12-17 13:38:53 +01:00
fbsanchez 54576be543 Warn if different MR on centralised environments 2021-12-16 17:46:45 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +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 Barbero Martin 5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00