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

31023 Commits

Author SHA1 Message Date
Daniel Maya 53cbb4d3da #9107 conflict resolved 2022-08-29 10:13:39 +02:00
alejandro.campos@artica.es de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
alejandro.campos@artica.es 58a2d3ec85 visual fix 2022-08-29 09:48:10 +02:00
artica 8b805e0ddf Auto-updated build strings. 2022-08-29 01:00:17 +02:00
artica 1b750d1437 Auto-updated build strings. 2022-08-28 01:00:18 +02:00
artica 4bab4dc653 Auto-updated build strings. 2022-08-27 01:00:21 +02:00
Diego Muñoz-Reja 56e2648c59 Merge branch 'ent-9046-mover-setup-edit-os-a-resources-operating-systems' into 'develop' 
Ent 9046 mover setup edit os a resources operating systems

See merge request artica/pandorafms!5068
 2022-08-26 13:06:27 +00:00
edu.corral c0227482db ent #9118 cli disable group entities 2022-08-26 11:46:35 +02:00
artica 7106547b38 Auto-updated build strings. 2022-08-26 01:00:22 +02:00
Jimmy Olano ce6a0db737 Merge branch 'ent-9146-DB-Interface-no-funciona' into 'develop' 
Ent 9146 db interface no funciona

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9146

See merge request artica/pandorafms!4960
 2022-08-25 21:19:47 +00:00
Jimmy Olano 661c77e107 Merge branch 'ent-9321-bugs-en-consolas-visuales' into 'develop' 
fixed show modal label VC in list item pandora_enterprise#9321

pandora_enterprise#9321

See merge request artica/pandorafms!5036
 2022-08-25 21:07:36 +00:00
Jimmy Olano db6a76f005 Merge branch 'ent-9091-vista-setup-no-se-ve-bien' into 'develop' 
Ent 9091 vista setup no se ve bien

#9091 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9091

See merge request artica/pandorafms!5008
 2022-08-25 20:52:28 +00:00
Diego Muñoz-Reja 063814e29e Merge branch 'ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes' into 'develop' 
move massive aperation edit agent pandora_enterprise#8564

See merge request artica/pandorafms!5016
 2022-08-25 12:52:55 +00:00
Diego Muñoz-Reja 7f314436a8 Merge branch 'ent-9185-descuadre-en-la-ventana-modal-de-alertas-en-el-tree-view' into 'develop' 
Ent 9185 descuadre en la ventana modal de alertas en el tree view

See merge request artica/pandorafms!5009
 2022-08-25 12:51:33 +00:00
Diego Muñoz-Reja fe4e27018c Merge branch 'ent-9350-perdida-de-sincronizacion-en-modo-centralizado-y-duplicado-de-metaconsole_node_id' into 'develop' 
fixed error metaconsole_node_id pandora_enterprise#9350

See merge request artica/pandorafms!5056
 2022-08-25 12:48:26 +00:00
edu.corral 3d084c8da9 #9046 move edit os from setup to resources 2022-08-25 14:01:08 +02:00
artica 0b68dcd8cd Auto-updated build strings. 2022-08-25 01:00:20 +02:00
alejandro.campos@artica.es 748bd206ad implemented modules inventory report 2022-08-24 19:23:10 +02:00
alejandro.campos@artica.es af52895150 implemented modules inventory report 2022-08-24 19:22:20 +02:00
Diego Muñoz-Reja 6edd361142 Merge branch 'ent-9201-mergeador-bloqueo-pandora_db' into 'develop' 
add check locked bbdd in merge process pandora_enterprise#9201

See merge request artica/pandorafms!5041
 2022-08-24 10:29:30 +00:00
artica f0911021ab Auto-updated build strings. 2022-08-24 01:00:21 +02:00
Daniel Rodriguez c50d6a6c3b Merge branch 'ent-9442-14113-Sql-error-en-la-vista-de-consola' into 'develop' 
Ent 9442 14113 sql error en la vista de consola

See merge request artica/pandorafms!5064
 2022-08-23 13:42:02 +00:00
Daniel Rodriguez 3e7a21fe2e Merge branch 'ent-9426-Error-SQL-en-eventos-con-usuario-no-admin' into 'develop' 
fixed event filter

See merge request artica/pandorafms!5063
 2022-08-23 13:38:18 +00:00
Rafael 356ec65b9d improve remote database install 9441 2022-08-23 14:19:39 +02:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
alejandro.campos@artica.es 82bf0bd4f6 fixed event filter 2022-08-23 11:42:52 +02:00
artica 59906ded78 Auto-updated build strings. 2022-08-23 01:00:18 +02:00
artica c4119fe0d3 Auto-updated build strings. 2022-08-22 01:00:17 +02:00
artica 58f3f3ab72 Auto-updated build strings. 2022-08-21 01:00:17 +02:00
artica fb751e7d24 Auto-updated build strings. 2022-08-20 01:00:18 +02:00
artica 96413af66e Auto-updated build strings. 2022-08-19 01:00:20 +02:00
Rafael Ameijeiras 2fdb4f0302 clean old dockerfiles open 2022-08-18 11:31:00 +02:00
artica 7e0b74be0c Auto-updated build strings. 2022-08-18 01:00:23 +02:00
alejandro.campos@artica.es 9f28e6f7fb minor fix 2022-08-17 13:31:12 +02:00
artica 4c743e7565 Auto-updated build strings. 2022-08-17 01:00:18 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Rodriguez 1295db63bb Merge branch 'ent-9398-falta-campo-fixed_ip-en-tmetaconsole_agent' into 'develop' 
Ent 9398 falta campo fixed ip en tmetaconsole agent

See merge request artica/pandorafms!5059
 2022-08-16 10:51:53 +00:00
Diego Muñoz-Reja 43918f4c4a Merge branch 'ent-9397-PHP7-2-Error-500-en-edicion-de-agente-2' into 'develop' 
fixed 500

See merge request artica/pandorafms!5058
 2022-08-16 10:38:02 +00:00
edu.corral 86a0847f2a ent 9398 fixed ip tmetaconsole_agent 2022-08-16 12:37:40 +02:00
edu.corral 0d5640bf9b ent 9398 fixed ip field tmetaconsole_agent 2022-08-16 12:31:42 +02:00
alejandro.campos@artica.es e6739e16b8 fixed 500 2022-08-16 11:56:05 +02:00
artica a8e10e4c26 Auto-updated build strings. 2022-08-16 01:00:11 +02:00
artica 29e07520c8 Auto-updated build strings. 2022-08-15 01:00:09 +02:00
artica f2c8ddaf85 Auto-updated build strings. 2022-08-14 01:00:13 +02:00
artica 363b86271a Auto-updated build strings. 2022-08-13 01:00:07 +02:00
artica 42df214771 Updated version and build strings. 2022-08-12 12:44:29 +02:00
Daniel Rodriguez 80e7145639 Merge branch 'ent-9393-13837-problema-webserver-con-regex-para-curl' into 'develop' 
Fix golitat check string curl

See merge request artica/pandorafms!5057
 2022-08-12 10:33:28 +00:00
Calvo 3cd0e915e5 Fix golitat check string curl 2022-08-12 12:06:16 +02:00
Daniel Rodriguez 413206f83a Merge branch 'ent-9207-13837-problema-webserver-con-regex' into 'develop' 
Fix Goliat LWP

See merge request artica/pandorafms!5053
 2022-08-12 09:55:51 +00:00
Daniel Barbero 50bb50418d fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:34:35 +02:00