Commit Graph

684 Commits

Author SHA1 Message Date
daniel 510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
Jose Gonzalez 336f6924df Added images 2020-09-29 12:22:29 +02:00
Daniel Rodriguez dadba4f81d Merge branch 'ent-6257-proyectos-imagenes-de-iso-de-demos-en-producto' into 'develop'
Ent 6257 proyectos imagenes de iso de demos en producto

See merge request artica/pandorafms!3449
2020-09-23 09:41:05 +02:00
manuel.montes 0ff915e823 Added images 2020-09-11 10:22:51 +02:00
manuel.montes f8e36620e8 Added icon 2020-09-01 15:01:15 +02:00
Rafael Ameijeiras e6d81a76d2 Update .htaccess 2020-08-11 09:04:25 +02:00
rafael e181199581 change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +02:00
daniel 65c733e1dd iot metaconsole 2020-05-27 09:18:21 +02:00
marcos eab1b7a003 change icon satelite 2020-04-06 13:22:00 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Tatiana Llorente c820a32b53 Ent 4492 consola visual por paises 2020-02-28 14:37:44 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Alejandro Fraguas 6c93fcfe02 Merge branch 'ent-5361-vulnerabilidad-subir-ficheros' into 'develop'
adding .htaccess files

See merge request artica/pandorafms!3026
2020-02-03 12:36:01 +01:00
rafael e2bd041ba2 adding .htaccess files 2020-01-27 11:03:42 +01:00
Daniel Barbero Martin 02199b19b5 fixed errors VC 2020-01-16 16:55:48 +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
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
Jose Gonzalez c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Daniel Barbero e8812cba95 add img 2019-11-22 14:50:23 +01:00
fbsanchez 61eb7f0635 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 09:55:15 +01:00
marcos 91f28384b8 changed sap icon button 2019-11-15 16:22:30 +01:00
fbsanchez 78443a029d Omnishell rc1 2019-11-13 18:10:16 +01:00
fbsanchez 672ce6db22 first task omnishell and minor style checks 2019-11-13 15:24:44 +01:00
fbsanchez 9b1a3a9cd1 Firts_task => first_task 2019-11-13 14:58:53 +01:00
fbsanchez d1f9a86622 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:36:47 +01:00
fbsanchez 01de54a220 other icon 2019-11-11 15:36:38 +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
fbsanchez ec2d46c299 Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 2019-11-08 11:09:11 +01:00
fbsanchez ec72820c88 Icon adjustment 2019-11-08 11:08:43 +01:00
fbsanchez d080f1d6a7 Welcome pack 2019-11-07 10:42:46 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
Daniel Barbero Martin 6ff85d2abb fixed image 2019-10-29 09:21:08 +01:00
fbsanchez 6bf3772690 remote cmd => remote execution 2019-10-09 19:20:58 +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
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
Tatiana Llorente 90b61533f8 Fixed visual bugs in black theme - #4572 2019-09-10 10:26:28 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Luis Calvo 0cb0a63a8f Re-uploaded visual-console rack images and db data 2019-08-09 10:42:44 +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
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Tatiana Llorente cac34e3311 Changed gray image in discovery - #4351 2019-07-12 10:21:54 +02:00
Tatiana Llorente a8019fd223 Changed images with transparent borders - #4351 2019-07-11 10:49:48 +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 0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
Tatiana Llorente b6d551d583 Changed images with white background - #4194 2019-07-08 10:08:04 +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
fbsanchez c24d7dbbda new hearbeat designs 2019-06-24 19:28:19 +02:00
Tatiana Llorente 43b83af2c6 Changed default images status set for css - #4195 2019-06-24 11:59:17 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +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
Tatiana Llorente 31905f005a Visual changes in Agent/Module View - #3739 2019-06-11 17:34:13 +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 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Tatiana Llorente 0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
marcos.alconada 5fe4a240be se añade imagen y se quita de bbdd
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
2019-05-14 09:47:45 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
Ent 3608 update manager online

See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
Tatiana Llorente 5f729ef314 Changed success icon - #3608
Former-commit-id: 8e472206f96c7ea78184c330c57f4f79dc2556b6
2019-04-24 13:01:29 +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
Tatiana Llorente ecd63667e5 New style for update manager online - #3608
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
alejandro-campos 0e02d71712 add missing image
Former-commit-id: 0e5c0140a919223403c33a7dde15f64fdde62ed8
2019-04-22 17:47:30 +02:00
Tatiana Llorente 973ce07811 New style for update manager online - #3608
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
Tatiana Llorente 518a9a1eed New style for update manager online - #3608
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +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
Daniel Rodriguez 7c8b1fcf27 Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
Ent 3625 aviso no acceso a página

See merge request artica/pandorafms!2357

Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
2019-04-15 18:32:54 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
2019-04-15 14:42:58 +02:00
Tatiana Llorente b50ed1c810 New arrow and timestamp images - #3707
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +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 d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +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
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 fe7103ba9c Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
Tatiana Llorente 151fe6ac78 Fixed a bug: show map image alternative when offline
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +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 Barbero 0593e72f3e move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
fbsanchez 99b1aadacb discovery icon set
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +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
Tatiana Llorente 71afb7a741 New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
alejandro-campos 35ff5ced90 add aws first task icon
Former-commit-id: b5e083e599ebe00194261cbb5a6da017c5723f2c
2019-03-08 10:14:17 +01:00
Tatiana Llorente acc44ff9ce Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
Conflicts:
   pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +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
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
samucarc 7e53461b94 Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
Tatiana Llorente 34eedc5330 new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00