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

92 Commits

Author SHA1 Message Date
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
Daniel Cebrian 5927687ad3 #10321 create token events_per_query for limit consult sql 2023-02-07 09:49:46 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +01:00
Daniel Cebrian fecee4895f #10259 fixed bug in agentaccess token 2023-02-06 11:04:08 +01:00
Daniel Cebrian aaae7454fa #10259 create control for token agentaccess if agents morte than 200 2023-02-06 10:37:01 +01:00
Daniel Cebrian af6f5efdd8 #10253 Enforcement options in configuration 2023-02-03 14:12:49 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com c7aa456d60 Adapt views 2022-10-26 10:51:12 +02:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
José González 4589a7c298 Added control for WMI binary 2022-05-12 18:31:24 +02:00
Daniel Maya 8ccd5ad8cb #8788 min number limit 2022-04-04 17:43:19 +02:00
fbsanchez 82c5cbb929 PJ scheduler only enterprise 2022-03-21 12:07:14 +01:00
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01: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 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
fbsanchez bcb2447edb WIP Historical database manager (setup) 2021-01-27 13:03:57 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Daniel Rodriguez 16d34bf584 Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop' 
ticket resolved, duplicated sentece

See merge request artica/pandorafms!2239
 2019-05-30 15:33:27 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Luis Calvo fa0da4504e Fixed bug connection ok when db connection returns null 
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
 2019-04-22 12:00:06 +02:00
marcos.alconada 450eccee7f ticket resolved, duplicated sentece 
Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
 2019-03-05 13:17:21 +01:00
Fermin f0a3f4e9d7 Added configurable purge tnetwork_matrix 
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
 2019-03-01 12:39:55 +01:00
manuel c886dd1dfa Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch 
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php


Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
 2019-02-26 12:31:37 +01:00
manuel 875d7ecaba Unified sizes of the checkbox switch 
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
 2019-02-26 12:04:18 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
daniel d116e4742a add new tocken max events responses 
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
 2019-02-19 12:14:42 +01:00
Daniel Barbero 624d804168 Fixed minor error 
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
 2019-02-14 16:53:01 +01:00
Daniel Barbero d9ba3af358 Fixed errors in setup performances 
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
 2019-02-14 16:31:19 +01:00
Daniel Barbero 0fb61444f6 Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico 
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/include/functions_api.php
	pandora_console/install.php


Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
 2019-02-14 08:01:23 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue 
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
 2019-02-13 14:43:55 +01:00