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

21267 Commits

Author SHA1 Message Date
Daniel Rodriguez aaded121a4 Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop' 
restricted action creation on alerts created from policy

See merge request artica/pandorafms!3891
 2021-04-06 17:46:47 +00:00
Daniel Rodriguez 43cfa383ac Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop' 
Add pagination to commands view

See merge request artica/pandorafms!3919
 2021-04-06 17:44:54 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Daniel Rodriguez e6ad284b80 Merge branch 'ent-6999-No-aparece-la-cabecera-en-la-vista-de-clusterssi-no-hay-cluster-creado' into 'develop' 
add deafult header

See merge request artica/pandorafms!3829
 2021-04-06 17:32:31 +00:00
Daniel Rodriguez 58d5c2bc69 Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop' 
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules

See merge request artica/pandorafms!3881
 2021-04-06 17:30:27 +00:00
Daniel Rodriguez bec22b5825 Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop' 
Fixed user/profile newline on users_list

See merge request artica/pandorafms!3982
 2021-04-06 17:24:20 +00:00
Daniel Rodriguez 32527863cb Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop' 
fixed error tree groups agent edition metaconsole

See merge request artica/pandorafms!3904
 2021-04-06 17:23:18 +00:00
Daniel Rodriguez 8b817c63c7 Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop' 
unsort template items

See merge request artica/pandorafms!3810
 2021-04-06 17:22:33 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
Daniel Rodriguez 68a8c37545 Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' 
Fixed session close on api

See merge request artica/pandorafms!3749
 2021-04-06 17:18:53 +00:00
Daniel Rodriguez 7a0139accd Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop' 
API get license, get license_remaining

See merge request artica/pandorafms!3814
 2021-04-06 17:18:24 +00:00
Daniel Rodriguez a70a74fb47 Merge branch 'ent-7241-ventana-de-newsletter-con-errores-visuales' into 'develop' 
fixed lost icon

See merge request artica/pandorafms!3984
 2021-04-06 17:15:41 +00:00
Marcos Alconada f2efb6a39b fixed lost icon 2021-04-06 17:15:41 +00:00
Daniel Rodriguez dc692dbf2c Merge branch 'ent-6332-aadcm-anadir-buscador-de-modulos-en-vista-de-agente-consola-movil' into 'develop' 
Added a searchbox for module list in mobile/agent

See merge request artica/pandorafms!3962
 2021-04-06 17:14:49 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Daniel Rodriguez 1e90b0d300 Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop' 
Modules alphabetically sorted in Discovery review

See merge request artica/pandorafms!3907
 2021-04-06 17:09:28 +00:00
Daniel Rodriguez 1de0f6060c Merge branch 'ent-4228-system-uptime-always-shows-data-formatted-as-date' into 'develop' 
Fixed data always formatting to date in sys uptime snmp modules

See merge request artica/pandorafms!3857
 2021-04-06 17:08:40 +00:00
Daniel Rodriguez 1eba5f8e6c Merge branch 'ent-7072-mensaje-erroneo-module-management-meta' into 'develop' 
Fixed centralized management warnin on module management meta

See merge request artica/pandorafms!3880
 2021-04-06 17:06:40 +00:00
Luis 4944820aed Fixed centralized management warnin on module management meta 2021-04-06 17:06:40 +00:00
Daniel Rodriguez 29bf07d96c Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Fixed issue with URLs

Closes pandora_enterprise#7040

See merge request artica/pandorafms!3860
 2021-04-06 17:05:17 +00:00
Daniel Rodriguez 7756056755 Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop' 
restored bell and module icon with plus on agent edition view

See merge request artica/pandorafms!3988
 2021-04-06 17:03:19 +00:00
Daniel Rodriguez 9c7eebc638 Merge branch 'ent-7195-errores-visuales-consola-movil' into 'develop' 
Added missing classes to main.css mobile

See merge request artica/pandorafms!3970
 2021-04-06 17:02:20 +00:00
Daniel Rodriguez c192a1681b Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' 
Fixed task edit url when nof fully defined (custom-script)

See merge request artica/pandorafms!3906
 2021-04-06 17:00:49 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop' 
fixed error events reports

See merge request artica/pandorafms!3902
 2021-04-06 16:59:42 +00:00
Daniel Rodriguez 1b32ad83ff Merge branch 'ent-7052-entities-en-nombre-de-eventos' into 'develop' 
remove entities when add comment

See merge request artica/pandorafms!3839
 2021-04-06 16:58:05 +00:00
Marcos Alconada 654a4ebbd0 remove entities when add comment 2021-04-06 16:58:05 +00:00
Daniel Rodriguez 6adc987f72 Merge branch 'ent-7035-enlace-modulos-rotos-module-library' into 'develop' 
Fixed module library download links

See merge request artica/pandorafms!3834
 2021-04-06 16:56:37 +00:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 38a6d65f60 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-04-06 11:01:20 +02:00
marcos 7d3dc7e3a6 fixed error on bulk operations edit agents 2021-04-06 08:55:06 +02:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
marcos 78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
fbsanchez 98b7a9c66a Update DiscoveryTaskList.class.php 2021-04-05 14:05:53 +00:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Calvo 8352e4d18d restored bell and module icon with plus on agent edition view 2021-03-31 10:54:58 +02:00
Jose Gonzalez 5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
Daniel Maya f004cfc276 trace removed 2021-03-30 16:20:46 +02:00
Calvo 847fc44b14 Fixed user/profile newline on users_list 2021-03-30 13:34:38 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
Daniel Rodriguez 3770f491dc Merge branch 'ent-7231-icono-vistas-consolas-visuales' into 'develop' 
fixed icon

See merge request artica/pandorafms!3975
 2021-03-29 12:39:02 +00:00
marcos e26c2eb76d fixed icon 2021-03-29 14:30:00 +02:00
vgilc 142b271ba0 Update pandoradb_data.sql 2021-03-29 12:21:12 +00:00
marcos 390d7e79cd fixed buttton position 2021-03-29 12:32:14 +02:00
marcos 0166c3066f fixed icon 2021-03-29 12:20:27 +02:00
Daniel Rodriguez 4fa790dd7f Merge branch 'ent-7202-fallos-visuales-discovery' into 'develop' 
Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
 2021-03-29 09:49:31 +00:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
Daniel Rodriguez d01c3e1c92 Merge branch 'ent-7215-fallos-vista-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3961
 2021-03-29 07:23:03 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3969
 2021-03-26 13:52:44 +00:00
Daniel Rodriguez c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3968
 2021-03-26 13:41:31 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Calvo 3b185d3a70 Added missing classes to main.css mobile 2021-03-26 14:33:48 +01:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3967
 2021-03-26 13:05:28 +00:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +01:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop' 
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
 2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Daniel Rodriguez 1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop' 
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
 2021-03-26 12:05:29 +00:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Daniel Rodriguez 316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3960
 2021-03-26 11:39:14 +00:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
fbsanchez 024640bcae Added a searchbox for module list in mobile/agent 2021-03-26 11:55:44 +01:00
Daniel Barbero Martin 021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin 193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez b9f0ac8239 Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3955
 2021-03-26 09:32:30 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3954
 2021-03-26 09:32:08 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +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 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3946
 2021-03-25 11:55:33 +00:00