tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 06:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,458 Commits 34 Branches 30 Tags
Commit Graph

2176 Commits

Author SHA1 Message Date
Jose Gonzalez
f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez
eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Marcos Alconada
f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
fbsanchez
eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Luis
734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez
9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +01:00
Daniel Rodriguez
80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop' 
Added new js file

Closes pandora_enterprise#6157

See merge request artica/pandorafms!3635
 2020-11-25 10:35:47 +01:00
Jose Gonzalez
063bf967f4 Added new js file 2020-11-20 10:24:15 +01:00
José González
32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
 2020-11-19 15:21:58 +01:00
fbsanchez
d08aa0b32b Updates in parent relationship ** WARN: bad relation line move while other lines are attached 2020-11-12 18:25:16 +01:00
fbsanchez
14db9c63c6 Sticky lines (VC) 2020-11-12 16:57:14 +01:00
Daniel Maya
0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez
b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
fbsanchez
067a19f69b WIP sticky lines 2020-11-06 20:37:37 +01:00
Luis
2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
fbsanchez
c59042c034 WIP 2020-11-03 18:01:24 +01:00
fbsanchez
b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
daniel
c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
fbsanchez
90f199c5ad WIP NetworkLink 2020-10-30 14:07:44 +01:00
daniel
4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
fbsanchez
326d1dac49 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-10-30 10:38:30 +01:00
Marcos Alconada
8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
fbsanchez
8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
Daniel Rodriguez
0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop' 
Use service description instead of name in tree view

See merge request artica/pandorafms!3570
 2020-10-28 11:19:49 +01:00
alejandro-campos
6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
Kike
3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
Jose Gonzalez
3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
fbsanchez
2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
daniel
0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez
5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Jose Gonzalez
00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez
6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
Manuel Montes
f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
fbsanchez
9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
Jose Gonzalez
0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
fbsanchez
3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
alejandro-campos
0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
alejandro-campos
8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos
90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Luis
3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +02:00
daniel
fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
daniel
bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Daniel Rodriguez
846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
Daniel Rodriguez
76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop' 
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
 2020-07-14 11:04:03 +02:00
fbsanchez
3d493f14da massive services 2020-07-07 19:10:24 +02:00
fbsanchez
53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez
2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
Luis Calvo
d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00