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
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
b853582fb9
Changed preview by \"click here\" message
2019-05-21 08:29:59 +02:00
20e38ead81
Auto-updated build strings.
2019-05-21 00:01:08 +02:00
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +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
fdd61e4f27
Fixed agent searh box
2019-05-17 16:36:21 +02:00
54d3eefa43
lint changes
2019-05-17 14:27:59 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
bdcea7ec7d
Minor fix
2019-05-17 14:25:17 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
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
34218fa7eb
Improved the management of the async requests of the visual console client
2019-05-17 14:09:30 +02:00
0c9f8892e0
Changed evaluates permissions
2019-05-17 13:58:34 +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
86dabc6476
Variability event_storm_protection check is added with empty data
2019-05-17 11:31:02 +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
0cd60d0431
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
2019-05-16 18:11:33 +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
c8c0194183
Minor fix in url
...
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
2019-05-16 12:33:05 +02:00
034480bf88
minor fixes
...
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
2019-05-16 12:28:46 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +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
a25a08f48d
Added an async task manager to the visual console client
...
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
2019-05-16 11:04:03 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +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
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
8004e096fd
MR 28 and minor fixes
...
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +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
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +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
43547267a0
Changed condition for ldap Force automatically create profile user
...
Former-commit-id: caa1218b7ae4dc09649a6a4bb54b158255ea268f
2019-05-14 15:59:35 +02:00
6e35f6aec7
UM updates and fixes
...
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
2019-05-14 13:41:21 +02:00
827ebcfbc5
Fix helps
...
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
2019-05-14 13:09:49 +02:00
ae11ea18c9
Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas
...
Conflicts:
pandora_console/include/functions_graph.php
Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
2019-05-14 12:27:02 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
421e6b559d
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
2019-05-14 11:46:39 +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
4497554b37
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
2019-05-14 10:40:49 +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
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
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
539f416cc4
Merge
...
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
2019-05-13 17:30:35 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +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
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
2f2385c9cb
Merge remote-tracking branch 'remotes/origin/ent-3611-Vista-Creación-Edición-de-Agente' into develop
...
Former-commit-id: bcd067e3b702c3eaa60fff2aeae7e39625f565ef
2019-05-13 15:57:19 +02:00
895588ebe0
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
2019-05-13 15:00:35 +02:00
ecacf2d3f5
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2403
Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
2019-05-13 14:54:25 +02:00
f281dda622
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2412
Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
2019-05-13 14:52:17 +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
3d66fca5d6
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: df2707c912cccfa684dc82e5ad8a777819b2b9e8
2019-05-13 10:08:37 +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
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +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
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +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
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
43ce4f9883
Added helps
2019-05-09 17:20:27 +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
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +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
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +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
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
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
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
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
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +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
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
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
b2b4372c9d
Added helps
...
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +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
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
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
3fcd854ae6
fixed error labels graphs and weight in chart
...
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
2019-05-06 16:43:59 +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
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
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
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
c31948b7c2
Fixed netflow node name
...
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
2019-04-30 17:30:57 +02:00
37d3737f82
Fixed number_format in group stadistic
...
Former-commit-id: 7580be83cce0432ab68e3698813fd7eef079665a
2019-04-30 16:23:14 +02:00
b1dd6edc64
Added changes in helps
...
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
7045e59e87
Added changes in helps
...
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
2019-04-30 10:44:53 +02:00
e9e24505fe
Added option in massive delete alerts to show alerts on disabled modules
...
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
310d217fb2
Auto-updated build strings.
...
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
2019-04-30 00:01:09 +02:00
61a0528717
Fixed EventHistory link
...
Former-commit-id: 431251e74f419123b4848e10edc5fe472accdf43
2019-04-29 17:37:36 +02:00
2aaeddd803
fixed errors IPAM subneting
...
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
2019-04-29 16:42:26 +02:00
94932d23ac
fixed error cfv status
...
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
2019-04-29 15:43:51 +02:00
9788a9f6d5
Merge branch 'visual-console-refactor' into 'develop'
...
Visual console refactor: hotfixes
See merge request artica/pandorafms!2384
Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
2019-04-29 12:43:42 +02:00
5f986e2390
Visual Console Refactor: bugfix
...
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
2019-04-29 11:53:21 +02:00
7f6ec7a501
Visual Console Refactor: bugfix
...
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
2019-04-29 11:03:56 +02:00
e5c17f660b
Visual Console Refactor: fixed the label position
...
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
2019-04-29 10:56:06 +02:00
c09fbf4ddb
Visual Console Refactor: fixed the links
...
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
2019-04-29 10:45:12 +02:00
24e8d81b43
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
2019-04-29 09:26:48 +02:00
5d6bd31786
Auto-updated build strings.
...
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
2019-04-29 00:01:06 +02:00
141a042ee2
Auto-updated build strings.
...
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
2019-04-28 00:01:06 +02:00
29b7ddeb6d
Auto-updated build strings.
...
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
2019-04-27 00:01:09 +02:00
504457f9a6
Fixed decimal in percentil
...
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
2019-04-26 14:37:35 +02:00
e54112641d
add links counters cfv
...
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
2019-04-26 14:25:51 +02:00
77941953a2
New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613
...
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
2019-04-26 11:57:41 +02:00
4b73518804
Fixed node name in netflow map
...
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
2019-04-26 09:54:38 +02:00
cffb469334
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
2019-04-26 09:44:54 +02:00
6de9b4f23e
Auto-updated build strings.
...
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
2019-04-26 00:01:06 +02:00
6feaba0b9d
Visual Console: changed the default orientation of the items
...
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
2019-04-25 18:23:28 +02:00
f3f5bcecd8
Visual Console Refactor: fixed the module graph element
...
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
2019-04-25 16:59:24 +02:00
af69804708
Improved the background size and the elements order of the Visual Console
...
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
2019-04-25 16:36:17 +02:00
da8507c4b4
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
08f9a34f23
Visual Console Refactor: bugfix
...
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
2019-04-25 14:24:19 +02:00
2d9b4908de
Visual Console Refactor: the legacy visual console is enabled by default
...
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
2019-04-25 14:08:55 +02:00
0bd276bc88
Visual Console Refactor: bugfix
...
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
2019-04-25 14:02:30 +02:00
3b03b6fa10
Merge branch 'visual-console-refactor' into 'develop'
...
Visual console refactor
See merge request artica/pandorafms!2348
Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
2019-04-25 11:27:49 +02:00
7d95151a5b
Visual Console Refactor: minor fixes
...
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
2019-04-25 10:57:25 +02:00
260a149668
fixed include_once in items
...
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
2019-04-25 10:37:11 +02:00
35d54a7e79
Visual Console Refactor: added missing libs
...
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
2019-04-25 10:30:24 +02:00
fbd8937cd3
Merge remote-tracking branch 'origin/develop' into visual-console-phase-2
...
Former-commit-id: d79ca27527b9f3662617f8cfd641a55a8272b3b8
2019-04-25 10:09:45 +02:00
6a378f664e
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
2019-04-25 10:02:38 +02:00
8ae521b2c4
Visual Console Refactor: added missing libraries
...
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
2019-04-25 10:02:35 +02:00
87ff7b3d4e
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
...
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
2019-04-25 09:37:14 +02:00
3d2bcb3495
Fixed include_once in DonutGraph
...
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
2019-04-25 09:25:19 +02:00
b6d6b05ddb
Visual Console Refactor: upgraded the bundles
...
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
2019-04-25 09:13:34 +02:00
7f7a727c21
Auto-updated build strings.
...
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
2019-04-25 00:01:10 +02:00
596e760454
fixed error secondary groups
...
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
2019-04-24 17:28:55 +02:00
48917c565f
Visual Console Refactor: renamed the bundles
...
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
2019-04-24 17:25:57 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
dab4024f24
Visual Console Refactor: fixed the module graph's height
...
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
2019-04-24 16:57:52 +02:00
ab6658a450
Fixed pagination in modal windows - #3707
...
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
2019-04-24 16:26:50 +02:00
e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
1cb15c9404
Visual Console Refactor: fixed the donut graph
...
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
2019-04-24 16:07:46 +02:00
3c2e65a8a5
Visual Console Refactor: added the missing macros to the label
...
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
2019-04-24 15:58:33 +02:00
d541eab986
Fixed size in module graph
...
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
2019-04-24 15:40:07 +02:00
313ff93c8c
Fixed pagination in modal window to create dashboard - #3707
...
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
2019-04-24 15:38:46 +02:00
50e994e065
Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
...
change way to print discovery simple multiple inputs
See merge request artica/pandorafms!2378
Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
759a533180
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
...
Commit para revisar progreso
See merge request artica/pandorafms!2289
Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
2019-04-24 13:47:15 +02:00
56fef21bc6
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 50ffdbe852fe3dc88ba1705ce769f8ec70bc7506
2019-04-24 13:40:46 +02:00
a1dbf7b780
Added macro
...
Former-commit-id: 08c46875bb09eafde6ebc2f4b526fe4c7bbf944e
2019-04-24 13:40:37 +02:00
8ce3aa0b93
Se añade el valor a assigned by con el usuario de configuracion global
...
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
2019-04-24 13:31:43 +02:00
cec4bb49ff
Merge branch 'ent-3705-borrado-completo-de-la-carpeta-colecciones-nodo-metaconsola' into 'develop'
...
Fixed filemanager uploading on meta
See merge request artica/pandorafms!2377
Former-commit-id: 847cb1daefac473ab92d3e326257428e8cd9880a
2019-04-24 12:58:17 +02:00
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
177b4c7246
VIsual Console Refactor: now the items use the legacy style for the labels
...
Former-commit-id: b8adbb11c6b51924413c346d9fe2c93ea9842340
2019-04-24 12:43:37 +02:00
e7995b988e
Se arregla nombre de la funcion insert
...
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
7433d52130
change way to print discovery simple multiple inputs
...
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
062a68fdaf
Ultimas modificaciones
...
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
dcdb8c3aa9
Fixed default size in EventHistory
...
Former-commit-id: 287ab0803651b6a417e6e28a948b55b0afe8a352
2019-04-24 11:15:11 +02:00
a5e80f5070
Fixed filemanager uploading on meta
...
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
2019-04-24 11:12:26 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
8bba24e13a
Updated version and build strings.
...
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
f960e9037d
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 9b7c696afb0860fb738d52e18668c80e634efbf5
2019-04-24 09:28:04 +02:00
4a699c2b75
Auto-updated build strings.
...
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
6ef28a9b27
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: ca272bd529c0bc2182bbcc476f82bcfcf42175ed
2019-04-23 17:56:22 +02:00
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
0a70e49792
Visual Console Refactor: finished the default sizing for the elements which use icons
...
Former-commit-id: b8504d22eecdaeee8ac64a2d008ff847c07aa4d2
2019-04-23 17:44:18 +02:00
c0b324b25a
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 7a79252ca00ae8b9c695b4799a365c440b63d574
2019-04-23 17:29:59 +02:00
c910c94c7f
Fixed height and width in icon, group and staticgraph
...
Former-commit-id: 03a8147ba5a8897acf91aa9265fb62e7fab7e517
2019-04-23 16:53:18 +02:00
92da84c47f
fix bug in discovery progress popups
...
Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
2019-04-23 16:40:08 +02:00
cb6b8531df
Visual Console Refactor: minor fix
...
Former-commit-id: c055042c1cf3b4181a146857f159d656b9c5ed3f
2019-04-23 16:23:32 +02:00
569c84ad05
Show contact in events information
...
Former-commit-id: 5fd33a7b3abbcef12d8d26ff5d2e6ea14f17a44e
2019-04-23 16:10:51 +02:00
5e3f3500c4
Added status group in metaconsole
...
Former-commit-id: cb1dcf221012f25c72ebcc0238475f5db1241835
2019-04-23 15:40:54 +02:00
8987a60755
restauro functions api
...
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
58d2abbdae
restauro api
...
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
2019-04-23 15:37:54 +02:00
daa627441a
Removed some linter errors
...
Former-commit-id: 7dfda1ad66f676059145e7ab34485798dc9c5264
2019-04-23 15:09:57 +02:00
26b3fd23f5
Visual Console Refactor: changed the default size for the items which use icons
...
Former-commit-id: 689c7e3769ff1554ab2a5c9701d47117a122595a
2019-04-23 15:09:23 +02:00
4f25c89a74
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 489946341bfbf5c985750eac90dd12f7cbea91e5
2019-04-23 14:53:43 +02:00
2f397b16df
Visual Console Refactor: minor fix
...
Former-commit-id: 0cf70df7d8c45285fb612bc09871d52f0dfdcfb7
2019-04-23 13:16:33 +02:00
f4ff73bee1
Visual Console Refactor: minor fix
...
Former-commit-id: cf4201fd61ffb61957b54277d9195bae5935aa3b
2019-04-23 13:00:52 +02:00
57d66e95ce
minor fix
...
Former-commit-id: 17cf4ce929b52904ea8c6120b3c36f859694211e
2019-04-23 12:20:12 +02:00
f124612ba1
Visual Console Refactor: bugfix
...
Former-commit-id: 698a3aa603ffe93c70edf52517fc5def21da52ba
2019-04-23 11:41:50 +02:00
c461825a27
Visual Console Refactor: some parameters aren't required anymore
...
Former-commit-id: 3788b8dc8c055a04a627bf99e12ab30420d54351
2019-04-23 11:40:45 +02:00
3a3c62a855
Visual Console Refactor: added a pair of comment lines
...
Former-commit-id: dc2237e31753b212ce268d5a6901723ffb5a7528
2019-04-23 11:36:46 +02:00
404fb19e35
Fixed status of staticgraph in metaconsole
...
Former-commit-id: cf0b32c2c7cafaca8f4463d46d67c25c7a81fdc2
2019-04-23 10:54:43 +02:00
d6bd44d1c0
Visual Console Refactor: bugfixes
...
Former-commit-id: 09c2b268fd179f81f3041be774f199abe088b4f3
2019-04-23 09:56:02 +02:00
8fc5951209
Visual Console Refactor: fixed the group link
...
Former-commit-id: c3982381f65e2b4e805546c218ef7ec5e83c2685
2019-04-23 09:43:44 +02:00
8345c1a85f
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: e28ec3130ff14c662953b33490c5525e257b0288
2019-04-23 09:37:41 +02:00
883f3decb4
Auto-updated build strings.
...
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
01d1fb1c11
fixed visual bug
...
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
58a601b0f1
Fixed id_tagente in metaconsole
...
Former-commit-id: 72ea89dfe6eff0892adaaa4a077a99ddfa0fa4d4
2019-04-22 17:44:27 +02:00
713212a435
Fixed html group
...
Former-commit-id: a7b9fdccad8d62783ef2a547a72cc86d5ebc7f46
2019-04-22 17:39:57 +02:00
d4eca50996
Visual Console Refactor: bundle upgrade
...
Former-commit-id: 6e54f465ae1ec8b775e4050bfc5ba1abdce1dc39
2019-04-22 17:01:01 +02:00
ac3fac01c0
Visual Console Refactor: rebuilded the bundles
...
Former-commit-id: 4c06bc90af1bfda72b67f86c2794dd6701f39f1d
2019-04-22 15:10:13 +02:00
480037ec45
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 5b531124879af2ae9af695febae175b32ebd073e
2019-04-22 15:04:48 +02:00
06756d0769
Visual Console Refactor: fixes and improvements
...
Former-commit-id: 5083315ebb9690aa946b9ea8452def592f2a8ac5
2019-04-22 15:04:34 +02:00
3332e41f41
Added an option to use the metaconsole table when fetching the agents
...
Former-commit-id: d21627018f662d27f5612bf69bddfd8d298437ca
2019-04-22 15:02:15 +02:00
74d91b0814
Changed vc.main js
...
Former-commit-id: fcc4005f70afaa71b97bfc64edca11244cfd0228
2019-04-22 14:57:14 +02:00
ebaa3506de
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: c47efaabdd51775e11d1672ef2f4100b97baa332
2019-04-22 13:15:30 +02:00
22ce005e5d
Visual Console Refactor: improvements and fixes
...
Former-commit-id: c1a5f1ca26d719c7ed0291ec611e0e14e8f5c7b4
2019-04-22 13:09:34 +02:00
e79b51e0de
Added show statictics in group
...
Former-commit-id: 2475eff69255412997fd13d0e87d2484156e1046
2019-04-22 12:46:28 +02:00
b93a016f50
Visual Console Refactor: bugfix
...
Former-commit-id: eaef1bbee481e54e96cd55e3b4fef7c5a852e84c
2019-04-22 12:07:48 +02:00
9a186fcb8f
Visual Console Refactor: bugfix
...
Former-commit-id: 8243195bd4ed0d4247983c510ed81d5b415915e8
2019-04-22 10:58:01 +02:00
014aaffc0d
Se normaliza codigo
...
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
37c562f210
Visual Console Refactor: fixed some items
...
Former-commit-id: dbe93abb76ffb1e6e82492b8f2be380bc422bb3d
2019-04-22 10:05:54 +02:00
a03245a277
Visual Console Refactor: fixed the visual console background on the meta
...
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
2019-04-22 09:40:08 +02:00
8978b49a8b
minor fix while setting node_radius by default
...
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
dc086463ee
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 079b5bccc12df71ccc2bb8642e6edf34c17724ca
2019-04-22 09:20:31 +02:00
cbdd8e7104
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
ea7a8b2b90
Auto-updated build strings.
...
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
1dfda59ce6
Auto-updated build strings.
...
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
7283d87a17
Auto-updated build strings.
...
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
9d8e2abd98
Auto-updated build strings.
...
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
732b3e83d4
Se añaden las modificaciones
...
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
6f709cbae3
Retoque en api php
...
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
2019-04-17 17:28:48 +02:00
ad4dfc7624
Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
...
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
7608eb86c7
Visual Console Refactor: added all the percentile types
...
Former-commit-id: 0779585b488a1be47aeef6d5628693a930ab9aa4
2019-04-17 17:09:11 +02:00
30f5c97610
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 358c210cdc36b162f7337258d87f9609be39ef5a
2019-04-17 15:58:19 +02:00
c9076aa85e
Visual Console Refactor: bugfixes
...
Former-commit-id: d5f194be2d9e201cdcc3c7cafbd64b6a1149ae7d
2019-04-17 15:58:07 +02:00
806310d8d1
Fixed StaticGraph
...
Former-commit-id: 512635353ed672969ca4d13859ce073370115a7b
2019-04-17 15:39:55 +02:00
fb87b97cd4
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
...
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
51541c8d2c
Atucalizacion de rama
...
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
161bf4c079
Visual Console Refactor: fixed the clock date
...
Former-commit-id: 6864b784b4353b63e152d709627f0ab2c0d0205b
2019-04-17 14:17:26 +02:00
0911a00fe9
Visual Console Refactor: fixes
...
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
2019-04-17 13:50:53 +02:00
d2d8a3b0ba
solucion problema merge
...
Former-commit-id: 0ddc396a3f8168b5cea65484502f00ff6178c6df
2019-04-17 12:53:50 +02:00
513fcaf107
Visual Console Refactor: bugfix
...
Former-commit-id: a46113397b3eb94e09fefd3a94da8a75c8b47574
2019-04-17 12:52:29 +02:00
1a705c169b
Visual Console Refactor: minor fix
...
Former-commit-id: 4e9045dd4f00b78bc63eb3d24731c1758b317c9f
2019-04-17 12:49:42 +02:00
bb7c9d0405
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into develop
...
Former-commit-id: 68a549dddd224c96ce4a85607d51a5e32e729b15
2019-04-17 12:49:39 +02:00
5de38e204f
Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
...
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
985726d5a2
modificaciones en api.php
...
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
fb53e94250
Visual Console Refactor: minor fix
...
Former-commit-id: f4754dcf62169e3a65d0b39f99c50fb3181bc812
2019-04-17 12:44:16 +02:00
cbf921ba25
Visual Console Refactor: bugfixes
...
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
2019-04-17 12:32:08 +02:00
683dcf3469
Visual Console Refactor: bugfixes
...
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
2019-04-17 12:29:38 +02:00
68b3fc0cf0
Added dir visual-console-client
...
Former-commit-id: 79baadfe00e58394a6ec3213750c61a9145ec0ba
2019-04-17 11:19:01 +02:00
274c78f647
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: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
ed3155c053
New View Create/Update Agent - #3611
...
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
8e4ef972d8
Fixed acl item
...
Former-commit-id: 7e5a7d448524a808fc25fa08bfb17b08e65c77cd
2019-04-17 10:05:01 +02:00
83cda70e0a
Fixed styles of tables within tables with new class - #3707
...
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
cfff9c065d
New View Create/Update Agent - #3611
...
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
ff5a33ba2c
Auto-updated build strings.
...
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
a8dfe1acaf
Visual Console Refactor: minor fix
...
Former-commit-id: 67f29813f66ae21e8e1ae2e49a8b8669b355df2d
2019-04-16 19:38:09 +02:00
f663bd8389
Visual Console Refactor: minor fixes
...
Former-commit-id: 028f466f9429488f399551e2d3201439b73ce34e
2019-04-16 18:37:43 +02:00
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
985fc952e1
actualizacion
...
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
5c2ebf0976
Camprobaciones en local para functiones
...
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
2952af7f6b
VIsual Console Refactor: bugfix
...
Former-commit-id: f0603f3512dbb224f11d628600857a4b9dbb9f9b
2019-04-16 16:06:56 +02:00
31aa5b6d67
Comprobaciones en local
...
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
7acee06a00
Visual Console Refactor: bug fix
...
Former-commit-id: a2a05a2129873fdb6b2325211c490ad8f9263b16
2019-04-16 15:04:54 +02:00
a44d67a733
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 18d39f1b4ffbd3e56a3b1a879abf8bdf4ec6dead
2019-04-16 12:24:56 +02:00
998a66f654
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
...
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
9be6029e1a
Fixed Line class
...
Former-commit-id: 639649f4d65340ff25ecc1e956298705f5d13a05
2019-04-16 12:18:53 +02:00
fa1bf821e2
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 7331c64930125848041ead739feb72c0f67afbb2
2019-04-16 09:49:55 +02:00
8f48deca14
Visual Console Refactor: removed the html entities from the main model data output
...
Former-commit-id: c8dfcdd77c7138a6644a3e785f652619bd4b852c
2019-04-16 09:49:50 +02:00
Alejandro Fraguas
manuel
fbsanchez
artica
Daniel Maya
alejandro-campos
Luis Calvo
Alejandro Gallardo Escobar
marcos.alconada
Daniel Rodriguez
Daniel Barbero Martin
root
Tatiana Llorente
artica