fbsanchez
|
2cfe4378c2
|
license forms sync MC-N
|
2019-05-22 18:50:51 +02:00 |
Daniel Rodriguez
|
dfb7067db2
|
Merge branch 'ent-1668-update-manager' into 'develop'
minor fix MC environments
See merge request artica/pandorafms!2439
|
2019-05-22 16:54:33 +02:00 |
|
Daniel Rodriguez
|
8b511c2ca3
|
Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop'
Changed condition for ldap Force automatically create profile user
See merge request artica/pandorafms!2422
|
2019-05-22 16:15:06 +02:00 |
|
fbsanchez
|
86cb526893
|
minor fix MC environments
|
2019-05-22 15:40:17 +02:00 |
artica
|
892dcc750f
|
Updated version and build strings.
|
2019-05-22 15:29:49 +02:00 |
|
Daniel Rodriguez
|
979f11ca8f
|
Merge branch 'ent-1668-update-manager' into 'develop'
Ent 1668 update manager
See merge request artica/pandorafms!2420
|
2019-05-22 15:25:49 +02:00 |
Alejandro Fraguas
|
88234503c0
|
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
Fixed url in user_edit
See merge request artica/pandorafms!2436
|
2019-05-22 14:14:15 +02:00 |
marcos.alconada
|
07b42f7241
|
Changed for metaconsole
|
2019-05-22 13:57:31 +02:00 |
|
Alejandro Fraguas
|
5b286b4f67
|
Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop'
Mejorar la actualizacion de los datos y elementos de la consola visual
See merge request artica/pandorafms!2429
|
2019-05-22 13:06:18 +02:00 |
|
Daniel Rodriguez
|
c50eb57499
|
Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop'
Added new min value for InnoDB file per table( 0 to 1)
See merge request artica/pandorafms!2416
|
2019-05-22 12:05:29 +02:00 |
artica
|
ba9edc0378
|
Auto-updated build strings.
|
2019-05-22 00:01:07 +02:00 |
|
Daniel Rodriguez
|
85a3437124
|
Merge branch 'ent-3964-autorefresco-no-funciona-733-734-v2' into 'develop'
Ent Autorefresco no funciona en la version 733, 734 (v2)
See merge request artica/pandorafms!2435
|
2019-05-21 17:41:10 +02:00 |
|
Daniel Rodriguez
|
f6171de522
|
Merge branch 'ent-3468-Ayudas_online' into 'develop'
helpers
See merge request artica/pandorafms!2381
|
2019-05-21 17:28:27 +02:00 |
Daniel Maya
|
edbde3fecb
|
Fixed url in user_edit
|
2019-05-21 17:14:29 +02:00 |
Luis Calvo
|
e361c4243a
|
Autorefresh bug fix
|
2019-05-21 12:16:06 +02:00 |
|
Alejandro Fraguas
|
ce359bfaf6
|
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
|
2019-05-21 12:11:53 +02:00 |
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
|
fbsanchez
|
b853582fb9
|
Changed preview by \"click here\" message
|
2019-05-21 08:29:59 +02:00 |
|
artica
|
20e38ead81
|
Auto-updated build strings.
|
2019-05-21 00:01:08 +02:00 |
|
fbsanchez
|
77fc1abe89
|
minor style updates and fixes in safe-output
|
2019-05-20 18:16:21 +02:00 |
|
Daniel Maya
|
5c0a197b6b
|
Added cache
|
2019-05-20 15:15:54 +02:00 |
|
fbsanchez
|
5e9b2479eb
|
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
|
2019-05-20 13:11:39 +02:00 |
|
Alejandro Fraguas
|
1cf0c1545a
|
Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
Informes SLA mensuales de "KeepAlive" no se calculan bien
See merge request artica/pandorafms!2433
|
2019-05-20 12:08:44 +02:00 |
alejandro-campos
|
a898fad2c3
|
lint fixes
|
2019-05-20 10:35:46 +02:00 |
|
artica
|
d82d178a0d
|
Auto-updated build strings.
|
2019-05-20 00:01:08 +02:00 |
|
artica
|
2dc5fce6a6
|
Auto-updated build strings.
|
2019-05-19 00:01:06 +02:00 |
|
artica
|
509c476c33
|
Auto-updated build strings.
|
2019-05-18 00:01:08 +02:00 |
|
alejandro-campos
|
0046e209fe
|
lint changes
|
2019-05-17 14:46:19 +02:00 |
|
alejandro-campos
|
54d3eefa43
|
lint changes
|
2019-05-17 14:27:59 +02:00 |
|
alejandro-campos
|
e746a49158
|
lint changes
|
2019-05-17 14:26:44 +02:00 |
Alejandro Gallardo Escobar
|
bdcea7ec7d
|
Minor fix
|
2019-05-17 14:25:17 +02:00 |
|
alejandro-campos
|
a0b7164d9f
|
lint changes
|
2019-05-17 14:20:01 +02:00 |
|
Alejandro Gallardo Escobar
|
2c8dd3b5e5
|
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
|
2019-05-17 14:16:23 +02:00 |
|
Alejandro Gallardo Escobar
|
34218fa7eb
|
Improved the management of the async requests of the visual console client
|
2019-05-17 14:09:30 +02:00 |
|
marcos.alconada
|
0c9f8892e0
|
Changed evaluates permissions
|
2019-05-17 13:58:34 +02:00 |
|
Alejandro Fraguas
|
ea39766d59
|
Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop'
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop
See merge request artica/pandorafms!2427
|
2019-05-17 12:11:19 +02:00 |
|
Daniel Rodriguez
|
833c2d91a7
|
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop'
Fixed error window in visual console
See merge request artica/pandorafms!2426
|
2019-05-17 11:27:57 +02:00 |
|
Daniel Rodriguez
|
9b4d1b3dba
|
Merge branch 'ent-2108-incongruencias-creacion-accion-pandora-fms-event' into 'develop'
Recovered event criticity field from event alert
See merge request artica/pandorafms!2425
|
2019-05-17 10:49:34 +02:00 |
|
artica
|
bf202496da
|
Auto-updated build strings.
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
|
2019-05-17 00:01:10 +02:00 |
|
Luis Calvo
|
a0faffe161
|
Form eHorus user login with title
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
|
2019-05-16 18:59:17 +02:00 |
|
Luis Calvo
|
0cd60d0431
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
|
2019-05-16 18:11:33 +02:00 |
|
Luis Calvo
|
b3d2eaaf9e
|
Fixed img url on js
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
|
2019-05-16 17:25:18 +02:00 |
|
Luis Calvo
|
1bfd91725e
|
Changed <img> to hmtl_print_image
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
|
2019-05-16 17:13:14 +02:00 |
|
Daniel Maya
|
f1705af9f6
|
Fixed error window in visual console
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
|
2019-05-16 16:04:38 +02:00 |
|
fbsanchez
|
2b3fc919f1
|
Merge branch 'ent-1668-update-manager' of brutus.artica.lan:artica/pandorafms into ent-1668-update-manager
Former-commit-id: 792aee88887f8306f302b64ccfb264a148101dc4
|
2019-05-16 15:38:57 +02:00 |
|
fbsanchez
|
c40e0ec702
|
pandora_console/extras/delete_files/delete_files.txt
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
|
2019-05-16 15:38:51 +02:00 |
|
fbsanchez
|
0bfd0f2c8b
|
pandora_console/extras/delete_files/delete_files.txt
Former-commit-id: 6a2831c46241b981711dbdcddbf3961c50d98071
|
2019-05-16 15:38:18 +02:00 |
|
Luis Calvo
|
0f35923073
|
Recovered event criticity field from event alert
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
|
2019-05-16 13:23:47 +02:00 |
|
fbsanchez
|
ec60a3193a
|
removed all group from communications target
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
|
2019-05-16 12:52:41 +02:00 |
|
fbsanchez
|
3cdbfd3646
|
minor fix in php requirements
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
|
2019-05-16 12:50:16 +02:00 |