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

1440 Commits

Author SHA1 Message Date
fbsanchez 94e8a35613 minor change 2021-11-10 17:14:12 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
 2021-10-18 11:36:19 +00:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
fbsanchez 1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Marcos Alconada 4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' 
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
 2021-10-07 13:42:14 +00:00
marcos 34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
marcos 52f87757d6 set bg transparent on images black theme 2021-10-07 10:30:05 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 961522218e Merge branch 'ent-7694-imagen-pequena-en-sap-view' into 'develop' 
fixed size sap logo

See merge request artica/pandorafms!4289
 2021-10-05 09:25:35 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
Daniel Rodriguez 6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00
Daniel Rodriguez 4b5719c1da Merge branch 'ent-7781-black-theme-botones-blancos-en-filtro-de-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4283
 2021-10-05 09:22:35 +00:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
marcos aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +00:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez 68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop' 
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
 2021-09-22 09:07:42 +00:00
Daniel Rodriguez a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop' 
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
 2021-09-21 13:18:43 +00:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop' 
fixed icon button position

See merge request artica/pandorafms!4243
 2021-09-08 14:40:34 +00:00
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop' 
fixed error

See merge request artica/pandorafms!4244
 2021-09-08 13:35:45 +00:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00