tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-02 23:58:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
Daniel Rodriguez
16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop' 
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
 2021-03-11 14:40:24 +00:00
Marcos Alconada
d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez
1f64b598c8 Merge branch 'ent-7098-Solucion-para-mostar-datos-de-estado-warning' into 'develop' 
new report histogram

See merge request artica/pandorafms!3875
 2021-03-11 14:22:28 +00:00
daniel
54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
fbsanchez
6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
Daniel Maya
c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +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
Jose Gonzalez
cf1c460a9d Fixed all issues 2021-03-11 09:12:53 +01:00
Daniel Barbero Martin
e1151b1830 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-11 09:00:36 +01:00
artica
74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez
988b6826fc Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop' 
cambio de dominio

See merge request artica/pandorafms!3888
 2021-03-10 16:01:39 +00:00
Daniel Rodriguez
2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop' 
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
 2021-03-10 15:56:15 +00:00
Daniel Rodriguez
3db990ba36 Merge branch 'ent-6559-Cambio-en-el-target-ip-al-crear-módulos-desde-el-browser-snmp' into 'develop' 
Ent 6559 cambio en el target ip al crear módulos desde el browser snmp

See merge request artica/pandorafms!3751
 2021-03-10 15:53:55 +00:00
Jose Gonzalez
92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
José González
b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
Daniel Barbero Martin
cb0883a87a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-10 08:34:29 +01:00
artica
e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
Daniel Rodriguez
c8bc516b5d Merge branch 'ent-6830-item-Servicios-Consolas-Visuales' into 'develop' 
Fixed VC service title %

See merge request artica/pandorafms!3854
 2021-03-09 16:39:56 +00:00
daniel
b434e05376 Fixed VC service title % 2021-03-09 16:39:55 +00:00
Daniel Rodriguez
4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop' 
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
 2021-03-09 16:37:34 +00:00
Daniel Rodriguez
011507f065 Merge branch 'ent-6832-Item-historico-de-eventos-Consolas-Visuales' into 'develop' 
Fixed VC events history

See merge request artica/pandorafms!3850
 2021-03-09 16:36:37 +00:00
daniel
0c5cfcc90e Fixed VC events history 2021-03-09 16:36:37 +00:00
Daniel Rodriguez
d992b818b2 Merge branch 'ent-6568-setup-module-library-no-se-puede-borrar-usuario' into 'develop' 
Module library user pass let empty user/pass

See merge request artica/pandorafms!3706
 2021-03-09 16:34:22 +00:00
Daniel Rodriguez
868694ba24 Merge branch 'ent-6968-Ordenar-servicios-por-descripcion-tree-view' into 'develop' 
Fixed sorting by description

Closes pandora_enterprise#6968

See merge request artica/pandorafms!3825
 2021-03-09 16:33:12 +00:00
Daniel Rodriguez
950b7bcdfd Merge branch 'ent-5140-Añadir-summary-al-availability-graph' into 'develop' 
add summary report availability graph

See merge request artica/pandorafms!3709
 2021-03-09 16:32:12 +00:00
daniel
6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
Daniel Rodriguez
39e735ed22 Merge branch 'ent-5760-problema-sistema-de-notificaciones-en-servidores-con-pocos-modulos' into 'develop' 
Avoid performance tests if there are not enough modules in system

See merge request artica/pandorafms!3765
 2021-03-09 16:31:38 +00:00
Daniel Barbero Martin
219ca1914d cambio de dominio 2021-03-09 16:02:05 +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
Jose Gonzalez
f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
fbsanchez
b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
artica
f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
alejandro.campos@artica.es
0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Jose Gonzalez
34b7c1003b Fixed error with sorting 2021-03-08 11:20:50 +01:00
Daniel Barbero Martin
b57be5535d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-08 08:29:18 +01:00
Jose Gonzalez
c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
artica
2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica
438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica
80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
Daniel Rodriguez
84da313641 Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop' 
Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
 2021-03-05 12:53:24 +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 Barbero Martin
535fd9b235 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-05 13:18:05 +01:00
Daniel Barbero Martin
23268a4559 WIP Command center 2021-03-05 13:17:12 +01:00
Jose Gonzalez
0860b6e647 Fix ordenation with subservices 2021-03-05 13:07:53 +01:00
Jose Gonzalez
df30df4637 Merge remote-tracking branch 'origin' into ent-6968-Ordenar-servicios-por-descripcion-tree-view 2021-03-05 12:37:29 +01:00
fbsanchez
cfded31e1b minor fix 2021-03-05 11:18:47 +01:00
fbsanchez
bcde9f940e b64 2021-03-05 11:17:50 +01:00
fbsanchez
ae3d54cedf B64 included in user options 2021-03-05 11:11:19 +01:00
fbsanchez
1534fd9c40 API module graph width 2021-03-05 10:30:14 +01:00
artica
eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00