Daniel Barbero Martin
|
25f879df00
|
add step 3
|
2019-11-12 18:45:20 +01:00 |
|
Daniel Barbero Martin
|
02677849ce
|
add new css
|
2019-11-12 13:17:00 +01:00 |
|
Daniel Barbero Martin
|
9d3c9febad
|
Add alert correlation wizard
|
2019-11-12 13:16:25 +01:00 |
|
Daniel Barbero Martin
|
0213bc675e
|
add changes bbdd
|
2019-11-08 11:28:37 +01:00 |
|
Daniel Barbero Martin
|
deb2657353
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-08 11:14:51 +01:00 |
fbsanchez
|
ec2d46c299
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
|
2019-11-08 11:09:11 +01:00 |
|
fbsanchez
|
ec72820c88
|
Icon adjustment
|
2019-11-08 11:08:43 +01:00 |
artica
|
c8b39740a9
|
Auto-updated build strings.
|
2019-11-08 11:05:59 +01:00 |
Alejandro Fraguas
|
fad8d88087
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
change execution permissions to pandora_websocket_engine rpm|deb files
See merge request artica/pandorafms!2870
|
2019-11-08 11:00:46 +01:00 |
|
fbsanchez
|
6543756baf
|
change execution permissions to pandora_websocket_engine rpm|deb files
|
2019-11-08 09:49:09 +01:00 |
|
fbsanchez
|
cf0a06f216
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 19:41:36 +01:00 |
|
fbsanchez
|
36ae77a33c
|
minor fix
|
2019-11-07 19:41:23 +01:00 |
|
fbsanchez
|
a8bdb68cac
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 19:40:23 +01:00 |
|
fbsanchez
|
4905b18888
|
Fulfill help path and mail check
|
2019-11-07 19:39:50 +01:00 |
|
fbsanchez
|
9387f59979
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:39:06 +01:00 |
|
fbsanchez
|
424aa10555
|
style minor changes
|
2019-11-07 18:38:52 +01:00 |
|
fbsanchez
|
c4779f6f91
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:33:51 +01:00 |
|
fbsanchez
|
307eabc7b9
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 18:33:37 +01:00 |
|
fbsanchez
|
cb131c7895
|
Some CDE and styling in help feedback
|
2019-11-07 18:33:03 +01:00 |
|
fbsanchez
|
763ec6772c
|
Help feedback style improved
|
2019-11-07 17:26:32 +01:00 |
|
Alejandro Fraguas
|
adc0f24f8e
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
|
2019-11-07 15:48:12 +01:00 |
|
fbsanchez
|
778f49c100
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-07 14:20:44 +01:00 |
|
fbsanchez
|
ab6e790b4e
|
minor-fix qs_admin interface
|
2019-11-07 14:20:29 +01:00 |
|
fbsanchez
|
ef14de075e
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 14:06:07 +01:00 |
|
fbsanchez
|
5fe515a3ed
|
Fixed welcome flow
|
2019-11-07 14:05:42 +01:00 |
|
fbsanchez
|
664017aa38
|
same, null is overwritten by ws.php
|
2019-11-07 13:11:11 +01:00 |
|
fbsanchez
|
f95ecb0f28
|
Allow empty configuration for gotty path
|
2019-11-07 13:00:38 +01:00 |
Daniel Rodriguez
|
2fe5cb3d84
|
Merge branch 'ent-4937-Quitar-caja-de-Agent-info-si-no-hay-datos-en-ella' into 'develop'
Ent 4937 quitar caja de agent info si no hay datos en ella
See merge request artica/pandorafms!2868
|
2019-11-07 12:09:59 +01:00 |
|
Daniel Rodriguez
|
a550f2d9d3
|
Merge branch 'ent-4403-8401-acanovas-ipam-creacion-de-superredes' into 'develop'
added function to convert cidr prefixes to mask
See merge request artica/pandorafms!2832
|
2019-11-07 11:47:24 +01:00 |
|
fbsanchez
|
c49f94fdb5
|
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-07 10:54:20 +01:00 |
|
fbsanchez
|
f497312d29
|
minor fix. default values QS admin page
|
2019-11-07 10:54:05 +01:00 |
|
fbsanchez
|
7c68595241
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 10:43:24 +01:00 |
|
fbsanchez
|
6e637954b8
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 10:43:15 +01:00 |
|
fbsanchez
|
d080f1d6a7
|
Welcome pack
|
2019-11-07 10:42:46 +01:00 |
Tatiana Llorente
|
90912e2636
|
Hide agent info when only GIS data is displayed and it is empty
|
2019-11-07 09:52:06 +01:00 |
|
Daniel Rodriguez
|
1006c54687
|
Merge branch 'ent-4928-Bug-generacion-PDF-con-set-initial-date' into 'develop'
Ent 4928 bug generacion pdf con set initial date
See merge request artica/pandorafms!2866
|
2019-11-07 09:48:42 +01:00 |
|
fbsanchez
|
79d165b164
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-06 20:01:28 +01:00 |
|
Daniel Rodriguez
|
76d9ca9db5
|
Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop'
Ent 4853 set module data no funciona api
See merge request artica/pandorafms!2841
|
2019-11-06 17:19:51 +01:00 |
|
Daniel Rodriguez
|
e81932cf0d
|
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
|
2019-11-06 16:23:51 +01:00 |
|
Daniel Rodriguez
|
0647b156a5
|
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
fix bug in user list permission checks
See merge request artica/pandorafms!2865
|
2019-11-06 16:06:49 +01:00 |
|
fbsanchez
|
ddd370f7c5
|
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-06 15:37:45 +01:00 |
|
fbsanchez
|
98237a8d34
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/general/header.php
|
2019-11-06 15:36:53 +01:00 |
|
Daniel Rodriguez
|
34bfb762fd
|
Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop'
Ent 4857 bug color pagina eventos
See merge request artica/pandorafms!2834
|
2019-11-06 15:27:48 +01:00 |
|
Daniel Rodriguez
|
137571f2d1
|
Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
user ack filter in event list not displaying users with all group
See merge request artica/pandorafms!2860
|
2019-11-06 14:45:09 +01:00 |
|
Daniel Rodriguez
|
d460429509
|
Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
Fixed agent name and error lenght
See merge request artica/pandorafms!2845
|
2019-11-06 13:14:06 +01:00 |
alejandro-campos
|
e9b516c399
|
change access permission to users in user ack filter in event list
|
2019-11-06 12:56:42 +01:00 |
|
Alejandro Fraguas
|
37ffff12eb
|
Merge branch '4727-macros-grupos-secundarios' into 'develop'
4727 macros grupos secundarios
See merge request artica/pandorafms!2811
|
2019-11-06 12:20:39 +01:00 |
|
Daniel Rodriguez
|
5a34ec51d2
|
Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop'
Added recursion to api_get_all_agents
See merge request artica/pandorafms!2753
|
2019-11-06 10:38:17 +01:00 |
|
Tatiana Llorente
|
1a34e488b6
|
Fixed bug in report date in pdf reports
|
2019-11-06 10:34:08 +01:00 |
manuel
|
a486738920
|
Fixed visual styles ticket 4809
|
2019-11-06 10:31:26 +01:00 |