tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-23 10:48:47 +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 Barbero Martin
9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Daniel Rodriguez
6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez
26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos
b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos
ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos
b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez
f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
José González
9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-24 15:50:12 +00:00
fbsanchez
0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos
eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
daniel
774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
Daniel Rodriguez
61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada
302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez
d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
marcos
b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
Daniel Rodriguez
390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop' 
fixed visuals errors black theme

See merge request artica/pandorafms!3937
 2021-03-22 12:48:39 +00:00
fbsanchez
e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Daniel Barbero Martin
6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
marcos
bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
marcos
13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
Daniel Rodriguez
3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
fbsanchez
2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
marcos
de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Jose Gonzalez
5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada
d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez
95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González
69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Daniel Rodriguez
ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
Daniel Rodriguez
d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
daniel
6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
fbsanchez
d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Rodriguez
4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez
0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop' 
add new style

See merge request artica/pandorafms!3789
 2021-03-01 10:02:19 +00:00
Marcos Alconada
0d4761b63d add new style 2021-03-01 10:02:18 +00:00
fbsanchez
85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez
0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
fbsanchez
ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
Jose Gonzalez
ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
fbsanchez
210017b162 minor style fix select2 2021-02-16 13:41:03 +01:00
Jose Gonzalez
e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
Jose Gonzalez
2521b32f13 WIP: Backup upload 2021-02-08 16:33:54 +01:00
fbsanchez
9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
fbsanchez
380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
fbsanchez
96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +01:00
fbsanchez
dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
fbsanchez
c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez
192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez
4aba3b7753 action_details avoid overlapping colors 2021-01-21 15:58:20 +01:00
Daniel Rodriguez
fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
daniel
a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00