Commit Graph

1540 Commits

Author SHA1 Message Date
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
vgilc 2447514c41 Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop'
Fix visual problems with agent details

See merge request artica/pandorafms!2625
2020-01-23 10:11:35 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Daniel Barbero Martin 4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
Daniel Barbero 7e4cb02ceb fixed styles and more 2020-01-09 18:05:21 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Rodriguez d16ecc54b6 Merge branch '5148-Tabs-vista-eventos' into 'develop'
Changed to 2px active tab

Closes pandora_enterprise#5148

See merge request artica/pandorafms!2959
2020-01-07 11:46:18 +01:00
Daniel Rodriguez 456fbc096e Merge branch 'ent-4572-Bugs-graficos-en-black-theme' into 'develop'
Fixed visual bugs in black theme - #4572

See merge request artica/pandorafms!2713
2020-01-07 09:43:45 +01:00
Daniel Barbero Martin 5e008e684d Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-02 17:45:52 +01:00
Jose Gonzalez 6422e34782 Modified General tab in META events 2020-01-02 12:50:35 +01:00
Alejandro Fraguas ebe6e1109c Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop'
Ent 4467 barra de busqueda como interprete de ordenes

See merge request artica/pandorafms!2934
2019-12-26 11:10:53 +01:00
Alejandro Fraguas 9d318a8612 Merge branch '5144-IE-Edge-Login-Background' into 'develop'
Added control for MS Edge and Internet Explorer browsers for disallow linear gradient

See merge request artica/pandorafms!2967
2019-12-23 17:13:42 +01:00
Alejandro Fraguas ecb190910b Merge branch '3812-Pantalla-Instalacion-DB-Demos' into 'develop'
Added images and CSS file for new demo installation screen

See merge request artica/pandorafms!2965
2019-12-23 11:27:55 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero a6dfdb796a Fixed errors Form VC 2019-12-19 20:47:52 +01:00
marcos 43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
Daniel Barbero 49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
Daniel Barbero d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
Luis Calvo b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Jose Gonzalez d8f232d814 Added control for MS Edge and Internet Explorer browsers for disallow linear gradient 2019-12-16 16:39:13 +01:00
Jose Gonzalez c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +01:00
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
marcos 480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Jose Gonzalez 6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
marcos 1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
alejandro-campos 7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +01:00
Daniel Rodriguez 01db6dd3b2 Merge branch 'ent-5094-selector-fechas-informes-html' into 'develop'
Added margin to date selector elements in reporting viewer

See merge request artica/pandorafms!2945
2019-12-12 09:10:35 +01:00
marcos 8ca473b2a7 ajust search input 2019-12-11 18:42:46 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
vgilc 325eff607e Merge branch 'ent-3903-Dashboard-mostrar-leyenda-en-mapa-de-servicio' into 'develop'
changes in service map widget: always show legend and fix visual problem

See merge request artica/pandorafms!2889
2019-12-10 11:53:37 +01:00
Luis Calvo a184b50eb2 Added margin to date selector elements in reporting viewer 2019-12-05 18:55:15 +01:00
marcos 1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos 1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos 7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Daniel Barbero 867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
Daniel Barbero f24034e729 Add styles Rules 2019-11-25 09:09:59 +01:00
fbsanchez ae5d7b8944 minor style fix rulebuilder 2019-11-23 13:20:19 +01:00
fbsanchez 9bfe3f3152 minor style fix rulebuilder 2019-11-23 13:16:30 +01:00
fbsanchez d3b5e7a2b0 minor style fix rulebuilder 2019-11-23 13:13:24 +01:00
fbsanchez 2f0b2c1766 minor fix css 2019-11-23 13:06:58 +01:00
fbsanchez 64e481187f RuleBuilder Style updates 2019-11-23 12:48:47 +01:00
fbsanchez 8001ba0d41 minor fix 2019-11-22 15:37:32 +01:00
Daniel Barbero d6ce54cddf fixed errors Alert correlation 2019-11-22 15:26:30 +01:00
Daniel Barbero 4caf84da25 WIP alert correlations 2019-11-22 10:24:12 +01:00
Daniel Barbero 66035a8b67 fixed errors css 2019-11-21 15:27:47 +01:00
Daniel Barbero Martin cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +01:00
fbsanchez 443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez 46c42ef8a4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:52:26 +01:00
fbsanchez 84c6640032 minor style fix 2019-11-15 16:51:53 +01:00
fbsanchez 9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez 547e0c4364 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-14 20:58:16 +01:00
fbsanchez 546b8dc448 omnishell minor changes 2019-11-14 20:55:55 +01:00
fbsanchez 0d3817d64d dynamic toggle in wizard input printForm 2019-11-14 17:45:45 +01:00
alejandro-campos 994b3a9bff changes in service map widget: always show legend and fix visual problem 2019-11-14 15:21:24 +01:00
Daniel Barbero Martin c17acefc49 Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
Conflicts:
	pandora_console/extras/mr/33.sql
2019-11-14 12:22:11 +01:00
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-13 18:15:19 +01:00
fbsanchez 78443a029d Omnishell rc1 2019-11-13 18:10:16 +01:00
fbsanchez 0e2a3d0f47 minor style fix after feedback cleanup 2019-11-13 17:42:14 +01:00
fbsanchez 65d02d4529 Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms 2019-11-13 17:40:45 +01:00
fbsanchez 345eb48fd7 save the green lines 2019-11-13 17:38:48 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 670df456f5 wip results omnishell 2019-11-13 16:39:24 +01:00
fbsanchez 672ce6db22 first task omnishell and minor style checks 2019-11-13 15:24:44 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
add feedback

See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
Daniel Barbero Martin 5f8ec8f89c fixed errors 2019-11-13 13:29:09 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
	pandora_console/general/header.php
2019-11-13 12:20:29 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
Daniel Barbero Martin 28c9718c26 WIP alerts-log 2019-11-13 12:07:23 +01:00
fbsanchez d1fbd36a97 WIP omnishell 2019-11-12 19:31:38 +01:00
Daniel Barbero Martin 25f879df00 add step 3 2019-11-12 18:45:20 +01:00
Tatiana Llorente 484ec9ea60 Ent 4845 revision de skins 2019-11-12 18:10:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
2019-11-12 14:17:45 +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
marcos ec05b52fb4 update omnishell.css 2019-11-12 10:08:35 +01:00
fbsanchez 1637b09b1e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:23:35 +01:00
fbsanchez 946ef2fae4 icon review tick badge 2019-11-11 15:23:23 +01:00
Daniel Barbero Martin c78e3f4184 fixed minor error 2019-11-08 08:55:58 +01:00
fbsanchez d9d8cbfd35 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-07 19:43:18 +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 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +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 d080f1d6a7 Welcome pack 2019-11-07 10:42:46 +01:00
Daniel Barbero Martin b18878148c change load modal 2019-11-07 09:38:52 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Daniel Barbero Martin e5f24ca884 Merge develop 2019-11-05 15:27:06 +01:00
fbsanchez ed6dd2983f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js
2019-11-05 15:21:21 +01:00
Daniel Barbero Martin ebb7cbfe6c Fix styles css 2019-11-05 15:12:24 +01:00
fbsanchez 3eb0a6bb95 minor fixes after internal meeting 2019-10-30 18:33:33 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
marcos 334cea472e add method ui_progress_extend(work in progress) 2019-10-30 14:47:28 +01:00
marcos bb7ba67dab changes in omnishell.css 2019-10-29 17:49:04 +01:00
Daniel Barbero Martin 2bb81a839a Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/menu.php
	pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
fbsanchez c07baa614f Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF 2019-10-29 17:00:57 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
# Conflicts:
#   pandora_console/include/functions_ui.php
2019-10-29 17:00:39 +01:00
marcos 487da50d31 add omnishell.css 2019-10-29 16:56:11 +01:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
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
Alejandro Fraguas 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
Daniel Barbero Martin 2f110b8e2e Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports 2019-07-15 11:37:02 +02:00
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
Daniel Rodriguez 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
Daniel Barbero ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +02:00
Tatiana Llorente fca4a288a2 Changed gray image in discovery - #4351 2019-07-12 10:23:20 +02:00
Tatiana Llorente cac34e3311 Changed gray image in discovery - #4351 2019-07-12 10:21:54 +02:00
fbsanchez 5fd7b87a06 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 18:27:49 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
Daniel Rodriguez 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
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
Daniel Rodriguez 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
Tatiana Llorente 7fd284f105 Fixed visual bugs in green and black theme - #4194 2019-07-09 17:36:40 +02:00
Tatiana Llorente 6af6aa179b Changed background in update manager offline - #4194 2019-07-09 16:45:00 +02:00
Tatiana Llorente 084d1a229e Added success and error messages when change the event owner - #4309 2019-07-09 16:41:00 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Tatiana Llorente b6d551d583 Changed images with white background - #4194 2019-07-08 10:08:04 +02:00
Tatiana Llorente 745ab711de Created green theme - #4194 2019-07-05 14:02:59 +02:00
Tatiana Llorente d1bc6cc2ff Created green theme - #4194 2019-07-05 13:59:48 +02:00
Tatiana Llorente de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Tatiana Llorente 89d00115e2 Fixed minor style bug in pagination events - #4283 2019-07-02 17:45:25 +02:00
Tatiana Llorente dd8fc659ee Created green theme - #4194 2019-07-02 15:15:19 +02:00
Tatiana Llorente beace34567 Created black theme - #4194 2019-07-02 13:12:05 +02:00
Tatiana Llorente 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
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +02:00
Alejandro Fraguas 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
Tatiana Llorente 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
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
Luis Calvo 1ffb435d5a Fixed wrong img paths 2019-06-27 09:48:37 +02:00
Alejandro Fraguas 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
Daniel Rodriguez 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
Daniel Rodriguez 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
Alejandro Fraguas 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
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Daniel Rodriguez 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
Tatiana Llorente ea9540ddce Changed size for modal window for module graph- #4234 2019-06-25 09:19:47 +02:00
fbsanchez 882aa67b3a aws multi account viewer rc1 2019-06-24 20:35:24 +02:00
Alejandro Gallardo Escobar b6f10f89d0 Fixed missing styles 2019-06-24 17:57:45 +02:00
Tatiana Llorente 43b83af2c6 Changed default images status set for css - #4195 2019-06-24 11:59:17 +02:00
Alejandro Gallardo Escobar 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
fbsanchez 38f72bed8d AWS multi account 2019-06-22 13:11:35 +02:00
fbsanchez c11cd556ce WIP: AWS CS controller 2019-06-22 01:10:05 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
Daniel Maya 8f5a206027 Fixed vc-control in public visual console 2019-06-21 13:17:37 +02:00
Daniel Maya 379a0039ae Fixed vc-control 2019-06-21 12:41:05 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Daniel Rodriguez 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
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez 823581f398 export current page to csv fixed icon 2019-06-18 12:58:46 +02:00
fbsanchez d8a331bf77 event filters tags, date, module name 2019-06-18 12:48:28 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
Daniel Rodriguez 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
Tatiana Llorente 92dc7d4e8c Truncate long title in modal dialogs - #4112 2019-06-14 13:48:35 +02:00
fbsanchez 7226a45df5 improved ui_progress now accepts ajax updates 2019-06-14 10:35:10 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
Tatiana Llorente 31905f005a Visual changes in Agent/Module View - #3739 2019-06-11 17:34:13 +02:00
Alejandro Fraguas 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
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 2d84081ca7 Add styles for metaconsole - #3614 2019-06-06 12:09:35 +02:00
fbsanchez 5b2eb8891b tab moved 2019-06-04 22:43:26 +02:00
fbsanchez 6ed2a0636e styles review 2019-06-04 22:34:17 +02:00
fbsanchez a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
Tatiana Llorente 1a8b09229c Export csv from custom field view meta - #3474 2019-06-04 17:28:55 +02:00
Alejandro Gallardo Escobar 795542b311 Added a mode to enable the edit mode of the visual console client items 2019-06-04 17:21:54 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez cb1fb19b95 style review 2019-06-03 19:19:18 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
fbsanchez 31257c02a4 style review 2019-06-03 14:50:22 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
fbsanchez e37d120115 Review 1 2019-05-30 13:58:57 +02:00
Tatiana Llorente 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
Tatiana Llorente 445cc8aab0 New styles for Services table view - #3614 2019-05-30 10:58:59 +02:00
fbsanchez 48094ffb2e greater icons 2019-05-29 18:24:45 +02:00
fbsanchez c2346842c9 ui_toggle revierw 2019-05-29 18:13:21 +02:00
fbsanchez 121ae89b1d dyn style ui_print_help_tip 2019-05-29 17:34:11 +02:00
fbsanchez 53f6649a57 tip img sty 2019-05-29 16:49:51 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
fbsanchez 4f27ae1021 minor style fix 2019-05-29 15:25:35 +02:00
fbsanchez f58d1bc6ee Styling review 2019-05-29 15:14:13 +02:00
fbsanchez 72999244c2 pandora_console/operation/agentes/estado_generalagente.php 2019-05-29 13:13:01 +02:00
fbsanchez 505229abe4 minor style change - box 2019-05-29 13:03:58 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez ca083556c3 minor alignment select-multiple 2019-05-29 12:23:54 +02:00
fbsanchez 37af0ad612 Styles 2019-05-29 12:06:05 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
fbsanchez d64e2cfb8c Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 18:05:33 +02:00
Luis Calvo 58a0ef1bf7 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 18:03:55 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
Tatiana Llorente 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
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
fbsanchez 2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez 7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
Daniel Rodriguez 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
Alejandro Fraguas 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
fbsanchez 77fc1abe89 minor style updates and fixes in safe-output 2019-05-20 18:16:21 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
fbsanchez d871b599ef General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
fbsanchez 6ca07c0914 Merge remote-tracking branch 'origin/develop' into 1668-update-manager
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
2019-05-13 17:58:35 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +02:00
Luis Calvo 8c1c337522 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
Tatiana Llorente 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
Tatiana Llorente 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
Tatiana Llorente f5114918b5 Unify the styles of Discovery with Pandora - #4004 2019-05-09 08:45:55 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Tatiana Llorente 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
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
Alejandro Fraguas 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
alejandro-campos 4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
fbsanchez 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
Tatiana Llorente 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
Tatiana Llorente ed3155c053 New View Create/Update Agent - #3611
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Alejandro Fraguas 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
Tatiana Llorente 83cda70e0a Fixed styles of tables within tables with new class - #3707
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
Tatiana Llorente cfff9c065d New View Create/Update Agent - #3611
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
fbsanchez 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
Daniel Barbero Martin 26d5060232 fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
Tatiana Llorente 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
Tatiana Llorente 187bdb1701 New design for the tables - #3707
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
Luis Calvo 5998b30a16 Added css hint to discovery tasks when task list is empty
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
2019-04-10 17:30:35 +02:00
Tatiana Llorente 2a37224653 New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Tatiana Llorente 3da2f267a2 New design for the tables - #3707
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Luis Calvo 9df4cb86dc Added inline-block and fixed size to label
Former-commit-id: 40c1ca6d5c06fb771eb7e8d1ac81dde6e7012cfb
2019-04-04 09:45:29 +02:00
fbsanchez 798a2aad16 WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
Tatiana Llorente 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
Tatiana Llorente 26451c41a1 New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
Tatiana Llorente 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
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
fermin831 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
fbsanchez ba0ddfb826 style revission
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
fermin831 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
fbsanchez 4031ae9bf7 minor update in notification viewer
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
fbsanchez 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
Daniel Rodriguez 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
Tatiana Llorente c682e5f326 Remove new font in edit user
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
Tatiana Llorente a841472bff Changes in header
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
Tatiana Llorente fe7103ba9c Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
fermin831 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
fermin831 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
fbsanchez 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
Tatiana Llorente 5d409cd778 New view user edit
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +01:00
Tatiana Llorente 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
Tatiana Llorente a99c8b1a7b New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
Daniel Maya 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
Daniel Maya d13e7bbf44 new generic functions
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
Daniel Barbero d5108efb0d fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero Martin a1aa480421 add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
fermin831 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
fbsanchez f4290e52fe Minor fix notif. ball margins
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
fbsanchez 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
Tatiana Llorente aaf5d7bf89 New view user edit
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
Tatiana Llorente 29f00dd1da New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
Tatiana Llorente c5722d2e10 New view user edit
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
Tatiana Llorente 9a702a90a1 New view user edit
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
fermin831 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
Tatiana Llorente 71afb7a741 New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
Fermin 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
fermin831 471770ec85 Reduced icon size on netflow explorer
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
2019-03-07 19:16:24 +01:00
fbsanchez 3e39e727b6 WIP: Unified class NetworkMapClass
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
fermin831 1f89cccbbe Change item link filter by image filter in network/flow explorer
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
daniel 00283a5c6a progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
fbsanchez aef10cf649 Fixed grown in notifications
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
2019-03-06 19:39:07 +01:00
fbsanchez 40bc938000 notifications font color and some minor changes
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
2019-03-06 16:38:06 +01:00
fbsanchez 825128e31e WIP: minor updates in notification wrapper
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
fbsanchez 63ee3b0329 wip: style checks
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
fbsanchez 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
Daniel Maya e26c81aa6c Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Fermin a01319464e Added link with params html component and modify the network report
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
Tatiana Llorente 34eedc5330 new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
Tatiana Llorente 3e87c8e931 new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
Tatiana Llorente 6ec148c59c new header and menu
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
2019-02-25 12:28:41 +01:00
Tatiana Llorente 4c92375a58 new header and menu
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
fbsanchez 8b5f50f883 Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
fbsanchez 4148387c50 Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
manuel ad3e2b88bf Minor fixes Wiz.Discovery
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
fbsanchez 08c6d782a4 Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
fbsanchez 4834561e87 Wiz. minor fixes
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
2019-02-20 14:38:00 +01:00
fbsanchez a63e497497 Wiz. Added textarea input
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
2019-02-20 11:11:26 +01:00
manuel ea70c0846c Added href in wizard
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
2019-02-19 16:34:11 +01:00
fbsanchez 85371424ee Minor fixes and status check
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
manuel 938408ada9 Added wizard
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
2019-02-19 08:58:30 +01:00
fbsanchez c49c8bc0b5 discovery minor style changes
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
2019-02-15 18:44:59 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
manuel 32d34cd09b Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
2019-02-15 10:00:23 +01:00
fbsanchez 7df9d4f78b WIP: H&D merge
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
fbsanchez 8acb658266 WIP: H&D
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
2019-02-14 13:27:49 +01:00
Daniel Barbero 444b5c4bfd Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
	pandora_console/install.php


Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
2019-02-14 07:51:53 +01:00
fbsanchez 5b4cadf138 minor style fix
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
2019-02-13 17:16:12 +01:00
fbsanchez f75a292b34 minor fixes/updates in notifications UI
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
2019-02-13 16:40:37 +01:00
fermin831 855822f61e Fixed arrow on notifications area
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
fermin831 fe50d6caff Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
fermin831 48724fe033 Added onclick to notification-item's
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
2019-02-12 16:46:21 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
fbsanchez 166c3bbe88 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
fbsanchez 851050f04e message_edit.css added
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
2019-02-11 19:48:20 +01:00
fermin831 c355a581ff Added toasts to notifications
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
2019-02-11 17:53:37 +01:00
daniel 4aae62ba36 Fixed error in reports
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
2019-02-11 17:05:05 +01:00
Fermin d5d58e5b2b Added outter shadow to notifications messages box
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
2019-02-08 18:53:28 +01:00
Fermin 0124bd0a17 Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
daniel 16c742bd83 fixed report pdf
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
2019-02-08 14:10:19 +01:00
daniel 4d4b8bbc0d Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
2019-02-07 10:30:23 +01:00
Tatiana Llorente 4c2215a3db Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
	pandora_console/install.php


Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
Daniel Rodriguez f098b72fe4 Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
Fixed height in slicesbar graph of table interface snmp - #3274

See merge request artica/pandorafms!2144

Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
2019-02-06 18:56:47 +01:00
fermin831 37d02ddf59 Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
manuel.montes d113bfbeb8 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
2019-02-06 17:02:58 +01:00
manuel.montes dee7c769f2 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/godmode/setup/setup_ehorus.php
	pandora_console/godmode/setup/setup_general.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/styles/pandora.css

	modificado:     pandora_console/include/functions_html.php


Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
daniel 19c5a1c844 fixed error pdf
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
2019-02-06 15:58:36 +01:00
Tatiana Llorente b805fe594e Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
Conflicts:
	pandora_console/include/functions_reporting_html.php


Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
2019-02-06 15:34:06 +01:00
Tatiana Llorente b8aab972c9 Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
	pandora_console/godmode/groups/group_list.php


Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
fermin831 7df3fe2dac Added functionallity to Add element on notification global config
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
fermin831 8811257762 Popup to add groups and sources to global notification configuration
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
daniel 418d497291 fixed errors pdf
Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7
2019-02-05 10:40:24 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
daniel 20e0508e01 fixed pdf report
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
2019-02-04 12:10:52 +01:00
fermin831 50030b6933 Added notify all users and disable on first load
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
fermin831 315a51c5e7 Added only read selector global notification setup
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
fermin831 01bc0775bc Added notification global configuration (only enable and disable)
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
fermin831 b589826c86 Added HTML switch element
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
fermin831 397f2964da Added messages notification ball
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00
artica 7a9684f23c Changed the format of the .css files
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
daniel 335abb9abc fixed error css
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
2019-01-25 09:54:53 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
daniel fb46197c1f fixed minor error button
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
2019-01-23 15:30:46 +01:00
manuel.montes fd2dcb3281 Changed radio buttons by toogle switch checkbox
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
tatiana.llorente@artica.es f98b3e2ea5 Fixed error in submit - #3153
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
2018-12-10 15:18:53 +01:00
Alejandro Gallardo Escobar b0998003a3 Added a new icon
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
2018-12-10 09:19:26 +01:00
tatiana.llorente@artica.es 2cb494bfe7 Show popup before drop database - #3153 2018-12-04 15:41:36 +01:00
vgilc d2c048b2dc Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop'
Added css rule for links in the th tables with databox class- #2890

See merge request artica/pandorafms!1844
2018-11-30 13:11:45 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
tatiana.llorente@artica.es a6b8929a37 Added jquery-ui styles to css - #2784 2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es 719e502a27 Revert "Added jquery-ui styles to css - #2784"
This reverts commit fdda5793d2.
2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es fdda5793d2 Added jquery-ui styles to css - #2784 2018-11-13 16:27:57 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel 267f83cc4c add datatabes 2018-11-07 13:25:02 +01:00
daniel 7d54858b45 delete files dont use 2018-11-07 13:24:07 +01:00
tatiana.llorente@artica.es 233b9c2c70 Well centered message modal window - #2768 2018-11-02 13:07:38 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop'
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
2018-10-29 09:16:33 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
WUX-UX integration

See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
fbsanchez 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop'
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
2018-10-25 12:05:56 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop'
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
2018-10-25 11:54:50 +02:00
tatiana.llorente@artica.es 8f2472dcf8 Added css rule for links in the th tables with databox class- #2890 2018-10-09 12:38:59 +02:00
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop'
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status
Conflicts:
	pandora_console/include/styles/pandora.css
2018-10-02 17:11:02 +02:00
alejandro-campos e5e81e55d7 edited css class ui-widget-content 2018-10-01 17:58:29 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop'
refactoriced view module_groups

See merge request artica/pandorafms!1788
2018-10-01 10:59:09 +02:00
vgilc d933a966eb Merge branch '2478-Logo-meta' into 'develop'
changed background of meta visual setup logo previews

See merge request artica/pandorafms!1641
2018-09-28 10:50:13 +02:00
samucarc 638c4f8bc7 Added warning and normal status agents in group view 2018-09-21 15:10:30 +02:00
tatiana.llorente@artica.es 028cca0d66 Changed colors for buttons - #2726 2018-09-21 12:59:15 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
tatiana.llorente@artica.es e49c0e3ae7 Fixed a minor mistake in thead - #2768 2018-09-20 12:18:31 +02:00
tatiana.llorente@artica.es bc38468e6c Fixed borders of tables with classes databox and data - #2768 2018-09-20 11:50:47 +02:00
alejandro-campos 6d28b386d1 changed styles for system group status widget 2018-09-17 18:56:38 +02:00
alejandro-campos 89a4e3667f Added styles for new widget system group status 2018-09-13 19:08:45 +02:00
danielmaya 39673ed93a Added class modaldeletebutton in pandora.css 2018-09-07 14:15:21 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
danielmaya cd26042fa9 Fixed event graph in cluster view 2018-07-31 15:41:15 +02:00
alejandro-campos cca29b2f85 changed background of meta visual setup logo previews 2018-07-26 18:14:43 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop'
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
2018-06-25 18:59:34 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
manuel.montes b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
fermin831 33abfa7f9d [Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php 2018-05-09 18:50:45 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
2018-05-09 10:24:19 +02:00
fbsanchez 3dd4dd51cb Specified more accurate class for label styling 2018-05-04 12:26:18 +02:00
fermin831 675e8deb47 Added function display_confirm_dialog with custom dialog 2018-04-25 12:32:58 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
enriquecd c889776f44 Add visual animation to popup modal windows - #1781 2018-02-08 16:51:58 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
	pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-02-06 10:46:59 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
enriquecd 74b4f2a5f3 Add optional token animation and vissual effects in visual styles configuration view - #1724 2018-01-08 13:01:29 +01:00
vgilc 78899cc1c7 Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop'
add new funtionality view favourite console visual

See merge request artica/pandorafms!1211
2018-01-02 10:31:31 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd 5747299d8e Add visual effect to login page - #1724 2017-12-21 13:45:57 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
vgilc df5722e499 Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop'
Change font family to install wizard button - #1500

See merge request artica/pandorafms!964
2017-11-29 16:57:03 +01:00