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

622 Commits

Author SHA1 Message Date
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