Alejandro Fraguas
|
ee0eee06f6
|
Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop'
fixed visual error
See merge request artica/pandorafms!2779
|
2019-10-22 12:54:28 +02:00 |
|
marcos
|
ca49cefb0d
|
fixed
|
2019-10-22 12:19:25 +02:00 |
|
marcos
|
79a1a1b2a3
|
add wux.css
|
2019-10-22 10:23:53 +02:00 |
|
marcos
|
ee97ed8a5e
|
segunda ronda
|
2019-10-21 18:36:02 +02:00 |
|
Daniel Barbero
|
e37af1598a
|
continue feedback diagnostics
|
2019-10-21 18:11:04 +02:00 |
|
marcos
|
353246f9f6
|
first changed to welcome window
|
2019-10-18 10:30:19 +02:00 |
|
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +02:00 |
|
Alejandro Fraguas
|
be29f1dd55
|
Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop'
fixed minor error
See merge request artica/pandorafms!2782
|
2019-10-17 13:20:14 +02:00 |
|
Marcos Alconada
|
43d3f32d0c
|
Update help_feedback.css
|
2019-10-15 18:11:21 +02:00 |
|
Marcos Alconada
|
5a73b67545
|
Update help_feedback.css
|
2019-10-15 17:59:22 +02:00 |
|
marcos
|
a31e66a9bd
|
add feedback
|
2019-10-15 12:16:50 +02:00 |
|
manuel
|
a69cfb63f1
|
Fixed bug in histogram graph report
|
2019-10-11 09:04:13 +02:00 |
|
marcos.alconada
|
2938435988
|
fixed minor error
|
2019-10-03 17:46:26 +02:00 |
|
fbsanchez
|
79dca2fe6b
|
Php OO form load
|
2019-10-02 18:37:50 +02:00 |
|
marcos.alconada
|
2ea20c1605
|
fixed visual error
|
2019-10-02 14:42:51 +02:00 |
|
Daniel Barbero
|
d35a5d4f71
|
continue VC form create items
|
2019-09-27 15:44:39 +02:00 |
|
alejandro-campos
|
a5ea095734
|
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
|
2019-09-24 15:16:22 +02:00 |
|
Daniel Rodriguez
|
8e728eed6b
|
Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop'
changed style on tables pdf report
See merge request artica/pandorafms!2718
|
2019-09-24 12:33:46 +02:00 |
|
fbsanchez
|
7d52614064
|
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
|
2019-09-24 11:25:53 +02:00 |
|
Alejandro Campos
|
20cebbe988
|
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-23 17:16:15 +02:00 |
|
Tatiana Llorente
|
51a1d7c0b7
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-23 13:18:08 +02:00 |
|
Tatiana Llorente
|
f9a903319c
|
Adding tabs and new functions - #4644
|
2019-09-23 13:14:20 +02:00 |
|
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +02:00 |
|
alejandro-campos
|
be3de8dcfb
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-20 12:45:22 +02:00 |
|
alejandro-campos
|
0df2447770
|
added comment management and fixed some errors in incident edition
|
2019-09-20 12:37:47 +02:00 |
|
Tatiana Llorente
|
375bfca6ff
|
New view - Dashboard details of Integria IMS tickets - #4644
|
2019-09-20 12:27:36 +02:00 |
|
alejandro-campos
|
f2a6dbb60e
|
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
|
2019-09-17 14:56:54 +02:00 |
|
alejandro-campos
|
87f8badc18
|
completed integria setup and incident creation and update
|
2019-09-17 13:38:17 +02:00 |
|
Tatiana Llorente
|
027f9fd9d4
|
New view - List of Integria IMS tickets - #4642
|
2019-09-17 12:59:29 +02:00 |
|
marcos.alconada
|
b9b4230a6e
|
changed style on tables pdf report
|
2019-09-11 12:20:09 +02:00 |
|
Tatiana Llorente
|
8340a8a121
|
Merge branch 'develop' into 'ent-4572-Bugs-graficos-en-black-theme'
Conflicts:
pandora_console/include/styles/pandora_black.css
|
2019-09-10 10:34:47 +02:00 |
|
Tatiana Llorente
|
90b61533f8
|
Fixed visual bugs in black theme - #4572
|
2019-09-10 10:26:28 +02:00 |
|
fbsanchez
|
315d9728ec
|
quick fix short news titles
|
2019-09-05 10:54:14 +02:00 |
|
fbsanchez
|
9868462d43
|
Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha
|
2019-09-02 09:57:45 +02:00 |
|
Daniel Rodriguez
|
1ca7e03fa4
|
Merge branch 'ent-4523-fallos-en-black-theme' into 'develop'
Changed background-color in request new licence
See merge request artica/pandorafms!2673
|
2019-08-30 14:10:04 +02:00 |
|
marcos.alconada
|
a6037d8308
|
Changed background-color in request new licence
|
2019-08-21 09:27:55 +02:00 |
|
marcos.alconada
|
f2cf24cfb8
|
center content tables in pdf generator
|
2019-08-16 09:30:10 +02:00 |
|
marcos.alconada
|
61a1243213
|
center content tables in pdf generator
|
2019-08-16 09:29:40 +02:00 |
|
fbsanchez
|
adbb48ab87
|
pandora HA review
|
2019-08-10 02:13:01 +02:00 |
|
Alejandro Campos
|
12eacc1933
|
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-08-05 09:26:18 +02:00 |
|
marcos.alconada
|
6632efb068
|
se queda el boton de editar en la misma liniea y la i no queda por debajo de la linea intervalo
|
2019-07-31 16:19:59 +02:00 |
|
alejandro-campos
|
b4bd7f0f63
|
fixed problems in event view and event view custom fields
|
2019-07-30 16:10:34 +02:00 |
|
fbsanchez
|
6ac21acd39
|
wip agent deployment scan
|
2019-07-25 18:35:51 +02:00 |
|
fbsanchez
|
ce346bd604
|
agent deployment
|
2019-07-24 17:38:25 +02:00 |
|
fbsanchez
|
8d9c4682c7
|
WIP Agent repository
|
2019-07-17 20:37:13 +02:00 |
|
fbsanchez
|
17dc0b82ac
|
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
|
2019-07-17 17:19:58 +02:00 |
|
Daniel Rodriguez
|
c97074ea74
|
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
fixed macros reports
See merge request artica/pandorafms!2595
|
2019-07-17 13:49:38 +02:00 |
|
Daniel Rodriguez
|
ab7743b578
|
Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop'
Changed disabled to readonly in agent name and id- #4307
See merge request artica/pandorafms!2578
|
2019-07-16 11:52:12 +02:00 |
|
Daniel Rodriguez
|
304301a54a
|
Merge branch 'ent-4283-Elementos-superpuestos' into 'develop'
Fixed minor style bug in pagination events - #4283
See merge request artica/pandorafms!2569
|
2019-07-16 11:51:41 +02:00 |
|
fbsanchez
|
3bbd01026e
|
WIP agent deployment
|
2019-07-15 19:37:04 +02:00 |
|