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

30183 Commits

Author SHA1 Message Date
Rafael Ameijeiras c4b6183074 Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop' 
Fix servers name

See merge request artica/pandorafms!6794
 2023-12-21 15:16:13 +00:00
miguel angel rasteu 53da63d7b6 #12132 Fix MR 2023-12-21 16:03:49 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop' 
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
 2023-12-21 12:00:44 +00:00
Jonathan 59866d9949 #12398 remove transactional_view 2023-12-21 12:39:10 +01:00
Jonathan 158a52a1ce #12398 fix url 2023-12-21 12:36:54 +01:00
Diego Muñoz-Reja 6114c6a37a Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop' 
Policy capacity planning modules. JS errors

See merge request artica/pandorafms!6650
 2023-12-21 10:57:42 +00:00
artica ffec658ee8 Auto-updated build strings. 2023-12-21 01:00:28 +01:00
miguel angel rasteu d84300f2c7 #11494 Add widget in database 2023-12-20 13:21:43 +01:00
Calvo ca33be4495 Fix servers name 2023-12-20 11:58:31 +01:00
Rafael Ameijeiras 8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop' 
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
 2023-12-20 10:21:51 +00:00
Calvo b543376f1c Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-20 09:15:18 +01:00
artica e947ac4f00 Auto-updated build strings. 2023-12-20 01:00:27 +01:00
Daniel Rodriguez 477a9d665e Merge branch 'ent-12067-huevo-de-pascua-piensa-en-verde' into 'develop' 
Ent 12067 huevo de pascua piensa en verde

See merge request artica/pandorafms!6698
 2023-12-19 18:05:44 +00:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop' 
implement demo data feature

See merge request artica/pandorafms!6606
 2023-12-19 15:40:09 +00:00
Rafael Ameijeiras 46b315fbaf Merge branch 'ent-12643-conteo-paginacion-de-eventos-no-funciona' into 'develop' 
Ent 12643 conteo paginacion de eventos no funciona

See merge request artica/pandorafms!6781
 2023-12-19 15:05:05 +00:00
Rafael Ameijeiras 6a904f4e59 Merge branch 'ent-12269-el-editor-de-widgets-no-me-dice-que-tipo-de-widget-estoy-editando' into 'develop' 
Ent 12269 el editor de widgets no me dice que tipo de widget estoy editando

See merge request artica/pandorafms!6590
 2023-12-19 14:59:13 +00:00
daniel e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde 
Conflicts:
	pandora_console/index.php
 2023-12-19 14:56:04 +01:00
daniel d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2023-12-19 14:41:12 +01:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
 2023-12-19 09:39:24 +01:00
Rafael Ameijeiras 8cc159f19f Merge branch 'ent-12665-error-500-al-crear-un-custom-graph' into 'develop' 
fix rerors selectors pandora_enterprise#12665

See merge request artica/pandorafms!6788
 2023-12-19 07:57:28 +00:00
Rafael Ameijeiras a4eed65758 Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop' 
Ent 12200 huevo de pascua efecto nieve

See merge request artica/pandorafms!6675
 2023-12-19 07:56:55 +00:00
artica 43fbc6eca4 Auto-updated build strings. 2023-12-19 01:00:37 +01:00
Rafael Ameijeiras de6747f53d Merge branch 'ent-12597-popup-en-la-open' into 'develop' 
Ent 12597 popup en la open

See merge request artica/pandorafms!6784
 2023-12-18 15:51:22 +00:00
Daniel Maya e5b513f018 #12200 Fixed Christmas 2023-12-18 16:44:27 +01:00
daniel ae43f8a948 fix rerors selectors pandora_enterprise#12665 2023-12-18 16:29:56 +01:00
Enrique Martin 321a0075f9 Fixed report custom graph search 2023-12-18 16:12:08 +01:00
Rafael Ameijeiras 2fef90895e Merge branch 'ent-12465-guardia-16501-fallo-en-edicion-de-grupo-ldap' into 'develop' 
Ent 12465 guardia 16501 fallo en edicion de grupo ldap

See merge request artica/pandorafms!6685
 2023-12-18 14:52:25 +00:00
Rafael Ameijeiras e86132a89d Merge branch 'ent-12456-dashboard-widgert-colmena-de-agentes-agent-hive-se-ve-con-con-OS-description-largos' into 'develop' 
Ent 12456 dashboard widgert colmena de agentes agent hive se ve con con os description largos

See merge request artica/pandorafms!6669
 2023-12-18 14:52:02 +00:00
Rafael Ameijeiras bf03440a31 Merge branch 'ent-12667-error-500-al-cargar-la-consola-de-pandora-open' into 'develop' 
Ent 12667 error 500 al cargar la consola de pandora open

See merge request artica/pandorafms!6783
 2023-12-18 14:51:43 +00:00
Daniel Rodriguez cba7c03115 Merge branch 'ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar' into 'develop' 
oum update checks

See merge request artica/pandorafms!6598
 2023-12-18 14:07:28 +00:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop' 
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
 2023-12-18 13:40:21 +00:00
Daniel Maya 0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
alejandro.campos@artica.es 7e4016579a minor change 2023-12-18 12:47:54 +01:00
Matias Didier ec24bb3a01 Merge branch 'ent-12198-easter-egg-bienvenida-dinamica' into 'develop' 
Ent 12198 easter egg bienvenida dinamica

See merge request artica/pandorafms!6687
 2023-12-18 11:38:57 +00:00
Daniel Maya 7c0a2b4e97 #12456 Fixed os text style 2 2023-12-18 12:00:14 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
daniel 9b0bee3b36 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:35:39 +01:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
daniel d56e3a5496 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:14:55 +01:00
Jonathan 82e4eb46e0 #12667 move translate string to open 2023-12-18 10:51:48 +01:00
Rafael Ameijeiras 3dd082c60f Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop' 
Ent 12647 Salto de linea en nombre de evento

See merge request artica/pandorafms!6777
 2023-12-18 07:52:31 +00:00
Diego Muñoz-Reja 5a9f888ecc Merge branch 'ent-12649-traza-olvidada' into 'develop' 
Ent 12649 traza olvidada

See merge request artica/pandorafms!6779
 2023-12-18 07:07:12 +00:00
artica 0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
artica 2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica 9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
Daniel Maya e6981fb436 #12456 Fixed os text style 2023-12-15 12:59:56 +01:00
Matias Didier 9158b43945 Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop' 
move extension translate_string and file_repo pandora_enterprise#12333

See merge request artica/pandorafms!6706
 2023-12-15 11:49:11 +00:00