a69cfb63f1
Fixed bug in histogram graph report
2019-10-11 09:04:13 +02:00
2938435988
fixed minor error
2019-10-03 17:46:26 +02:00
79dca2fe6b
Php OO form load
2019-10-02 18:37:50 +02:00
2ea20c1605
fixed visual error
2019-10-02 14:42:51 +02:00
d35a5d4f71
continue VC form create items
2019-09-27 15:44:39 +02:00
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
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
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
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
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
f9a903319c
Adding tabs and new functions - #4644
2019-09-23 13:14:20 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
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
0df2447770
added comment management and fixed some errors in incident edition
2019-09-20 12:37:47 +02:00
375bfca6ff
New view - Dashboard details of Integria IMS tickets - #4644
2019-09-20 12:27:36 +02:00
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
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
027f9fd9d4
New view - List of Integria IMS tickets - #4642
2019-09-17 12:59:29 +02:00
b9b4230a6e
changed style on tables pdf report
2019-09-11 12:20:09 +02:00
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
90b61533f8
Fixed visual bugs in black theme - #4572
2019-09-10 10:26:28 +02:00
315d9728ec
quick fix short news titles
2019-09-05 10:54:14 +02:00
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
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
a6037d8308
Changed background-color in request new licence
2019-08-21 09:27:55 +02:00
f2cf24cfb8
center content tables in pdf generator
2019-08-16 09:30:10 +02:00
61a1243213
center content tables in pdf generator
2019-08-16 09:29:40 +02:00
adbb48ab87
pandora HA review
2019-08-10 02:13:01 +02:00
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
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
b4bd7f0f63
fixed problems in event view and event view custom fields
2019-07-30 16:10:34 +02:00
6ac21acd39
wip agent deployment scan
2019-07-25 18:35:51 +02:00
ce346bd604
agent deployment
2019-07-24 17:38:25 +02:00
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
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
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
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
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
5498e1df3c
Merge branch 'ent-4038-warning-php-vodat' into 'develop'
...
Fixed wrong img paths
See merge request artica/pandorafms!2551
2019-07-15 14:51:23 +02:00
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
9fb32c4699
Deployment area single targets
2019-07-12 18:29:58 +02:00
91f55c326e
Merge branch 'ent-4351-Modificar-imagenes-con-bordes-blancos-para-que-sean-transparentes' into 'develop'
...
Changed images with transparent borders - #4351
See merge request artica/pandorafms!2597
2019-07-12 13:24:44 +02:00
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
fca4a288a2
Changed gray image in discovery - #4351
2019-07-12 10:23:20 +02:00
cac34e3311
Changed gray image in discovery - #4351
2019-07-12 10:21:54 +02:00
5fd7b87a06
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-11 18:27:49 +02:00
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
ac3de84bda
Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop'
...
Added success and error messages when change the event owner - #4309
See merge request artica/pandorafms!2590
2019-07-11 11:36:03 +02:00
47cc0d9d6e
WIP: Agent deployment center
2019-07-10 23:59:09 +02:00
96fbca35a4
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
...
Created black theme - #4194
See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
7fd284f105
Fixed visual bugs in green and black theme - #4194
2019-07-09 17:36:40 +02:00
6af6aa179b
Changed background in update manager offline - #4194
2019-07-09 16:45:00 +02:00
084d1a229e
Added success and error messages when change the event owner - #4309
2019-07-09 16:41:00 +02:00
eaf29b798a
Fixed minor visual bugs in black theme- #4194
2019-07-09 15:03:38 +02:00
b6d551d583
Changed images with white background - #4194
2019-07-08 10:08:04 +02:00
745ab711de
Created green theme - #4194
2019-07-05 14:02:59 +02:00
d1bc6cc2ff
Created green theme - #4194
2019-07-05 13:59:48 +02:00
de6a0c2192
Changed disabled to readonly in agent name and id- #4307
2019-07-04 16:20:01 +02:00
89d00115e2
Fixed minor style bug in pagination events - #4283
2019-07-02 17:45:25 +02:00
dd8fc659ee
Created green theme - #4194
2019-07-02 15:15:19 +02:00
beace34567
Created black theme - #4194
2019-07-02 13:12:05 +02:00
1aa0131a81
Merge branch 'develop' into 'ent-4195-Status-sets-Visual'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-07-02 11:42:19 +02:00
9163f725ed
Created black theme - #4194
2019-07-01 16:57:33 +02:00
8ec2ec9d0d
Merge branch 'ent-4112-Bug-visual-cuadro-de-datos-tipo-string' into 'develop'
...
Truncate long title in modal dialogs - #4112
See merge request artica/pandorafms!2508
2019-07-01 10:36:24 +02:00
c28185965a
Merge remote-tracking branch 'origin/develop' into ent-4112-Bug-visual-cuadro-de-datos-tipo-string
...
Conflicts:
pandora_console/include/styles/js/jquery-ui_custom.css
2019-06-28 12:28:13 +02:00
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
1ffb435d5a
Fixed wrong img paths
2019-06-27 09:48:37 +02:00
cda9cd6fe1
Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop'
...
Changed size for modal window for module graph- #4234
See merge request artica/pandorafms!2536
2019-06-26 13:43:57 +02:00
4136f19190
Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
...
Visual Console's movement and redimension mode
See merge request artica/pandorafms!2527
2019-06-26 13:06:02 +02:00
6976ba9c8e
Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop'
...
Ent 3800 mal enrutamiento discovery
See merge request artica/pandorafms!2350
2019-06-26 12:02:43 +02:00
7224974520
Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop'
...
first steps credential store
See merge request artica/pandorafms!2523
2019-06-26 11:21:49 +02:00
f66e5b5ef8
Fix class names to avoid addblock hide them
2019-06-26 11:11:21 +02:00
4754e20784
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-26 09:52:22 +02:00
01514ba5b6
Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'
...
Ent 3699 descuadre visual recuperar password
See merge request artica/pandorafms!2336
2019-06-25 14:26:57 +02:00
ea9540ddce
Changed size for modal window for module graph- #4234
2019-06-25 09:19:47 +02:00
882aa67b3a
aws multi account viewer rc1
2019-06-24 20:35:24 +02:00
b6f10f89d0
Fixed missing styles
2019-06-24 17:57:45 +02:00
43b83af2c6
Changed default images status set for css - #4195
2019-06-24 11:59:17 +02:00
d9fee539a8
Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
...
# Conflicts:
# pandora_console/include/visual-console-client/vc.main.css
2019-06-24 10:31:53 +02:00
38f72bed8d
AWS multi account
2019-06-22 13:11:35 +02:00
c11cd556ce
WIP: AWS CS controller
2019-06-22 01:10:05 +02:00
5658b98f0b
intuitive credential store
2019-06-21 23:51:22 +02:00
e9ef9b64a3
credential_store
2019-06-21 19:34:47 +02:00
8f5a206027
Fixed vc-control in public visual console
2019-06-21 13:17:37 +02:00
379a0039ae
Fixed vc-control
2019-06-21 12:41:05 +02:00
c3ebe88178
style review
2019-06-18 17:40:31 +02:00
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
d290b91b28
RC1 event viewer v2
2019-06-18 16:07:53 +02:00
22272225b8
massive operations over events
2019-06-18 14:26:55 +02:00
823581f398
export current page to csv fixed icon
2019-06-18 12:58:46 +02:00
d8a331bf77
event filters tags, date, module name
2019-06-18 12:48:28 +02:00
ab7d72a1c9
wip event vwr ui-box close tick
2019-06-17 17:02:33 +02:00
a583da3de3
Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop'
...
Añadir el modo de edición a la vista de la consola visual
Closes pandora_enterprise#3981
See merge request artica/pandorafms!2482
2019-06-17 15:07:12 +02:00
92dc7d4e8c
Truncate long title in modal dialogs - #4112
2019-06-14 13:48:35 +02:00
7226a45df5
improved ui_progress now accepts ajax updates
2019-06-14 10:35:10 +02:00
b08e8b595d
multiple fixes
2019-06-13 19:41:21 +02:00
f3a0f37a1c
Events agent grouped
2019-06-12 18:19:39 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
cb6d71b930
Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
...
Ent 3474 exportar a csv custom field view
See merge request artica/pandorafms!2483
2019-06-11 17:06:14 +02:00
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
ef3d299d58
wip event view
2019-06-10 15:18:35 +02:00
f67bf8c2b7
wip event list filters
2019-06-07 22:44:02 +02:00
d4d4509266
wip event view
2019-06-07 21:22:07 +02:00
419a90d69c
wip event list
2019-06-07 17:35:13 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
2d84081ca7
Add styles for metaconsole - #3614
2019-06-06 12:09:35 +02:00
5b2eb8891b
tab moved
2019-06-04 22:43:26 +02:00
6ed2a0636e
styles review
2019-06-04 22:34:17 +02:00
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
1a8b09229c
Export csv from custom field view meta - #3474
2019-06-04 17:28:55 +02:00
795542b311
Added a mode to enable the edit mode of the visual console client items
2019-06-04 17:21:54 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
cb1fb19b95
style review
2019-06-03 19:19:18 +02:00
974db824a8
style review
2019-06-03 19:13:29 +02:00
31257c02a4
style review
2019-06-03 14:50:22 +02:00
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
69054571ab
Style review
2019-05-31 09:50:59 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
e37d120115
Review 1
2019-05-30 13:58:57 +02:00
44803b6403
Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
445cc8aab0
New styles for Services table view - #3614
2019-05-30 10:58:59 +02:00
48094ffb2e
greater icons
2019-05-29 18:24:45 +02:00
c2346842c9
ui_toggle revierw
2019-05-29 18:13:21 +02:00
121ae89b1d
dyn style ui_print_help_tip
2019-05-29 17:34:11 +02:00
53f6649a57
tip img sty
2019-05-29 16:49:51 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
4f27ae1021
minor style fix
2019-05-29 15:25:35 +02:00
f58d1bc6ee
Styling review
2019-05-29 15:14:13 +02:00
72999244c2
pandora_console/operation/agentes/estado_generalagente.php
2019-05-29 13:13:01 +02:00
505229abe4
minor style change - box
2019-05-29 13:03:58 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
ca083556c3
minor alignment select-multiple
2019-05-29 12:23:54 +02:00
37af0ad612
Styles
2019-05-29 12:06:05 +02:00
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
d64e2cfb8c
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 18:05:33 +02:00
58a0ef1bf7
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 18:03:55 +02:00
70469c4909
Event list agent view
2019-05-28 18:03:01 +02:00
e993dcc3a5
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 17:37:20 +02:00
445db7c43b
module list agent view
2019-05-28 16:20:24 +02:00
d68bb176cf
Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
2cd19aa0cb
updates styles
2019-05-28 10:47:31 +02:00
bdd7cc1317
Flex agent view
2019-05-28 09:48:09 +02:00
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
f0fb6d7fd9
wip styles
2019-05-27 18:03:56 +02:00
2fd37b531e
Visual changes in module graph - #4104
2019-05-27 17:37:57 +02:00
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
0280547465
some changes
2019-05-27 15:41:23 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
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
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +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
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +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
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
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
5e0b53e3c2
New menu module graph - #3617
2019-05-08 09:35:28 +02:00
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +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
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
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +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
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
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
45c9f6d51c
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
5998b30a16
Added css hint to discovery tasks when task list is empty
...
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
2019-04-10 17:30:35 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
3da2f267a2
New design for the tables - #3707
...
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
9df4cb86dc
Added inline-block and fixed size to label
...
Former-commit-id: 40c1ca6d5c06fb771eb7e8d1ac81dde6e7012cfb
2019-04-04 09:45:29 +02:00
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
c682e5f326
Remove new font in edit user
...
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
a841472bff
Changes in header
...
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
af9936c78f
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/install.php
Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
6fb6963501
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
5d409cd778
New view user edit
...
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
d27c509817
Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
...
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
2019-03-20 13:28:07 +01:00
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
c2033715a9
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af
2019-03-18 09:06:20 +01:00
d13e7bbf44
new generic functions
...
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
f4290e52fe
Minor fix notif. ball margins
...
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
29f00dd1da
New login page
...
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
a321a7465d
Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/functions_netflow.php
pandora_console/operation/network/network_report.php
Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668
2019-03-11 13:19:17 +01:00
71afb7a741
New login page
...
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
dd8265f65e
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
471770ec85
Reduced icon size on netflow explorer
...
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
2019-03-07 19:16:24 +01:00
3e39e727b6
WIP: Unified class NetworkMapClass
...
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
1f89cccbbe
Change item link filter by image filter in network/flow explorer
...
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
aef10cf649
Fixed grown in notifications
...
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
2019-03-06 19:39:07 +01:00
40bc938000
notifications font color and some minor changes
...
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
2019-03-06 16:38:06 +01:00
825128e31e
WIP: minor updates in notification wrapper
...
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
63ee3b0329
wip: style checks
...
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
70e4e86cdf
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
...
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
e26c81aa6c
Fixed images and reset map in networkmap
...
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
a01319464e
Added link with params html component and modify the network report
...
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
3e87c8e931
new header and menu
...
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
6ec148c59c
new header and menu
...
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
2019-02-25 12:28:41 +01:00
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
8b5f50f883
Discovery minor fixes
...
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
4148387c50
Updates discovery
...
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
ad3e2b88bf
Minor fixes Wiz.Discovery
...
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
manuel
marcos.alconada
fbsanchez
Daniel Barbero
alejandro-campos
Daniel Rodriguez
Tatiana Llorente
Alejandro Fraguas
Luis Calvo
Alejandro Gallardo Escobar
Daniel Maya
fermin831