Daniel Barbero Martin
|
b97ecda12b
|
db changes
|
2021-12-09 16:19:05 +01:00 |
|
fbsanchez
|
5c25fa8406
|
mr updates and a pretty icon
|
2021-12-09 15:07:35 +01:00 |
|
fbsanchez
|
cb6184a943
|
mr fix
|
2021-12-09 14:02:06 +01:00 |
|
fbsanchez
|
2cbfca2cdd
|
mr rev + timap_sites
|
2021-12-09 13:51:20 +01:00 |
|
fbsanchez
|
a94f6be37e
|
force db_process_sql
|
2021-12-03 12:59:50 +01:00 |
|
fbsanchez
|
3e7a81ea33
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-12-03 10:24:01 +01:00 |
|
fbsanchez
|
00d79b553c
|
missing in merge mr
|
2021-12-02 14:46:31 +01:00 |
|
Daniel Rodriguez
|
69590afef6
|
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
|
2021-12-02 10:51:57 +00:00 |
|
fbsanchez
|
cad0c6cea6
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-12-02 10:43:30 +01:00 |
|
Daniel Rodriguez
|
345cbcf5ba
|
Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop'
fix setup centraliced active directory
See merge request artica/pandorafms!4540
|
2021-11-30 14:44:48 +00:00 |
|
Daniel Barbero Martin
|
347769299b
|
outocreate remote user centralized node
|
2021-11-30 14:23:19 +01:00 |
|
alejandro.campos@artica.es
|
73cde9ee48
|
db changes
|
2021-11-29 14:58:34 +01:00 |
|
fbsanchez
|
68c2400b9c
|
fix
|
2021-11-29 10:32:54 +01:00 |
|
fbsanchez
|
9c17625c77
|
ncm2
|
2021-11-26 18:11:34 +01:00 |
|
fbsanchez
|
ba8087f49b
|
ncm2 with schedules
|
2021-11-24 22:01:21 +01:00 |
|
Calvo
|
5464a73a12
|
Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor
|
2021-11-24 13:28:36 +01:00 |
|
Calvo
|
4dd931f277
|
Modules percentage threshold form
|
2021-11-24 11:33:36 +01:00 |
|
fbsanchez
|
cbbfc337df
|
errata fix
|
2021-11-23 14:33:59 +01:00 |
|
fbsanchez
|
a9485024f4
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-11-23 14:29:23 +01:00 |
|
fbsanchez
|
41dcc95d5a
|
db changes
|
2021-11-23 14:26:11 +01:00 |
|
José González
|
b8d884008b
|
Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
# Conflicts:
# pandora_console/extras/mr/51.sql
|
2021-11-22 11:44:06 +00:00 |
|
Jose Gonzalez
|
3f395f03dc
|
Added sql file
|
2021-11-22 12:33:31 +01:00 |
|
Jose Gonzalez
|
192237a452
|
Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls
|
2021-11-22 12:31:24 +01:00 |
|
fbsanchez
|
3e90bb6490
|
minor change
|
2021-11-19 11:53:59 +01:00 |
|
fbsanchez
|
582cb9a082
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-11-19 10:51:46 +01:00 |
|
Daniel Barbero Martin
|
e3183d9e56
|
fix add file list delete files
|
2021-11-19 08:19:45 +01:00 |
|
Daniel Barbero Martin
|
c52e11e91a
|
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-11-19 08:12:22 +01:00 |
|
Daniel Rodriguez
|
c47c5e34f6
|
Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop'
set deployment_timeout per agent installation file
See merge request artica/pandorafms!4516
|
2021-11-18 16:34:12 +00:00 |
|
fbsanchez
|
9ff3c8eee1
|
wip ncm2
|
2021-11-15 18:58:57 +01:00 |
|
Daniel Rodriguez
|
c02c03df02
|
Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop'
Ent 8099 vulnerabilidad j query mobile
See merge request artica/pandorafms!4498
|
2021-11-15 11:13:07 +00:00 |
|
fbsanchez
|
a96d5d68e3
|
MR updates for NCMv2
|
2021-11-10 17:13:17 +01:00 |
|
Daniel Barbero Martin
|
900a37ad5d
|
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
|
2021-11-08 08:54:41 +01:00 |
|
Daniel Barbero Martin
|
ea747f25f3
|
Fix mr pandoradb migrate
|
2021-11-05 12:29:34 +01:00 |
|
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 |
|
Daniel Barbero Martin
|
c3f4addb0e
|
wip special days alerts
|
2021-11-04 12:33:40 +01:00 |
|
Daniel Barbero Martin
|
53361484fd
|
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
|
2021-11-03 11:16:46 +01:00 |
|
Daniel Barbero Martin
|
c73ee2d113
|
updated mr and version
|
2021-11-03 11:04:19 +01:00 |
|
Daniel Barbero Martin
|
25268ec9b4
|
color
|
2021-11-02 17:49:45 +01:00 |
|
fbsanchez
|
08d4323941
|
set deployment_timeout per agent installation file
|
2021-11-02 17:37:47 +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 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 |
|
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 |
|
Calvo
|
9f71a9ba81
|
Fix mr 48 breaking tasks
|
2021-10-18 16:05:37 +02:00 |
|
fbsanchez
|
6c0e2d23de
|
updates
|
2021-10-15 13:39:23 +02:00 |
|