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

693 Commits

Author SHA1 Message Date
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00:00
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
marcos b332e59687 fixed minnor error with resource library url 2021-09-27 13:48:07 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
Daniel Rodriguez cdc8b0a80c Merge branch 'ent-7676-12038-error-en-users-connected' into 'develop' 
fixed sql error without profile

See merge request artica/pandorafms!4200
 2021-08-03 06:48:56 +00:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
Daniel Barbero Martin 64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
marcos 0521ffb7bf fixed sql error without profile 2021-06-14 14:46:41 +02:00
marcos afa1eef63c fixed sql error without profile 2021-06-14 14:10:16 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Barbero Martin 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +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
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
Alejandro Campos 66e4e2b173 Merge branch 'develop' into 'ent-6848-Varios-bugs-en-la-vista-Connected-users' 
# Conflicts:
#   pandora_console/extensions/users_connected.php
 2021-03-02 16:34:10 +00:00
Luis 29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
Daniel Rodriguez 64ec705f2c Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop' 
allowing self signed certs for quickshell

See merge request artica/pandorafms!3625
 2021-01-25 09:26:04 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
Daniel Rodriguez 86794af7b4 Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop' 
Removed ip from connected user list

See merge request artica/pandorafms!3741
 2021-01-11 18:11:28 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop' 
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
 2021-01-04 11:15:26 +01:00
Luis Calvo 69c33b45fa Removed ip from connected user list 2020-12-23 14:33:20 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
alejandro-campos 7a74ae4d20 changes in connected users view 2020-12-15 17:40:15 +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
fbsanchez e501b018e4 Fix firefox double load of quickshell 2020-12-02 13:42:23 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' 
Fix

See merge request artica/pandorafms!3652
 2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00