Pablo Aragon
|
308a7dd948
|
13159-Move button from action buttons to modal
|
2024-03-25 09:45:08 +01:00 |
Jonathan
|
c0c1baa851
|
#13160 change name agent and group welcome window
|
2024-03-25 09:36:21 +01:00 |
Jonathan
|
752aa71ecf
|
#13150 hide omnishell
|
2024-03-25 09:20:00 +01:00 |
Pablo Aragon
|
0e3d9a0396
|
13181-Fix filters in Agent graphs
|
2024-03-25 09:06:11 +01:00 |
Jonathan
|
677eb81eb8
|
#13061 toekn lts message no show to individual users
|
2024-03-25 08:56:19 +01:00 |
Jonathan
|
7aaab5f39c
|
Merge branch 'develop' into ent-13061-limitar-el-aviso-de-lts-versions-del-warp-offline
|
2024-03-25 08:38:36 +01:00 |
Jonathan
|
8a29e03b58
|
#13061 toekn lts message no show to individual users
|
2024-03-25 08:32:56 +01:00 |
Pablo Aragon
|
1f31000edd
|
13183-Fix background color svg icons dark theme
|
2024-03-25 08:21:14 +01:00 |
artica
|
e7fefdebe9
|
Auto-updated build strings.
|
2024-03-25 01:00:03 +01:00 |
artica
|
07cd6386fa
|
Auto-updated build strings.
|
2024-03-24 01:00:04 +01:00 |
artica
|
b71ed54aa3
|
Auto-updated build strings.
|
2024-03-23 01:00:06 +01:00 |
Pablo Aragon
|
fa064dd2be
|
13182-Fix styles in Agents bulk operations
|
2024-03-22 14:14:12 +01:00 |
Matias Didier
|
25f050c6da
|
Merge branch 'ent-13134-no-se-configura-el-splash-por-defecto-en-nuevas-instalaciones' into 'develop'
Ent 13134 no se configura el splash por defecto en nuevas instalaciones
See merge request artica/pandorafms!7059
|
2024-03-22 11:48:06 +00:00 |
Matias Didier
|
5c32dc918a
|
Merge branch 'ent-13125-sin-haber-linkeado-ninguna-consola-a-un-item-no-sale-el-none-que-si-salia-antes' into 'develop'
Ent 13125 Sin haber linkeado ninguna consola a un item no sale el none, que si salía antes
See merge request artica/pandorafms!7065
|
2024-03-22 11:42:45 +00:00 |
Daniel Cebrian
|
1ef4aa4551
|
#13130 fixed filter graph
|
2024-03-22 12:38:50 +01:00 |
Pablo Aragon
|
ae23649037
|
13135-Add options Menu tabs in Visual styles
|
2024-03-22 10:52:20 +01:00 |
artica
|
968c9fb2c6
|
Auto-updated build strings.
|
2024-03-22 01:00:06 +01:00 |
Daniel Cebrian
|
626adb05ff
|
#13125 fixed none select
|
2024-03-21 17:36:55 +01:00 |
Daniel Cebrian
|
f1827fc56b
|
#13149 remove message audit from check_login
|
2024-03-21 17:20:12 +01:00 |
Diego Muñoz-Reja
|
c714c3547e
|
Merge branch 'ent-13115-Comprobar-versiones-de-MySQL-y-MR-de-Principal-e-Historico-antes-de-aplicar-UM' into 'develop'
check history db mysql version in update
See merge request artica/pandorafms!7046
|
2024-03-21 15:59:33 +00:00 |
Daniel Cebrian
|
fbbb888ab2
|
#13136 fixed discovery maps
|
2024-03-21 16:11:22 +01:00 |
Pablo Aragon
|
791c0b62d1
|
13127-Add hint in Netflow setup item
|
2024-03-21 15:42:59 +01:00 |
Pablo Aragon
|
f78b60c20e
|
13124-Fix dark theme select2 in welcome wizard
|
2024-03-21 15:31:30 +01:00 |
Pablo Aragon
|
61b51aa75d
|
13134-Set default login splash image
|
2024-03-21 15:03:51 +01:00 |
Pablo Aragon
|
327516b931
|
13138-Add label event filter
|
2024-03-21 14:47:03 +01:00 |
Daniel Rodriguez
|
50d95d5120
|
Merge branch 'ent-12905-deprecar-eliminar-discovery-legacy' into 'develop'
Ent 12905 Deprecar (eliminar) discovery legacy
See merge request artica/pandorafms!6960
|
2024-03-21 13:23:16 +00:00 |
Pablo Aragon
|
d578cf2b6f
|
13121-Fix autorefresh VC
|
2024-03-21 14:14:39 +01:00 |
Pablo Aragon
|
bbd6ee786e
|
13121-Fix autorefresh VC
|
2024-03-21 14:14:12 +01:00 |
Matias Didier
|
74351b1caf
|
Merge branch 'ent-13102-17272-Macros-no-acepta-dobles-comillas-en-valor-de-field' into 'develop'
input fix
See merge request artica/pandorafms!7054
|
2024-03-21 10:42:50 +00:00 |
Daniel Cebrian
|
8c5b56f055
|
#13079 only apply reduce events comments with group events
|
2024-03-21 11:26:36 +01:00 |
Daniel Cebrian
|
47895f5f66
|
#13079 fixed group events
|
2024-03-21 11:04:30 +01:00 |
Pablo Aragon
|
19e2461532
|
12953-Change policy@svg.svg icon
|
2024-03-21 08:13:39 +01:00 |
artica
|
f5a01c9212
|
Auto-updated build strings.
|
2024-03-21 01:00:06 +01:00 |
Alejandro Sánchez
|
390a0ad2da
|
Merge branch 'ent-13126-mysql-discovery-pide-dependencia-criptograpy-en-caso-de-conectar-con-usuario-que-no-tiene' into 'develop'
update version
See merge request artica/pandorafms!7050
|
2024-03-20 17:59:45 +00:00 |
Daniel Cebrian
|
e682a44d8b
|
#13079 fixed bug in sql
|
2024-03-20 18:07:53 +01:00 |
Matias Didier
|
60240dd941
|
Merge branch 'ent-13094-vista-agente-modulos-se-puede-compactar-mas-hay-pocos-elementos' into 'develop'
Ent 13094 vista agente modulos se puede compactar mas hay pocos elementos
See merge request artica/pandorafms!7049
|
2024-03-20 16:18:04 +00:00 |
Daniel Cebrian
|
db871e8a29
|
#13079 performance events fixed in comments
|
2024-03-20 17:15:30 +01:00 |
alejandro.campos@artica.es
|
d0b9a0acbc
|
input fix
|
2024-03-20 17:05:41 +01:00 |
Pablo Aragon
|
d92471f068
|
13088-Fix button styles in Custom reports & Go back button onclick
|
2024-03-20 16:22:29 +01:00 |
Pablo Aragon
|
720e8ce49c
|
13100-Fix size image preview VC
|
2024-03-20 15:56:54 +01:00 |
Pablo Aragon
|
423511def2
|
12953-Change policies icons to svg
|
2024-03-20 12:56:30 +01:00 |
daniel
|
7c12315b4d
|
update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004
|
2024-03-20 12:47:39 +01:00 |
alejandro
|
c1fd4134fc
|
update version
|
2024-03-20 11:53:55 +01:00 |
Matias Didier
|
6cbe76f02f
|
Merge branch 'ent-12826-16992-Problema-visual-en-el-listado-de-elementos-de-las-consolas-visuales' into 'develop'
table fix
See merge request artica/pandorafms!6964
|
2024-03-20 09:37:41 +00:00 |
alejandro.campos@artica.es
|
f741fcb83a
|
text change
|
2024-03-20 10:18:54 +01:00 |
Pablo Aragon
|
ffce0d59a1
|
13094-Add columns dynamically in Agents modules view
|
2024-03-20 08:18:05 +01:00 |
daniel
|
d1089dbd32
|
Merge remote-tracking branch 'origin/develop' into ent-13004-mejorar-sincronizacion-agentes-inventario-pandora-itsm
|
2024-03-20 08:03:18 +01:00 |
artica
|
25d64de5d2
|
Auto-updated build strings.
|
2024-03-20 01:00:06 +01:00 |
daniel
|
568cd09d07
|
update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004
|
2024-03-19 19:24:43 +01:00 |
daniel
|
75f416ae50
|
update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004
|
2024-03-19 19:21:54 +01:00 |
Daniel Cebrian
|
62dc85248e
|
Merge branch 'develop' into ent-12905-deprecar-eliminar-discovery-legacy
|
2024-03-19 17:32:47 +01:00 |
alejandro.campos@artica.es
|
57ae88a967
|
check history db mysql version in update
|
2024-03-19 17:22:39 +01:00 |
alejandro.campos@artica.es
|
7797bef59a
|
check history db mysql version in update
|
2024-03-19 16:52:09 +01:00 |
alejandro.campos@artica.es
|
2b010aca6e
|
change order direction
|
2024-03-19 15:20:43 +01:00 |
Jonathan
|
424f365ea4
|
#12997 remove skins section
|
2024-03-19 13:35:53 +01:00 |
Matias Didier
|
53bead2acc
|
Merge branch 'ent-12963-opcion-normalizar-no-pide-confirmacion' into 'develop'
Ent 12963 Opción "Normalizar" no pide confirmación
See merge request artica/pandorafms!6985
|
2024-03-19 11:03:58 +00:00 |
Daniel Cebrian
|
27501f90cb
|
#12905 fixed mr
|
2024-03-19 11:22:13 +01:00 |
Jonathan
|
9fc77e69b2
|
Merge branch 'develop' into ent-12997-eliminar-sistema-de-skins
|
2024-03-19 10:51:15 +01:00 |
Jonathan
|
b1ddaecccc
|
#12997 remove skins from every site
|
2024-03-19 10:50:24 +01:00 |
artica
|
4523eb87ed
|
Auto-updated build strings.
|
2024-03-19 01:00:05 +01:00 |
Pablo Aragon
|
1791bd101e
|
13003-Fix remote component plugins
|
2024-03-18 15:45:12 +01:00 |
alejandro.campos@artica.es
|
32159b771d
|
collapsable area in agents ips
|
2024-03-18 14:31:18 +01:00 |
alejandro.campos@artica.es
|
87368fb9a3
|
collapsable area in agents ips
|
2024-03-18 13:51:09 +01:00 |
alejandro.campos@artica.es
|
a32844d08a
|
collapsable area in agents ips
|
2024-03-18 13:46:50 +01:00 |
Daniel Maya
|
e5e857116b
|
#13010 Fixed services 3
|
2024-03-18 12:23:45 +01:00 |
Pablo Aragon
|
35b6ba2b9d
|
13011-Remove background color toggle child
|
2024-03-18 10:28:47 +01:00 |
Jonathan
|
cac66629c6
|
#13044 change enable for disabled message
|
2024-03-18 09:52:41 +01:00 |
Jonathan
|
0dd0927633
|
#13061 dont show more lts message checkbox
|
2024-03-18 09:38:29 +01:00 |
Pablo Aragon
|
d6624db743
|
13024-Hide actions column for non AW users
|
2024-03-18 09:32:55 +01:00 |
Daniel Maya
|
75eb8e2558
|
#13010 Fixed services 2
|
2024-03-18 08:58:52 +01:00 |
artica
|
921505f360
|
Auto-updated build strings.
|
2024-03-18 01:00:03 +01:00 |
artica
|
eccc320002
|
Auto-updated build strings.
|
2024-03-17 01:00:03 +01:00 |
artica
|
eab1e7f8fa
|
Auto-updated build strings.
|
2024-03-16 01:00:04 +01:00 |
Enrique Martin
|
20011387d7
|
Fixed demo network map relationships creation
|
2024-03-15 13:39:12 +01:00 |
Jonathan
|
0fc7d3e325
|
#13037 SAP view re-do
|
2024-03-15 12:44:17 +01:00 |
Daniel Cebrian
|
983450e3b2
|
#12963 changed icon
|
2024-03-15 12:43:41 +01:00 |
Daniel Cebrian
|
0b419d84be
|
#12691 added button submit in realtime_graph
|
2024-03-15 10:22:30 +01:00 |
Enrique Martin
|
95e7c7185a
|
Fixed demo data cleanup
|
2024-03-15 10:11:10 +01:00 |
Daniel Cebrian
|
6a1eeb467f
|
#12691 fixed autosubmit in filters
|
2024-03-15 10:02:21 +01:00 |
Daniel Cebrian
|
55ad4b785e
|
#13034 fixed acl
|
2024-03-15 09:11:12 +01:00 |
Daniel Cebrian
|
eedf15d4e0
|
revert change
|
2024-03-15 09:10:27 +01:00 |
Daniel Cebrian
|
58919847cb
|
#13034 fixed acl
|
2024-03-15 09:07:15 +01:00 |
artica
|
2192acdac2
|
Auto-updated build strings.
|
2024-03-15 01:00:05 +01:00 |
Daniel Cebrian
|
d221094f61
|
#13034 fixed checkbox
|
2024-03-14 16:49:39 +01:00 |
Daniel Cebrian
|
c9e515e121
|
#13034 fixed checkbox in head
|
2024-03-14 16:45:02 +01:00 |
Daniel Cebrian
|
b10247abdf
|
#13055 changes in interface view
|
2024-03-14 15:44:17 +01:00 |
Daniel Maya
|
c842210722
|
#13081 Fixed mr
|
2024-03-14 15:15:19 +01:00 |
artica
|
a31f96314f
|
Updated version and build strings.
|
2024-03-14 11:52:58 +01:00 |
Daniel Cebrian
|
b21ae7b667
|
#13057 fixed pagination design
|
2024-03-14 11:48:17 +01:00 |
Daniel Maya
|
50c40231b4
|
#13075 enabled alert list
|
2024-03-14 11:20:39 +01:00 |
Daniel Cebrian
|
5f62f0351c
|
#13053 fixed icon
|
2024-03-14 10:24:46 +01:00 |
Daniel Cebrian
|
faece59451
|
#13051 hide policies filter in open
|
2024-03-14 10:03:08 +01:00 |
Rafael Ameijeiras
|
3546c39aef
|
Merge branch 'ent-13066-problema-con-modal-en-resoluciones-de-pantalla-retina' into 'develop'
Ent 13066 Problema con modal en resoluciones de pantalla retina
See merge request artica/pandorafms!7023
|
2024-03-14 08:50:25 +00:00 |
artica
|
650938a0a6
|
Auto-updated build strings.
|
2024-03-14 01:00:04 +01:00 |
Daniel Maya
|
413c2e8424
|
#13010 Fixed services
|
2024-03-13 17:19:55 +01:00 |
Daniel Cebrian
|
83e9332e53
|
#13066 fixed modal in retine screen
|
2024-03-13 16:53:43 +01:00 |
daniel
|
ae1f586971
|
Bug acl apiv2 pandora_enterprise#13065
|
2024-03-13 14:24:29 +01:00 |
Jonathan
|
846cb41657
|
#13048 fix entitys dialog print help
|
2024-03-13 11:59:09 +01:00 |
Daniel Cebrian
|
0106ad2b78
|
#13042 fixed update network maps
|
2024-03-13 11:34:34 +01:00 |
Daniel Cebrian
|
5979d51d68
|
#13034 fixed view module
|
2024-03-13 11:13:37 +01:00 |
Jonathan
|
c1bfeb93f5
|
#13044 overview no show 0%
|
2024-03-13 11:10:49 +01:00 |
Daniel Cebrian
|
b6cb9a7fd8
|
#12978 fixed short name in chart
|
2024-03-13 10:40:58 +01:00 |
daniel
|
7db8c17823
|
api change path v1 to v2 pandora_enterprise#13019
|
2024-03-13 09:07:58 +01:00 |
artica
|
316ac4943c
|
Auto-updated build strings.
|
2024-03-13 01:00:07 +01:00 |
Jonathan
|
253a9fca2b
|
#8036 events audit log
|
2024-03-12 17:52:33 +01:00 |
Rafael Ameijeiras
|
f5a3f345be
|
Merge branch 'ent-12927-problemas-de-sincronizacion-encolamiento-tsync_queue-debido-a-error-con-ldap-#16498' into 'develop'
Ent 12927 Problemas de sincronización (encolamiento tsync_queue) debido a error con LDAP #16498
See merge request artica/pandorafms!7003
|
2024-03-12 14:40:17 +00:00 |
Rafael Ameijeiras
|
38a3470565
|
Merge branch 'ent-12714-errores-de-traduccion-y-elementos-de-la-consola-sin-traducir-al-espanol-en-775' into 'develop'
Ent 12714 errores de traduccion y elementos de la consola sin traducir al espanol en 775
See merge request artica/pandorafms!7011
|
2024-03-12 14:36:50 +00:00 |
Rafael Ameijeiras
|
94923e0ae6
|
Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop'
#12497 dots new links
See merge request artica/pandorafms!7012
|
2024-03-12 14:36:07 +00:00 |
Alejandro Sánchez
|
cb5bb38b0e
|
Merge branch 'ent-12857-tickets-vmware-776' into 'develop'
update version
See merge request artica/pandorafms!6920
|
2024-03-12 12:41:43 +00:00 |
Daniel Maya
|
b44df1071d
|
#12714 Added traslations 2
|
2024-03-12 13:28:14 +01:00 |
Jonathan
|
bcd31a10bc
|
#12497 dots new links
|
2024-03-12 13:16:16 +01:00 |
alejandro
|
1256f097a8
|
change md5 hash with last fix
|
2024-03-12 13:13:41 +01:00 |
Daniel Cebrian
|
5abc56edbf
|
#13023 fixed z-index in search modal
|
2024-03-12 12:57:17 +01:00 |
Matias Didier
|
5ba4cb850a
|
Merge branch 'ent-12994-mensaje-feo-de-error-cuando-no-puede-conectar-a-la-bbdd-de-historico' into 'develop'
Ent 12994 Mensaje feo de error cuando no puede conectar a la BBDD de histórico
See merge request artica/pandorafms!6996
|
2024-03-12 11:35:59 +00:00 |
Daniel Maya
|
63fb36eb02
|
#12714 Update mr
|
2024-03-12 12:22:16 +01:00 |
Daniel Maya
|
22880e257a
|
#12714 Added traslations
|
2024-03-12 12:09:59 +01:00 |
Rafael Ameijeiras
|
24786a3a74
|
Merge branch 'ent-13020-error-warm-update-offline-en-comprobacion-de-version-mysql' into 'develop'
Ent 13020 error warm update offline en comprobacion de version mysql
See merge request artica/pandorafms!7004
|
2024-03-12 09:31:22 +00:00 |
Rafael Ameijeiras
|
68e4f4e735
|
Merge branch 'ent-13029-guardia-17751-vista-de-agente-rota' into 'develop'
Ent 13029 guardia 17751 vista de agente rota
See merge request artica/pandorafms!7002
|
2024-03-12 09:31:01 +00:00 |
vgilc
|
84f0f402ac
|
Merge branch 'ent-12714-errores-de-traduccion-y-elementos-de-la-consola-sin-traducir-al-espanol-en-775' into 'develop'
Ent 12714 errores de traduccion y elementos de la consola sin traducir al espanol en 775
See merge request artica/pandorafms!7009
|
2024-03-12 09:16:06 +00:00 |
Daniel Maya
|
64d2c52d95
|
#12714 Fixed traslations
|
2024-03-12 10:01:07 +01:00 |
Rafael Ameijeiras
|
623095146e
|
Merge branch 'ent-12594-mejorar-vista-de-scheduled-reports' into 'develop'
Ent 12594 mejorar vista de scheduled reports
See merge request artica/pandorafms!6975
|
2024-03-12 08:58:05 +00:00 |
Rafael Ameijeiras
|
499e74a964
|
Merge branch 'ent-12964-no-permitir-iniciar-sesion-de-superadmin-con-un-enlace-a-un-dashboard-publico' into 'develop'
Ent 12964 No permitir iniciar sesión de superadmin con un enlace a un Dashboard público
See merge request artica/pandorafms!7000
|
2024-03-12 08:56:31 +00:00 |
artica
|
e056e4cff2
|
Auto-updated build strings.
|
2024-03-12 01:00:05 +01:00 |
Jonathan
|
d7fb3c937d
|
#12997 remove skins section
|
2024-03-11 16:58:42 +01:00 |
Daniel Maya
|
0ae25b6407
|
#13020 mysql version
|
2024-03-11 15:27:10 +01:00 |
Daniel Cebrian
|
cde714aa94
|
#12927 fixed tsync queue sync in ad
|
2024-03-11 14:19:15 +01:00 |
Jonathan
|
bb7f359875
|
#13029 fix 500 agent view
|
2024-03-11 11:47:32 +01:00 |
Daniel Cebrian
|
c8e04d3bdc
|
#12964 fixed auto auth in public link dashboard
|
2024-03-11 09:42:38 +01:00 |
Jonathan
|
f36363326d
|
#12594 remove schedule from reports view
|
2024-03-11 09:30:11 +01:00 |
Rafael Ameijeiras
|
d482425991
|
Merge branch 'ent-12984-enlace-de-servicios-en-consolas-visuales-roto' into 'develop'
Ent 12984 enlace de servicios en consolas visuales roto
See merge request artica/pandorafms!6998
|
2024-03-11 08:08:54 +00:00 |
Rafael Ameijeiras
|
305e45bafc
|
Merge branch 'ent-12999-la-ventana-modal-de-la-vista-de-graficas-me-muestra-una-barra-de-desplazamiento-horizontal' into 'develop'
Ent 12999 La ventana modal de la vista de graficas me muestra una barra de desplazamiento horizontal
See merge request artica/pandorafms!6999
|
2024-03-11 08:08:31 +00:00 |
artica
|
e614982e8b
|
Auto-updated build strings.
|
2024-03-11 01:00:03 +01:00 |
artica
|
cde1e515af
|
Auto-updated build strings.
|
2024-03-10 01:00:04 +01:00 |
artica
|
cf3778fe22
|
Auto-updated build strings.
|
2024-03-09 01:00:04 +01:00 |
Daniel Cebrian
|
b96cd85b09
|
#12999 fixed window in firefox
|
2024-03-08 10:02:22 +01:00 |
Daniel Cebrian
|
df92200c09
|
#12999 fixed margin height
|
2024-03-08 09:40:40 +01:00 |
Daniel Cebrian
|
749fd9243c
|
#12999 resize window when change scale
|
2024-03-08 09:21:09 +01:00 |
artica
|
602ca64f2a
|
Auto-updated build strings.
|
2024-03-08 01:00:05 +01:00 |
Daniel Cebrian
|
09880cadf1
|
#12999 fixed modal resize
|
2024-03-07 17:58:56 +01:00 |
Daniel Maya
|
966177e8f2
|
#12984 Fixed importPrd
|
2024-03-07 17:20:38 +01:00 |
Rafael Ameijeiras
|
17f045b2bc
|
Merge branch 'ent-12989-opcion-de-csv-en-recon-task-aparece-descolocada' into 'develop'
Ent 12989 opcion de csv en recon task aparece descolocada
See merge request artica/pandorafms!6995
|
2024-03-07 15:41:12 +00:00 |
Daniel Maya
|
e94f7e2c59
|
#12989 Fixed network csv 2
|
2024-03-07 16:20:17 +01:00 |
Rafael Ameijeiras
|
c5c92411c9
|
Merge branch 'ent-11089-crear-el-modo-disabled-para-el-satelite' into 'develop'
Add agent_disabled functionality
See merge request artica/pandorafms!6994
|
2024-03-07 13:56:28 +00:00 |
Daniel Cebrian
|
c269d4280a
|
#12994 fixed message error in ajax when historical database is down
|
2024-03-07 13:55:35 +01:00 |
Daniel Cebrian
|
1125f64e89
|
#12994 fixed message error sql in history db
|
2024-03-07 13:28:34 +01:00 |
Daniel Maya
|
a1bab17ee5
|
#12989 Fixed network csv
|
2024-03-07 11:08:35 +01:00 |
artica
|
0cde0a5820
|
Auto-updated build strings.
|
2024-03-07 01:00:05 +01:00 |
Rafael Ameijeiras
|
b458a85a59
|
Merge branch 'ent-12970-cambiar-mensaje-de-error-php-inferior-a-8-2' into 'develop'
Ent 12970 cambiar mensaje de error php inferior a 8 2
See merge request artica/pandorafms!6992
|
2024-03-06 15:50:08 +00:00 |
Félix Suárez
|
747a63a2ba
|
Add agent_disabled functionality
|
2024-03-06 09:41:48 -06:00 |
Daniel Maya
|
b4433e533f
|
#12991 Restored tatctical view
|
2024-03-06 15:53:04 +01:00 |