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

22948 Commits

Author SHA1 Message Date
Calvo 66c4087679 Added module interval control and percentage checkbox 2021-12-02 14:12:19 +01:00
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
Calvo 7d8a5b029e Changed radio buttons to select on prediction modules 2021-11-29 14:45:19 +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
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
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
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +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
artica 3ec3e5e0a2 Updated version and build strings. 2021-11-24 17:45:09 +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
Daniel Rodriguez e3d7134dc8 Merge branch 'ent-8278-No-funcionan-las-gráficas-de-Agente-en-la-versión-Opensource' into 'develop' 
Ent 8278 no funcionan las gráficas de agente en la versión opensource

See merge request artica/pandorafms!4538
 2021-11-24 14:43:52 +00:00
Calvo f76670dd28 Fix delete agent secondary ip bug 2021-11-24 14:39:42 +01:00
Daniel Rodriguez 8ed3042f9a Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop' 
added resolution field in creation and update operations

See merge request artica/pandorafms!4534
 2021-11-24 11:20:18 +00:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
alejandro.campos@artica.es 08ad73e34e minor fix 2021-11-23 16:29:25 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
Jose Gonzalez 67f893f4ee Fixed issue 2021-11-23 12:50:12 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Rodriguez c096a244f6 Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop' 
Select group search filter working on groups' child

See merge request artica/pandorafms!4535
 2021-11-23 09:38:22 +00:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
 2021-11-22 15:54:05 +00:00
Daniel Rodriguez 3efcc8d30f Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop' 
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard

See merge request artica/pandorafms!4504
 2021-11-22 15:53:16 +00:00
Daniel Rodriguez eadb06e131 Merge branch 'ent-7787-Debug-modulos-web-corta-urls' into 'develop' 
Changes in debug_content db field

Closes pandora_enterprise#7787

See merge request artica/pandorafms!4324
 2021-11-22 15:51:34 +00:00
Daniel Rodriguez 60f051dca3 Merge branch 'ent-8143-Buscador-general-Errores-en-resultados-mostrados' into 'develop' 
fixed general search

See merge request artica/pandorafms!4520
 2021-11-22 15:50:25 +00:00
Daniel Maya 131be55be1 #8277 Fixed search by agent 2021-11-22 16:18:53 +01:00
Daniel Rodriguez 13835582d2 Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop' 
Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
 2021-11-22 12:44:51 +00:00
José González b8d884008b Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls' 
# Conflicts:
#   pandora_console/extras/mr/51.sql
 2021-11-22 11:44:06 +00:00
Jose Gonzalez 3f395f03dc Added sql file 2021-11-22 12:33:31 +01:00
Jose Gonzalez 192237a452 Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls 2021-11-22 12:31:24 +01:00
Daniel Maya 79757d8f4b #8278 Fixed graph 2021-11-22 12:12:32 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
Daniel Rodriguez 7f534a1a14 Merge branch 'ent-8191-Error-linkado-elementos-mapa-de-servicio' into 'develop' 
Ent 8191 error linkado elementos mapa de servicio

See merge request artica/pandorafms!4537
 2021-11-19 13:04:23 +00:00
Daniel Rodriguez 7b4c6848f7 Merge branch 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' into 'develop' 
fixed several counts

See merge request artica/pandorafms!4527
 2021-11-19 10:46:15 +00:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +01:00