tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,097 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

646 Commits

Author SHA1 Message Date
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
fbsanchez 3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-01-07 10:59:02 +01:00
fbsanchez b7e64f1477 Visual console list mobile view 2020-12-18 13:23:35 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
 2020-11-19 15:21:58 +01:00
fbsanchez b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
fbsanchez 6f498d6d5d server status images 2020-10-21 14:04:45 +02:00
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