Jonathan
|
d923b5e463
|
#13013 add if count duplicated by extra id
|
2024-05-09 09:14:09 +02:00 |
Daniel Cebrian
|
4c485be711
|
Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta
|
2024-04-26 12:41:08 +02:00 |
Jose Martin
|
e2fc9e27bf
|
Merge branch 'ent-13287-botones-columnas-sobrantes-en-eventos-para-usuario-sin-permisos' into 'develop'
Ent 13287 botones columnas sobrantes en eventos para usuario sin permisos
See merge request artica/pandorafms!7261
|
2024-04-25 06:32:33 +00:00 |
|
Jose Martin
|
fc8538108a
|
Merge branch 'ent-13223-Se-pueden-abrir-muchas-instrucciones-de-evento-de-manera-simultánea' into 'develop'
Ent 13223 se pueden abrir muchas instrucciones de evento de manera simultánea
See merge request artica/pandorafms!7270
|
2024-04-24 11:43:25 +00:00 |
Jorge Rincon
|
a41a1becfa
|
#13223 Fixed instructions dialog in events as a modal
|
2024-04-24 09:56:48 +02:00 |
Pablo Aragon
|
e0a16d3a15
|
13287-Remove Delete icon in Events for EW users
|
2024-04-24 08:10:19 +02:00 |
|
Daniel Cebrian
|
d41e3d44a9
|
#13264 fixed injection "
|
2024-04-23 17:15:30 +02:00 |
|
Jorge Rincon
|
cacd05d667
|
#13223 Fixed instructions dialog in events
|
2024-04-23 17:12:36 +02:00 |
|
Daniel Cebrian
|
6d33c36cb0
|
#13264 fixed sql injection
|
2024-04-23 17:01:47 +02:00 |
|
Daniel Cebrian
|
64013c0416
|
#13264 added regex in sql
|
2024-04-23 16:56:28 +02:00 |
|
Pablo Aragon
|
4a20bdb2fd
|
13562-Fix duplicate column id_grupo in events_get_all()
|
2024-04-16 12:10:05 +02:00 |
|
Daniel Cebrian
|
6e2e0c231a
|
Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta
|
2024-04-15 13:35:55 +02:00 |
|
Daniel Cebrian
|
8d9a89a6a8
|
Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta
|
2024-04-15 09:54:30 +02:00 |
|
Pablo Aragon
|
d967b7076a
|
13473-Fix acl widgets Block histogram, Module histogram and Tree view (histogram graph)
|
2024-04-12 08:53:11 +02:00 |
|
Daniel Cebrian
|
22c1b6e872
|
#13035 refactored password_hash
|
2024-04-11 10:26:53 +02:00 |
|
Daniel Cebrian
|
43f8d5888c
|
#13322 fixed event comment filter
|
2024-04-05 09:49:17 +02:00 |
|
Daniel Cebrian
|
23f9866a1c
|
#13322 fixed filter comment
|
2024-04-04 20:27:43 +02:00 |
|
Pablo Aragon
|
848e7dd5b0
|
Merge branch 'develop' into ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos
|
2024-04-04 16:58:14 +02:00 |
Félix Suárez
|
e157d5f202
|
Handle to show instructions on unknown
|
2024-04-03 09:39:01 -06:00 |
|
Daniel Cebrian
|
e682a44d8b
|
#13079 fixed bug in sql
|
2024-03-20 18:07:53 +01:00 |
|
Daniel Cebrian
|
db871e8a29
|
#13079 performance events fixed in comments
|
2024-03-20 17:15:30 +01:00 |
daniel
|
9771639318
|
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
pandora_console/extras/mr/68.sql
pandora_console/pandoradb.sql
|
2024-02-27 17:27:10 +01:00 |
alejandro.campos@artica.es
|
77dd8b1fb9
|
minor fixes
|
2024-02-22 15:07:18 +01:00 |
|
alejandro.campos@artica.es
|
195766e11c
|
minor fixes
|
2024-02-22 15:05:48 +01:00 |
|
alejandro.campos@artica.es
|
7773967c71
|
move mr
|
2024-02-21 10:11:37 +01:00 |
|
alejandro.campos@artica.es
|
1991b74b9b
|
Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query
|
2024-02-21 10:05:11 +01:00 |
|
alejandro.campos@artica.es
|
df7435132a
|
change regex search in events
|
2024-02-16 10:10:38 +01:00 |
|
alejandro.campos@artica.es
|
c7de5a1eba
|
search collapsing whitespaces
|
2024-02-13 18:28:20 +01:00 |
|
daniel
|
0f6fab06fb
|
new api 2.0
|
2024-02-12 09:49:44 +01:00 |
|
daniel
|
3c3ff1a2e6
|
new api 2.0
|
2024-01-30 16:27:02 +01:00 |
|
daniel
|
df1d2675ed
|
Merge remote-tracking branch 'origin' into ent-12019-api-2-0
|
2024-01-30 08:13:47 +01:00 |
|
daniel
|
7adf296b0f
|
new api 2.0
|
2024-01-29 16:37:49 +01:00 |
|
daniel
|
b3dd6cbb4c
|
new api 2.0
|
2024-01-29 16:09:08 +01:00 |
|
Alejandro Campos
|
618f677906
|
Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada'
# Conflicts:
# pandora_console/include/functions_events.php
# pandora_console/operation/events/events.php
|
2024-01-26 13:42:59 +00:00 |
|
Daniel Cebrian
|
538177c3e5
|
#12753 fixed vul command in ajax
|
2024-01-23 17:08:06 +01:00 |
Rafael Ameijeiras
|
f0d892c268
|
Merge branch 'ent-12601-16734-Filtros-de-tags-en-eventos-ignoran-criticidad-configurada-en-filtro' into 'develop'
fix tags filter
See merge request artica/pandorafms!6780
|
2024-01-18 11:34:02 +00:00 |
Matias Didier
|
fd0c2a3da6
|
Merge branch 'ent-12543-16631-paginado-de-la-vista-eventos-en-metaconsola-los-elementos-a-mostrar-son-erroneos' into 'develop'
Ent 12543 [#16631]Paginado de la vista eventos en metaconsola, los elementos a mostrar son erroneos
See merge request artica/pandorafms!6712
|
2024-01-18 08:36:34 +00:00 |
|
Daniel Cebrian
|
5fbf3fea7a
|
#12704 fixed filter in list events
|
2023-12-26 11:15:10 +01:00 |
|
daniel
|
88308da560
|
fix search events pandora_enterprise#12704
|
2023-12-22 13:43:13 +01:00 |
|
alejandro.campos@artica.es
|
47fd35c53f
|
fix tags filter
|
2023-12-15 10:48:10 +01:00 |
|
Rafael Ameijeiras
|
e71a104e74
|
Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop'
Draft: Ent 12566 Mejoras en visualización de eventos
See merge request artica/pandorafms!6735
|
2023-12-14 08:57:44 +00:00 |
|
Rafael Ameijeiras
|
dcdd3e139e
|
Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop'
Ent 12468 instrucciones se rompen en vista de eventos
See merge request artica/pandorafms!6711
|
2023-12-14 08:39:44 +00:00 |
|
alejandro.campos@artica.es
|
160514cfbe
|
fix filter bug
|
2023-12-13 10:08:13 +01:00 |
Daniel Maya
|
9dbac217c1
|
#12633 Fixed Acknowledged 2
|
2023-12-12 14:07:18 +01:00 |
|
Daniel Maya
|
90c91f67fa
|
#12633 Fixed Acknowledged
|
2023-12-12 12:45:13 +01:00 |
|
Daniel Cebrian
|
1a9bdf97d1
|
#12566 changes in view events
|
2023-12-11 17:01:40 +01:00 |
|
daniel
|
10515e88df
|
Merge remote-tracking branch 'origin/develop' into ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo
|
2023-12-05 12:37:17 +01:00 |
miguel angel rasteu
|
fb2e433b5c
|
#12175 Resolve conflicts
|
2023-12-01 10:00:51 +01:00 |
|
Daniel Cebrian
|
28820f4471
|
#12543 fixed pagination metaconsole
|
2023-11-29 11:04:48 +01:00 |
|
Daniel Maya
|
892048554e
|
#12468 Fixed instructions
|
2023-11-29 10:27:55 +01:00 |