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

1381 Commits

Author SHA1 Message Date
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
fbsanchez 0b610cd8ba Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 13:39:08 +01:00
fbsanchez 430af38fa6 minor fixes in flow control 2019-11-11 13:38:27 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
Alejandro Fraguas cf3bcefddf Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop' 
Fixed planned downtime acl

See merge request artica/pandorafms!2829
 2019-11-04 11:25:17 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez 6d21f71617 removed trace 2019-10-28 18:38:56 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
Luis Calvo 33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +02:00
marcos ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Alejandro Fraguas 8407d7fe9a Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop' 
Added current gis location to agent gis view list

See merge request artica/pandorafms!2772
 2019-10-14 15:57:27 +02:00
Luis Calvo a1c4b3eaeb Fixed minor bug 2019-10-14 13:38:10 +02:00
fbsanchez 4c6d924495 Review remote execution modules 2019-10-11 12:50:29 +02:00
Daniel Barbero 4fedfe92fc fix is enterprise 2019-10-11 09:39:20 +02:00
Daniel Barbero 40076b0a55 remove debug 2019-10-09 17:33:06 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Daniel Rodriguez 0b14cb64b6 Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop' 
Fixed module update bug

See merge request artica/pandorafms!2769
 2019-10-08 14:30:49 +02:00
Luis Calvo 941362776e Fixed keepcounters ckbox bug 2019-10-08 14:06:30 +02:00
Luis Calvo 1eb0b27da3 Fixed module update bug 2019-09-27 16:09:11 +02:00
Daniel Maya 4e47aede4c Fixed modules_get_relations 2019-09-23 16:55:43 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2669
 2019-09-17 11:36:07 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop' 
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
 2019-09-11 16:47:40 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Rodriguez 81511d1ac4 Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop' 
Fixed empty http_auth_user and pass

See merge request artica/pandorafms!2656
 2019-09-03 12:09:04 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
marcos.alconada ff44666e41 fixed visual error2 2019-08-21 09:49:17 +02:00
marcos.alconada a77a72cea5 fixed visual error on Open 2019-08-20 13:07:47 +02:00
marcos.alconada d46e013567 fixed visual error! 
ç2
 2019-08-19 14:29:04 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
marcos.alconada 9cfa8be1e9 font size for jap and chinese adjusted agents 2019-08-06 14:35:15 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
Daniel Barbero Martin 6b6d852ceb Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server 
Conflicts:
	pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-17 15:06:38 +02:00
Daniel Barbero Martin 7f4701f22e exec server error wizard 2019-07-17 11:11:38 +02:00
Tatiana Llorente 0fbe7e0128 Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' 
Conflicts:
  pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-16 11:57:36 +02:00
Daniel Rodriguez ab7743b578 Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop' 
Changed disabled to readonly in agent name and id- #4307

See merge request artica/pandorafms!2578
 2019-07-16 11:52:12 +02:00
Daniel Rodriguez 5f3684fb4e Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop' 
Modified control for module edition

See merge request artica/pandorafms!2563
 2019-07-15 14:09:32 +02:00
Daniel Rodriguez 6765544b66 Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop' 
Added advice when a primary group will be selected when is currentl a secondary group

See merge request artica/pandorafms!2353
 2019-07-15 13:59:29 +02:00