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

33619 Commits

Author SHA1 Message Date
Jonathan c7b62c587b #10597 logo pandora deactivated 2023-04-12 13:39:48 +02:00
Matias Didier 5a38024e25 Merge branch 'ent-10320-no-pide-confirmacion-al-eliminar-usuario' into 'develop' 
Ent 10320 no pide confirmacion al eliminar usuario

See merge request artica/pandorafms!5678
 2023-04-12 11:03:01 +00:00
Matias Didier ad3f1dd8d6 Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop' 
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise

See merge request artica/pandorafms!5691
 2023-04-12 10:16:24 +00:00
Daniel Rodriguez 045fbeda60 Merge branch 'ent-10915-fallo-en-version-open' into 'develop' 
#10915 fix open noaccess mesagge

See merge request artica/pandorafms!5700
 2023-04-12 09:59:18 +00:00
Jonathan 9dd9c3eaaa #10915 fix open noaccess mesagge 2023-04-12 11:46:26 +02:00
Matias Didier 5906ab595e Merge branch 'ent-10181-Conteo-de-numero-de-eventos-erroneo-en-vista-tactica' into 'develop' 
minor change

See merge request artica/pandorafms!5677
 2023-04-12 08:45:04 +00:00
Jonathan 1a05c71e78 #10526 fix create module dialog 2023-04-12 10:44:20 +02:00
Matias Didier 310496f135 Merge branch 'ent-10258-bug-en-edicion-de-accion-mail-to-admin' into 'develop' 
Ent 10258 bug en edicion de accion mail to admin

See merge request artica/pandorafms!5680
 2023-04-12 07:47:35 +00:00
artica 01527dcc67 Auto-updated build strings. 2023-04-12 01:00:14 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Daniel Rodriguez 57c6788a19 Merge branch 'ent-10891-no-tenemos-local-components-en-open' into 'develop' 
Ent 10891 no tenemos local components en open

See merge request artica/pandorafms!5685
 2023-04-11 12:26:31 +00:00
Daniel Rodriguez bb0d637c3f Merge branch 'ent-10893-Error-SQL-en-menu-de-welcome-tips' into 'develop' 
fixed collation compatibily with older mysql versions

See merge request artica/pandorafms!5683
 2023-04-11 12:06:52 +00:00
Daniel Rodriguez fbfd53cd7c Merge branch 'ent-10889-500-en-consola-sonora-open' into 'develop' 
Ent 10889 500 en consola sonora open

See merge request artica/pandorafms!5681
 2023-04-11 11:23:02 +00:00
Daniel Rodriguez 63b7e774a8 Merge branch 'ent-10890-No-se-pueden-crear-items-de-informes-en-open' into 'develop' 
minor fix

See merge request artica/pandorafms!5682
 2023-04-11 11:13:40 +00:00
Rafael Ameijeiras 60341b10c3 Merge branch 'ent-10895-cambios-instalador-online-anadir-crhomium-con-una-version-especifica-para-la-770' into 'develop' 
ent-10895 set specific version for chromium/chrome packages 110 and minor urls fixs

See merge request artica/pandorafms!5686
 2023-04-11 10:52:15 +00:00
rafael e5b0fe9bb6 ent-10895 set specific version for chromium/chrome packages 110 and minor urls fixs 2023-04-11 12:15:14 +02:00
Jonathan f98303b3ba #10891 Local components for enterprise menu 2023-04-11 12:14:18 +02:00
alejandro.campos@artica.es 472c342f81 fixed collation compatibily with older mysql versions 2023-04-11 11:24:42 +02:00
alejandro.campos@artica.es db663be86d minor fix 2023-04-11 10:30:40 +02:00
Pablo Aragon b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
Pablo Aragon 564085ee01 10258-Event mail to admin 2023-04-11 09:52:49 +02:00
artica 9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +02:00
daniel d7724f4691 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5670
 2023-04-10 15:04:11 +00:00
daniel 086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
 2023-04-10 16:42:41 +02:00
daniel c0172afc3d update composer 2023-04-10 16:38:37 +02:00
Rafael Ameijeiras a46c5617b8 Merge branch 'ent-10887-anadir-el-template-a-los-spec-del-server' into 'develop' 
10887 adding template files to server spec

See merge request artica/pandorafms!5675
 2023-04-10 14:24:26 +00:00
Pablo Aragon a3ed2b1f6b 10320-Confirm delete user 2023-04-10 16:10:44 +02:00
alejandro.campos@artica.es 6648ef34dd minor change 2023-04-10 16:02:28 +02:00
Rafael 60f3e74358 10887 adding .template file in a .spec for pandora server 2023-04-10 15:27:31 +02:00
Rafael e1b05c9569 Merge branch 'develop' into ent-10887-anadir-el-template-a-los-spec-del-server 2023-04-10 15:14:16 +02:00
rafael b074b1bb03 10887 adding template files to server spec 2023-04-10 14:43:33 +02:00
Pablo Aragon 71d97593ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-04-10 14:16:19 +02:00
Pablo Aragon 8c1fa4b245 10835-Logs icons 2023-04-10 14:16:15 +02:00
Daniel Rodriguez 871a8f15c5 Merge branch 'ent-10873-mini-revision-de-consola-movil' into 'develop' 
Ent 10873 mini revision de consola movil

See merge request artica/pandorafms!5671
 2023-04-10 12:14:26 +00:00
daniel 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Rafael Ameijeiras f68cd81d35 Merge branch 'ent-10864-conflicto-mergeo-fichero-ver_agentes-php' into 'develop' 
Ent 10864 conflicto mergeo fichero ver agentes php

See merge request artica/pandorafms!5663
 2023-04-10 09:36:44 +00:00
Pablo Aragon 8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Pablo Aragon b4d3d0aa34 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-04-10 09:36:36 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Jonathan a0ae7327c7 Conflict solution inventory 2023-04-10 09:23:40 +02:00
Pablo Aragon 45ca03245c 10873-Mini mobile console review 2023-04-10 08:56:44 +02:00
artica 538f8266dc Auto-updated build strings. 2023-04-10 01:00:11 +02:00
artica c5cd6b08e8 Auto-updated build strings. 2023-04-09 01:00:13 +02:00
artica 33904e3ed7 Auto-updated build strings. 2023-04-08 01:00:11 +02:00
artica b1489c9245 Auto-updated build strings. 2023-04-07 01:00:14 +02:00
Pablo Aragon 7b9d6fdca2 10871-Filter fixed in realtime snmp graph 2023-04-06 09:52:46 +02:00
artica 86d6c24540 Auto-updated build strings. 2023-04-06 01:00:18 +02:00
Jonathan Leon 8e960821cc Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5667
 2023-04-05 12:38:26 +00:00
Jonathan 1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon 514c1b300c 10867-Tactical view status 2023-04-05 14:33:06 +02:00