5fe4a240be
se añade imagen y se quita de bbdd
...
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
2019-05-14 09:47:45 +02:00
b7ebb44c48
Auto-updated build strings.
...
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
5f87b13e13
WIP: updatemanager interaction
...
Former-commit-id: 5983c8a2f885dc696fb5bdf779e3e56783687667
2019-05-13 19:34:10 +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
6ca07c0914
Merge remote-tracking branch 'origin/develop' into 1668-update-manager
...
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
2019-05-13 17:58:35 +02:00
ced1b32915
Configuration, Registration and newsletter wizards
...
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +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
b6e8578d1d
Fixed a minor sintax error - #3611
...
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
e6fa42ddca
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
e9082c5d8a
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +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
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
ac60e296c1
Add new message to News board
...
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
2019-05-10 11:17:46 +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
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
72eb2babad
se quita install.php
...
Former-commit-id: 34ab35a67b924c6d0aab9f756a0c73bffd36c8cd
2019-05-09 17:44:54 +02:00
5126c651f7
Changed '' of query
2019-05-09 17:38:40 +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
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +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
fd83540ad5
New menu module graph for interface modules- #3617
2019-05-09 12:39:03 +02:00
0aa8bcda30
Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop'
...
Pending to review
See merge request artica/pandorafms!2295
2019-05-09 11:56:29 +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
23b3d07f37
Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated
2019-05-09 09:29:27 +02:00
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
7da73afd08
Auto-updated build strings.
2019-05-09 00:01:10 +02:00
8f6c8a9932
Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop'
...
Ent 3613 ventana modal de vista de eventos
See merge request artica/pandorafms!2387
2019-05-08 19:07:39 +02:00
1644b492d2
fixed errors pdf SLA Weekly
2019-05-08 18:29:33 +02:00
0a7539cc3a
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
...
fixed filemanager
See merge request artica/pandorafms!2408
2019-05-08 18:26:23 +02:00
ac101af72f
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
...
Added module units in module graphs
See merge request artica/pandorafms!2237
2019-05-08 16:36:43 +02:00
4b7f9e4882
Merge branch 'ent-3884-Error-Superredes' into 'develop'
...
fixed errors IPAM subneting
See merge request artica/pandorafms!2395
2019-05-08 15:57:53 +02:00
3833eb6463
elex's recommendations :D
2019-05-08 15:27:22 +02:00
0b118f63ad
Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola
2019-05-08 15:19:40 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
9bc5a2d346
IPAM vlan wizard ExtremeXOS
2019-05-08 14:17:40 +02:00
0ebf89a9eb
Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop'
...
Show contact in events information
See merge request artica/pandorafms!2373
2019-05-08 14:13:08 +02:00
0c8fab6cb3
Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
...
Ent 3574 7598 bug botones y casillas vista de eventos
See merge request artica/pandorafms!2222
2019-05-08 13:52:45 +02:00
72a127c085
Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
...
Fixed pagination in Alert templates
See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
d9e0d44a66
Merge branch 'ent-3782-module-visualization-bug' into 'develop'
...
Added unknown status image
See merge request artica/pandorafms!2314
2019-05-08 13:34:41 +02:00
f13162abf1
Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop'
...
Fixed select bug not selectig value
See merge request artica/pandorafms!2346
2019-05-08 13:17:02 +02:00
247605f308
Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
...
Eliminated the cache when update agents
See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
ef1149d3bb
Fixed get agent status on linked map
2019-05-08 12:39:53 +02:00
5b75b671aa
Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug
2019-05-08 12:37:10 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
610e0dabbf
Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts
2019-05-08 11:17:15 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
cb49de4d81
New menu module graph - #3617
2019-05-08 10:28:00 +02:00
5e0b53e3c2
New menu module graph - #3617
2019-05-08 09:35:28 +02:00
f2873714a6
Auto-updated build strings.
2019-05-08 00:01:08 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
954aac3aeb
Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug
2019-05-07 17:13:54 +02:00
e565ddee42
Round decimal value in percentil item and fixed value font size
2019-05-07 16:43:27 +02:00
3221bcf55a
Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug
2019-05-07 16:08:29 +02:00
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
10fd9c4b57
Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop
2019-05-07 15:02:47 +02:00
0a96cfd696
Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop'
...
Fixed bug in monitor detail view
See merge request artica/pandorafms!2360
Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
2019-05-07 10:17:37 +02:00
9116a72a2b
Auto-updated build strings.
...
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
2019-05-07 00:01:09 +02:00
ad00492ad6
se elimina la query del 27
...
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
2019-05-06 18:23:12 +02:00
fff3a783a1
Se restablece archivo modificado
...
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
b57adb38a5
added graph_precision for the float in static_graph and percentile item
...
Former-commit-id: 7fda14add9bcb0d9c0a425caad752364e29b309c
2019-05-06 17:12:00 +02:00
11a16e4c2a
Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
...
Fixed wrong array index for id_group
See merge request artica/pandorafms!2286
Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
3fcd854ae6
fixed error labels graphs and weight in chart
...
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
2019-05-06 16:43:59 +02:00
a622dcc9d4
add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
...
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
2019-05-06 15:06:26 +02:00
759c175d4f
Added date in analogic clock
...
Former-commit-id: 2436cac56b3910e23ce06defc5ce362f463b002f
2019-05-06 11:36:20 +02:00
545afcb684
Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
...
Added secondary groups in global search
See merge request artica/pandorafms!2351
Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
2019-05-06 10:33:30 +02:00
6d7b748591
Auto-updated build strings.
...
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
2019-05-06 00:01:06 +02:00
83b6fe5a55
Auto-updated build strings.
...
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
2019-05-05 00:01:07 +02:00
168ee6cdc6
Auto-updated build strings.
...
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
2019-05-04 00:01:07 +02:00
eb64dbae86
add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item
...
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
2019-05-03 14:16:26 +02:00
c5884f1ac9
add changes sql for mr 28
...
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
2019-05-03 14:09:23 +02:00
7da5f518d8
Fixed the form when you try to create an agent without alias - #3611
...
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
2019-05-03 14:00:24 +02:00
7d8f9f7798
fix lint errors
...
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
2019-05-03 13:54:39 +02:00
5b3dfcbf74
add feature to enable obfuscation on command fields when creating or updating commands
...
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
2019-05-03 13:46:52 +02:00
b3a4d9edf1
New View Create/Update Agent - #3611
...
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
2019-05-03 13:24:15 +02:00
9f3c586b55
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
7721c0e605
New View Create/Update Agent - #3611
...
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
16f687574e
Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
...
Fixed bug in unlinked modules
See merge request artica/pandorafms!2347
Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
e424a2a684
Fixed bug in unlinked modules edition
...
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
db4cfaf1b7
fixed errors reporting_builder.php
...
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
2019-05-03 12:11:20 +02:00
9b9d2a3647
fixed errors reporting_builder.item_editor.php
...
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
2019-05-03 10:39:29 +02:00
b88456f696
Auto-updated build strings.
...
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
828d7830a5
Auto-updated build strings.
...
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
a9e0acd3e1
Auto-updated build strings.
...
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00
3b73ea95ae
Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop'
...
Fixed node name in netflow map
See merge request artica/pandorafms!2386
Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
2019-04-30 17:53:48 +02:00
5be813e210
Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop'
...
add links counters cfv
See merge request artica/pandorafms!2388
Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
2019-04-30 17:50:33 +02:00
marcos.alconada
artica
fbsanchez
Alejandro Fraguas
Daniel Maya
Alejandro Campos
Daniel Rodriguez
Tatiana Llorente
Daniel Barbero Martin
manuel
slerena
Luis Calvo
Ramon Novoa