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

28972 Commits

Author SHA1 Message Date
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Rodriguez 345cbcf5ba Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop' 
fix setup centraliced active directory

See merge request artica/pandorafms!4540
 2021-11-30 14:44:48 +00:00
Daniel Rodriguez ef310cce4c Merge branch 'ent-fix-special-multibyte-characters-treatment' into 'develop' 
Fixed special multibyte characters treatment.

See merge request artica/pandorafms!4524
 2021-11-30 13:34:35 +00:00
Daniel Rodriguez e7e8920783 Merge branch 'ent-8307-Supernet-map-Desplegar-elementos' into 'develop' 
Ent 8307 supernet map desplegar elementos

See merge request artica/pandorafms!4559
 2021-11-30 13:34:04 +00:00
Daniel Rodriguez 84f6d78ee4 Merge branch 'ent-8310-IPAM-Campo-Ubicacion' into 'develop' 
Ent 8310 ipam campo ubicacion

See merge request artica/pandorafms!4560
 2021-11-30 13:32:36 +00:00
Daniel Barbero Martin 347769299b outocreate remote user centralized node 2021-11-30 14:23:19 +01:00
Daniel Barbero Martin 3262d8ea35 Merge remote-tracking branch 'origin/develop' into ent-8123-Autenticacion-remota-en-entornos-centralizados 2021-11-30 14:17:59 +01:00
Daniel Rodriguez 23becba397 Merge branch 'ent-8314-no-sale-actualizacion-parche-en-update-manager-de-los-nodos' into 'develop' 
allow online patches in decimal format

See merge request artica/pandorafms!4556
 2021-11-30 09:21:07 +00:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
alejandro.campos@artica.es 8c8b5aee30 minor change 2021-11-29 16:34:32 +01:00
Daniel Maya c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
alejandro.campos@artica.es 29aacb57c1 Merge remote-tracking branch 'origin/develop' into ent-8310-IPAM-Campo-Ubicacion 2021-11-29 15:33:00 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
alejandro.campos@artica.es 73cde9ee48 db changes 2021-11-29 14:58:34 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop' 
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
 2021-11-29 11:36:52 +00:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
fbsanchez 68c2400b9c fix 2021-11-29 10:32:54 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/install.php
 2021-11-29 09:54:55 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
fbsanchez eba4a1b0db repoDisk patch (MC => Nodes) 2021-11-26 12:36:49 +00:00
Daniel Rodriguez 2cca2e94b6 Merge branch 'ent-8306-Bug-al-editar-elemento-en-File-repository-manager' into 'develop' 
Ent 8306 bug al editar elemento en file repository manager

See merge request artica/pandorafms!4555
 2021-11-26 10:50:49 +00:00
Daniel Rodriguez 137b3b132f Merge branch 'ent-8296-12744-Problemas-Create-a-new-webserver-module' into 'develop' 
Ent 8296 12744 problemas create a new webserver module

See merge request artica/pandorafms!4554
 2021-11-26 10:49:03 +00:00
fbsanchez 951f29769b allow online patches in decimal format 2021-11-26 10:31:16 +01:00
Daniel Rodriguez a249ad43e8 Merge branch 'ent-8292-update-manager-dbpass-encriptada' into 'develop' 
Fixed issue

Closes pandora_enterprise#8292

See merge request artica/pandorafms!4545
 2021-11-26 09:20:56 +00:00
Daniel Rodriguez adb538dd71 Merge branch 'ent-8073-No-esta-funcionando-correctamente-el-install-php-cuando-hace-los-ultimos-grants' into 'develop' 
minor fix

See merge request artica/pandorafms!4547
 2021-11-26 08:54:31 +00:00
Daniel Rodriguez 8fac24a469 Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop' 
Ent 8277 12706 lista de alertas no filtra correctamente

See merge request artica/pandorafms!4539
 2021-11-26 07:58:38 +00:00
Daniel Rodriguez 67f85f92e2 Merge branch 'ent-8251-fallo-a-la-hora-de-guardar-ip-de-agente' into 'develop' 
Fix delete agent secondary ip bug

See merge request artica/pandorafms!4551
 2021-11-26 07:57:40 +00:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Daniel Maya 2894d23e40 #7316 Fixed config_url 2021-11-25 16:15:44 +01:00
alejandro.campos@artica.es d94ed13f76 minor fixes 2021-11-25 15:03:46 +01:00
alejandro.campos@artica.es 6469f8053d minor fixes 2021-11-25 15:00:57 +01:00
Daniel Rodriguez 05e61492c0 Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop' 
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado

See merge request artica/pandorafms!4544
 2021-11-25 10:52:58 +00:00
Daniel Rodriguez f66d6e7f9c Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop' 
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado

See merge request artica/pandorafms!4542
 2021-11-25 10:52:08 +00:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
fbsanchez ba8087f49b ncm2 with schedules 2021-11-24 22:01:21 +01:00
Daniel Rodriguez 5fcabbf959 Merge branch 'ent-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop' 
Ent 7902 bug visual en modal de edición de acciones de alertas

See merge request artica/pandorafms!4541
 2021-11-24 17:20:35 +00:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop' 
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
 2021-11-24 17:18:38 +00:00
Daniel Maya 922088c306 resolved conflict 2021-11-24 17:48:34 +01:00
Daniel Maya 4185e34984 Merge branch 'develop' into ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado 2021-11-24 17:47:33 +01:00
Daniel Maya 0d2e4a99a3 resolved conflict 2021-11-24 17:46:23 +01:00
artica 3ec3e5e0a2 Updated version and build strings. 2021-11-24 17:45:09 +01:00
Daniel Maya 3cc3cef7fa oMerge branch 'develop' into ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado 2021-11-24 17:36:48 +01:00
Daniel Maya 716e04a6b1 #8224 Fixed print_log 2021-11-24 16:11:32 +01:00
Daniel Maya f52dc0c319 #8228 Fixed print_log 2021-11-24 16:07:20 +01:00
Daniel Rodriguez eb4666e2c2 Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop' 
fix chart area

See merge request artica/pandorafms!4546
 2021-11-24 14:45:39 +00:00