tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 10:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,160 Commits 34 Branches 30 Tags
Commit Graph

2020 Commits

Author SHA1 Message Date
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
Daniel Rodriguez
edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
 2022-03-10 13:53:40 +00: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
José González
d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
Daniel Maya
d4439dcf51 heatmap css 2022-03-07 10:47:20 +01:00
Daniel Maya
f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
Daniel Maya
74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
Calvo
3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Daniel Maya
d73fd0450d Merge branch 'develop' into ent-8458-heatmap-view 2022-02-21 10:18:15 +01:00
Calvo
8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
fbsanchez
3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
Calvo
e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
Daniel Maya
3c50164270 WIP heatmap 2022-02-11 14:50:57 +01:00
Calvo
4fc73cd7b7 Fix agentmodules widget conf style 2022-02-11 12:01:41 +01:00
Jose Gonzalez
1e1ae95635 Fix issue with collapse icon 2022-02-10 10:28:43 +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
645257f9dc alert template schedule pandora_enterprise#3943 2022-02-01 11:29:25 +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
Daniel Rodriguez
1612b5d063 Merge branch 'ent-7903-colores-distintos-en-estado-not-init-agentes-modulos-vista-tactical-view' into 'develop' 
Fix not init color

See merge request artica/pandorafms!4604
 2022-01-04 11:47:46 +00:00
Calvo
3cee99cbed Fix Cluster visual bugs 2021-12-30 18:26:59 +01:00
Calvo
f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Daniel Rodriguez
5e2fc45673 Merge branch 'ent-7879-command-center-nodos-en-diferentes-versiones' into 'develop' 
Warn if different MR on centralised environments

See merge request artica/pandorafms!4593
 2021-12-27 13:33:06 +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
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
Daniel Maya
c77b62e13d #7897 Fixed css 2021-12-20 10:15:57 +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 Maya
2e8a1ecdc8 #8195 Fix z-index in full screen mode 2021-12-07 14:11:33 +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
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 Barbero Martin
5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
Daniel Rodriguez
69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop' 
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
 2021-12-02 10:51:57 +00:00
fbsanchez
11c18d9379 minor style changes 2021-12-02 11:10:18 +01:00