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

30940 Commits

Author SHA1 Message Date
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
Daniel Barbero cd1dfa6361 fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:32:07 +02:00
artica ec33fdcd3e Auto-updated build strings. 2022-08-12 01:00:22 +02:00
Jimmy Olano e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Diego Muñoz-Reja 4ebf49a7db Merge branch 'ent-9387-meta-php7-2-error-500-en-vista-alert-view' into 'develop' 
fixed 500 php7.2 pandora_enterprise#9387

See merge request artica/pandorafms!5054
 2022-08-11 12:10:03 +00:00
Daniel Barbero 9b3d7ba763 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 14:05:01 +02:00
Daniel Barbero de922dd0b2 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 13:52:34 +02:00
Calvo 1585f846f5 Fix Goliat LWP 2022-08-11 13:41:09 +02:00
Diego Muñoz-Reja 5d5ed8c719 Merge branch 'ent-9277-Traducción-de-nuevas-cadenas' into 'develop' 
Ent 9277 traducción de nuevas cadenas

See merge request artica/pandorafms!5045
 2022-08-11 09:51:59 +00:00
artica 815e466ee2 Auto-updated build strings. 2022-08-11 01:00:21 +02:00
Calvo 1ad4b96d4e Fix font notification redirection on meta 2022-08-10 15:58:35 +02:00
Calvo 9f8796580f Fix font notification redirection on meta 2022-08-10 15:55:06 +02:00
Daniel Rodriguez 622a9523f8 Merge branch 'ent-8756-ipam-desde-satelite' into 'develop' 
Add support for IPAM XML files.

See merge request artica/pandorafms!5046
 2022-08-10 13:34:55 +00:00
Daniel Maya d9ba72b818 resolved conflict 2 2022-08-10 14:28:30 +02:00
Daniel Rodriguez 82a343bbd0 Merge branch 'revert-cd1491fe' into 'develop' 
Revert "Merge branch 'ent-9191-Titulo-Notificaciones-de-usuario-mal' into 'develop'"

See merge request artica/pandorafms!5051
 2022-08-10 12:19:32 +00:00
Daniel Rodriguez 6aa99d8d0a Revert "Merge branch 'ent-9191-Titulo-Notificaciones-de-usuario-mal' into 'develop'" 
This reverts merge request !4975
 2022-08-10 14:18:34 +02:00
Daniel Maya e408b4258b resolved conflict 2022-08-10 14:11:05 +02:00
Jimmy Olano b10b9186bf Merge branch 'ent-9151-Ensanchar-los-boxes-de-agentes-módulos-en-paradas-planificadas' into 'develop' 
Ent 9151 ensanchar los boxes de agentes módulos en paradas planificadas

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

See merge request artica/pandorafms!5044
 2022-08-10 11:54:00 +00:00
Diego Muñoz-Reja cd1491fe9d Merge branch 'ent-9191-Titulo-Notificaciones-de-usuario-mal' into 'develop' 
Fix issue with header

See merge request artica/pandorafms!4975
 2022-08-10 11:45:37 +00:00
Daniel Barbero 88252ebb42 Merge remote-tracking branch 'origin/develop' into ent-8756-ipam-desde-satelite 2022-08-10 13:37:13 +02:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
Daniel Rodriguez 1fd8597840 Merge branch 'ent-9367-error-500-al-anadir-widget-en-dashboards-con-php-7-2' into 'develop' 
fix error pandora_enterprise#9367

See merge request artica/pandorafms!5048
 2022-08-10 10:31:28 +00:00
Daniel Barbero f81ab65d5e fix error pandora_enterprise#9367 2022-08-10 12:20:14 +02:00
artica 1dcf52273e Auto-updated build strings. 2022-08-10 01:00:21 +02:00
Diego Muñoz-Reja 23070102bc Merge branch 'ent-8545-gestion-de-agentes-del-satelite-desde-la-consola-consola' into 'develop' 
Ent 8545 gestion de agentes del satelite desde la consola consola

See merge request artica/pandorafms!5043
 2022-08-09 12:44:46 +00:00
Daniel Rodriguez b1ff477780 Merge branch 'ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val' into 'develop' 
new console report pandora_enterprise#6367

See merge request artica/pandorafms!5013
 2022-08-09 12:09:26 +00:00
Daniel Barbero 67f3a9c088 fix console report pandora_enterprise#6367 2022-08-09 14:01:55 +02:00
Daniel Rodriguez 994bc71f45 Merge branch 'ent-9282-13952-bug-en-filtrado-ipam' into 'develop' 
fix errors ipam pandora_enterprise#9282

See merge request artica/pandorafms!5040
 2022-08-09 11:40:59 +00:00
Daniel Barbero 0428aeab23 Merge remote-tracking branch 'origin/develop' into ent-9282-13952-bug-en-filtrado-ipam 2022-08-09 07:26:52 +02:00
artica 0579dc9162 Auto-updated build strings. 2022-08-09 01:00:20 +02:00