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
20e38ead81
Auto-updated build strings.
2019-05-21 00:01:08 +02:00
a898fad2c3
lint fixes
2019-05-20 10:35:46 +02:00
d82d178a0d
Auto-updated build strings.
2019-05-20 00:01:08 +02:00
2dc5fce6a6
Auto-updated build strings.
2019-05-19 00:01:06 +02:00
509c476c33
Auto-updated build strings.
2019-05-18 00:01:08 +02:00
54d3eefa43
lint changes
2019-05-17 14:27:59 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
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
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
bf202496da
Auto-updated build strings.
...
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
2019-05-17 00:01:10 +02:00
b3d2eaaf9e
Fixed img url on js
...
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
2019-05-16 17:25:18 +02:00
1bfd91725e
Changed <img> to hmtl_print_image
...
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
50ad335794
Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop'
...
New branch without thras files
See merge request artica/pandorafms!2423
Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
2019-05-16 11:37:25 +02:00
f5f66fc144
Auto-updated build strings.
...
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
2019-05-16 00:01:06 +02:00
9c08aa7b57
Auto-updated build strings.
...
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
3548070ec1
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
...
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
be20163073
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
2019-05-14 17:38:55 +02:00
35c7ea1f48
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
...
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
2019-05-14 17:14:02 +02:00
bc849c16fb
Only one image for welcome new board
...
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
2019-05-14 17:13:44 +02:00
8ff62a58ce
Merge branch 'ent-3695-ipam-oids' into 'develop'
...
IPAM vlan wizard ExtremeXOS
See merge request artica/pandorafms!2409
Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
2019-05-14 11:30:55 +02:00
15446453fb
Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop'
...
Ent 3771 nueva tipo de macro password en comandos acciones de alerta
See merge request artica/pandorafms!2397
Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
2019-05-14 10:53:44 +02:00
865796ed5e
Merge branch 'visual-console-phase-2' into 'develop'
...
Visual console phase 2
See merge request artica/pandorafms!2404
Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
2019-05-14 10:21:14 +02:00
b7ebb44c48
Auto-updated build strings.
...
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
81f7cf699b
Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop'
...
Ternary condition is added
See merge request artica/pandorafms!2311
Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
2019-05-13 18:36:34 +02:00
539f416cc4
Merge
...
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
2019-05-13 17:30:35 +02:00
9347fc17aa
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
a38ef3e729
Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
...
Added condition type not normal in alert templates
See merge request artica/pandorafms!2376
Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
2019-05-13 16:51:34 +02:00
5f2bd0bc8d
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
20f77f5393
Merge branch 'ent-4004-Estilos-Discovery' into 'develop'
...
Unify the styles of Discovery with Pandora - #4004
See merge request artica/pandorafms!2411
Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
2019-05-13 13:05:34 +02:00
874f4764ea
Merge remote-tracking branch 'origin/ent-4004-Estilos-Discovery' into ent-3937-Eliminar-echos-y-prints-de-las-subclases-de-wizard
...
Former-commit-id: 2344b96903d759aa88b01404f259c6f70077027f
2019-05-13 09:38:24 +02:00
40af2205b1
Auto-updated build strings.
...
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
2019-05-13 00:01:06 +02:00
3fc5f183fd
Auto-updated build strings.
...
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
2019-05-12 00:01:06 +02:00
0008f57e35
Auto-updated build strings.
...
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
2019-05-11 00:01:09 +02:00
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
ab2bf737d5
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
...
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
2019-05-10 12:18:10 +02:00
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
12c9952e4a
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
3119278b26
Auto-updated build strings.
...
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
2019-05-10 00:01:14 +02:00
3e91207186
Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop'
...
Ent 3617 gráfica de módulos
See merge request artica/pandorafms!2407
Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
2019-05-09 17:03:03 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
c7c7a8457f
Merge branch 'ent-3952-6601-aadcm-fallo-visual-en-pdf-report-sla-semanal' into 'develop'
...
fixed errors pdf SLA Weekly
See merge request artica/pandorafms!2410
2019-05-09 11:05:54 +02:00
ef45fc3ca6
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
2019-05-09 10:44:31 +02:00
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
Alejandro Fraguas
artica
alejandro-campos
Daniel Rodriguez
Luis Calvo
Daniel Maya
marcos.alconada
Tatiana Llorente
Daniel Barbero Martin
manuel