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

30866 Commits

Author SHA1 Message Date
Rafael Ameijeiras b458a85a59 Merge branch 'ent-12970-cambiar-mensaje-de-error-php-inferior-a-8-2' into 'develop' 
Ent 12970 cambiar mensaje de error php inferior a 8 2

See merge request artica/pandorafms!6992
 2024-03-06 15:50:08 +00:00
Daniel Maya b4433e533f #12991 Restored tatctical view 2024-03-06 15:53:04 +01:00
Daniel Maya 10b9158029 #12970 added error message 2024-03-06 13:01:04 +01:00
Rafael Ameijeiras d3f931703b Merge branch 'ent-12630-guardia-15143-problemas-con-cifrado-de-contrasenas-smtp' into 'develop' 
Ent 12630 guardia 15143 problemas con cifrado de contrasenas smtp

See merge request artica/pandorafms!6753
 2024-03-06 08:42:13 +00:00
artica f7e31eb92e Auto-updated build strings. 2024-03-06 01:00:04 +01:00
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop' 
visual changes in demo view

See merge request artica/pandorafms!6916
 2024-03-05 07:59:04 +00:00
artica 6bd35b445b Auto-updated build strings. 2024-03-05 01:00:05 +01:00
Matias Didier 53c69af205 Merge branch 'ent-12922-fallos-en-vista-de-grupos-tactical-view' into 'develop' 
Ent 12922 Fallos en Vista de grupos tactical view

See merge request artica/pandorafms!6966
 2024-03-04 12:13:58 +00:00
artica 4acb8f1efd Auto-updated build strings. 2024-03-04 01:00:04 +01:00
artica 290cdd75ac Auto-updated build strings. 2024-03-03 01:00:04 +01:00
artica 2dbe83f1be Auto-updated build strings. 2024-03-02 01:00:06 +01:00
alejandro.campos@artica.es e1419d29fa removed debug change 2024-03-01 13:10:07 +01:00
Gorka Sanchez e9e7bca39a Merge branch 'ent-12950-500-al-crear-agente' into 'develop' 
minor fix

See merge request artica/pandorafms!6977
 2024-03-01 11:42:48 +00:00
Daniel Rodriguez 44ae109889 Merge branch 'ent-12019-api-2-0' into 'develop' 
new api 2.0

See merge request artica/pandorafms!6845
 2024-03-01 10:21:10 +00:00
artica 3d4202b8d6 Auto-updated build strings. 2024-03-01 01:00:05 +01:00
Rafael Ameijeiras ef8d2cf63c Merge branch 'ent-12943-guardia17145-error-sql-al-hacer-click-en-las-columnas-del-inventario' into 'develop' 
Ent 12943 [GUARDIA][#17145]Error SQL al hacer click en las columnas del inventario.

See merge request artica/pandorafms!6971
 2024-02-29 08:11:25 +00:00
artica 6f808edea0 Auto-updated build strings. 2024-02-29 01:00:05 +01:00
Daniel Maya 24161241fb #12952 Fixed check nfdump 2024-02-28 15:33:37 +01:00
Daniel Cebrian 70818c40b1 #12943 fixed metaconsole inventory 2024-02-28 14:22:57 +01:00
alejandro.campos@artica.es 3800adb1e7 minor fix 2024-02-28 10:05:08 +01:00
Rafael Ameijeiras 3c6ad30d14 Merge branch 'ent-12946-Error-500-entorno-sin-servidores' into 'develop' 
fix error when there are no servers

See merge request artica/pandorafms!6972
 2024-02-28 08:41:02 +00:00
Rafael Ameijeiras 708b81601a Merge branch 'ent-12945-17144-API-externa-event-custom-id-no-funciona-en-Meta' into 'develop' 
Ent 12945 17144 api externa event custom id no funciona en meta

See merge request artica/pandorafms!6969
 2024-02-28 08:40:42 +00:00
artica 481ba2794e Auto-updated build strings. 2024-02-28 01:00:06 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Rafael Ameijeiras 355652eb52 Merge branch 'ent-12923-Bug-busqueda-en-filtrado-de-listado-de-informes-con-la-consola-en-Español' into 'develop' 
fix report search

See merge request artica/pandorafms!6968
 2024-02-27 08:58:13 +00:00
artica 6344e2544b Auto-updated build strings. 2024-02-27 01:00:05 +01:00
Rafael Ameijeiras cf517cd963 Merge branch 'ent-12938-File-manager-no-funciona-correctamente' into 'develop' 
Ent 12938 file manager no funciona correctamente

See merge request artica/pandorafms!6967
 2024-02-26 16:29:19 +00:00
Rafael Ameijeiras d62407dd4a Merge branch 'ent-12075-registro-de-nodos-ha-en-metaconsola' into 'develop' 
Update database targets in HA environments using metaconsole

See merge request artica/pandorafms!6956
 2024-02-26 16:28:57 +00:00
alejandro.campos@artica.es 4fbcb2318c fix error when there are no servers 2024-02-26 15:48:47 +01:00
Daniel Cebrian 293bb5c2fe #12943 fixed inventory filter 2024-02-26 15:08:08 +01:00
alejandro.campos@artica.es e84b522dff fix api call 2024-02-26 14:42:42 +01:00
alejandro.campos@artica.es af23275f5d fix api call 2024-02-26 14:41:09 +01:00
alejandro.campos@artica.es eebd2bb2c6 fix report search 2024-02-26 13:18:06 +01:00
alejandro.campos@artica.es 11a3d1f0c4 fix filemanager 2024-02-26 12:56:55 +01:00
alejandro.campos@artica.es e3f9d53775 fix filemanager 2024-02-26 12:55:17 +01:00
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop' 
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
 2024-02-26 11:51:37 +00:00
Rafael Ameijeiras 81d937ae30 Merge branch 'ent-12768-16921-operator-read-puede-ver-inventario-de-todos-los-grupos' into 'develop' 
Ent 12768 16921 operator read puede ver inventario de todos los grupos

See merge request artica/pandorafms!6853
 2024-02-26 11:50:52 +00:00
Daniel Cebrian 29a42375f2 #12922 fixed status agent in tactical view group 2024-02-26 12:00:50 +01:00
artica bd8711883b Auto-updated build strings. 2024-02-26 01:00:04 +01:00
artica 4bb932732b Auto-updated build strings. 2024-02-25 01:00:03 +01:00
artica c44632a0e0 Auto-updated build strings. 2024-02-24 01:00:05 +01:00
Enrique Martin 78702547c8 Fixed table field 2024-02-23 14:23:22 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
alejandro.campos@artica.es 06107f4773 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-23 10:24:26 +01:00
artica 421598df6b Auto-updated build strings. 2024-02-23 01:00:05 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop' 
Ent 12497 usabilidad implementar boton mas operaciones

See merge request artica/pandorafms!6955
 2024-02-22 16:20:13 +00:00
Enrique Martin 633ee5ff2a FIx issues from ticket 10847 2024-02-22 15:45:04 +01:00
alejandro.campos@artica.es 77dd8b1fb9 minor fixes 2024-02-22 15:07:18 +01:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00