tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 10:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
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
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
Junichi Satoh
d4b8916c54 Fixed following problems. 
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
 2021-03-26 17:11:10 +09:00
Daniel Barbero Martin
c3aaa4eb78 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-26 08:39:47 +01:00
artica
c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Barbero Martin
cc222faddc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-25 17:00:27 +01:00
Daniel Barbero Martin
d92adfc008 WIP command center 2021-03-25 16:50:24 +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
marcos
f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
Daniel Rodriguez
1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop' 
minor changes

See merge request artica/pandorafms!3779
 2021-03-25 09:57:53 +00:00
Daniel Rodriguez
f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop' 
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
 2021-03-25 09:53:41 +00:00
fbsanchez
fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Barbero Martin
586707d12a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-25 08:15:23 +01:00
artica
1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez
f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
Daniel Barbero Martin
0bfe060c50 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 17:30:47 +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
12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Maya
79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez
ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
fbsanchez
d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01: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 Rodriguez
9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
Jose Gonzalez
af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez
ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel
774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez
6cd393edef Style fix 2021-03-24 12:33:36 +01:00
fbsanchez
c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
Daniel Barbero Martin
c3f85d4caa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 09:06:25 +01:00
artica
00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
Daniel Rodriguez
2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3940
 2021-03-23 15:56:02 +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
José González
6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-23 12:00:45 +00:00
Daniel Rodriguez
0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3942
 2021-03-23 09:29:39 +00:00
Daniel Rodriguez
f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop' 
Removed extra verbosity

See merge request artica/pandorafms!3899
 2021-03-23 09:29:05 +00:00