tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
29,217 Commits 34 Branches 30 Tags
Commit Graph

29217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Rodriguez
dfede4de78 Merge branch 'ent-8181-umc-traer-cambios' into 'develop' 
UM replicated

See merge request artica/pandorafms!4506
 2021-10-28 09:41:41 +00:00
artica
7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez
2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
fbsanchez
77bee9f3ca UM replicated 2021-10-27 22:28:37 +02:00
Calvo
e1f38aed0d Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:41:29 +02:00
Calvo
1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
Daniel Rodriguez
0ec2bf30ce Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Fix SQL errors in action queries.

See merge request artica/pandorafms!4502
 2021-10-27 15:45:33 +00:00
Daniel Maya
3b49b28d9e #8146 Fixed max hours 2021-10-27 09:18:28 +02:00
artica
945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Ramon Novoa
cd3e20fefe Fix action information for SNMP alert events. 2021-10-26 17:40:03 +02:00
Daniel Maya
2de38a915b #7912 Hidden agents without modules 2021-10-26 15:36:12 +02:00
Ramon Novoa
35aa6b5258 Fix SQL errors in action queries. 2021-10-26 15:07:42 +02: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
Ramon Novoa
356e1f9f2b Fix SQL errors in action queries. 2021-10-26 13:24:23 +02:00
alejandro.campos@artica.es
24e73ce420 fix count in module groups view 2021-10-26 12:57:01 +02:00
Daniel Rodriguez
e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
artica
24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
Daniel Rodriguez
3436d80d09 Merge branch 'ent-8132-Bug-in-supernet-tree-view-IPAM' into 'develop' 
fixed ipam supernet tree view when there is no data show

See merge request artica/pandorafms!4499
 2021-10-25 15:15:13 +00:00
fbsanchez
05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
Daniel Maya
030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +02:00
fbsanchez
dabd7f53fe minor fixes 2021-10-25 14:05:11 +02:00
alejandro.campos@artica.es
aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
Daniel Maya
05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +02:00
fbsanchez
5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
artica
56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica
ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica
134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
Calvo
c6921efdce Unify search criteria case insensitive 2021-10-22 14:43:14 +02:00
alejandro.campos@artica.es
40aec564af prevent global admins to log in remotely 2021-10-22 14:38:20 +02:00
Calvo
f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
Daniel Rodriguez
6e12e5363e Merge branch 'ent-8055-tareas-programadas-almacenadas-en-disco-rotas-fix-mr-48' into 'develop' 
Fix mr 48 breaking tasks

See merge request artica/pandorafms!4478
 2021-10-22 09:58:57 +00:00
Daniel Rodriguez
bcf8e8d647 Merge branch 'ent-8113-12552-error-al-actualizar-mediante-update-manager-online-con-base-de-datos-de-historico' into 'develop' 
Errata fix

See merge request artica/pandorafms!4494
 2021-10-22 08:57:22 +00:00
fbsanchez
925fa8b819 Errata fix 2021-10-22 10:54:41 +02:00
alejandro.campos@artica.es
07c7c7a387 prevent from deleting global admin users when removing all of their profiles 2021-10-22 09:48:00 +02:00
artica
1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
fbsanchez
796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo
a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez
df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez
303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez
bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
artica
80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
Daniel Maya
6520f95fcf #7947 Fixed integria IMS ticket in metaconsole 2021-10-20 17:06:24 +02:00
artica
6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
alejandro.campos@artica.es
77aba53c7e fix data representation 2021-10-20 15:26:16 +02:00
Daniel Maya
bbbbbdd2bc #8114 remove history_data 2021-10-20 14:50:47 +02:00
alejandro.campos@artica.es
3e1dcbb554 changed text 2021-10-20 13:30:24 +02:00
Daniel Maya
30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +02:00
Jose Gonzalez
070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +02:00
alejandro.campos@artica.es
14076efc69 minor fix 2021-10-20 12:48:42 +02:00
Daniel Maya
829ca31e88 #8114 Fixed history_data 2021-10-20 10:52:40 +02:00