1668 Commits

Author SHA1 Message Date
vanessa gil
0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil
2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
m-lopez-f
e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +01:00
vanessa gil
c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00
vanessa gil
d6fb515034 new file. 2017-03-21 12:23:46 +01:00
vanessa gil
d5a70bc15e Deleted files. 2017-03-21 12:04:05 +01:00
vanessa gil
cb1cd58d83 new file 2017-03-17 11:36:10 +01:00
Daniel Maya
317b5cfb04 Fixed the migration to pandora 7 2017-03-16 19:03:15 +01:00
Arturo Gonzalez
37fd8f8851 new sql mr 2017-03-16 12:23:25 +01:00
vanessa gil
5d09cfdef3 new file 2017-03-16 12:03:29 +01:00
vanessa gil
e7fa5d1f00 New file 2017-03-16 11:15:36 +01:00
vanessa gil
309ed42a8f New mr. 2017-03-15 17:20:16 +01:00
vanessa gil
def9172bb9 Deleted files. 2017-03-15 17:04:40 +01:00
vanessa gil
a094f67dd9 New file. 2017-03-15 15:50:36 +01:00
vanessa gil
025b8329ea Deleted oracle and postgre files. 2017-03-15 10:34:25 +01:00
vanessa gil
a85298d432 new file 2017-03-14 17:11:47 +01:00
vanessa gil
26339b39f0 delete file 2017-03-14 16:57:51 +01:00
vanessa gil
01945c3cb5 new mr 2017-03-14 16:56:00 +01:00
vanessa gil
32f984020b new mr
o
2017-03-14 16:51:38 +01:00
vanessa gil
cc39f6d1a8 New file. 2017-03-14 16:46:21 +01:00
vanessa gil
fd4b62f604 Delete files 2017-03-14 15:47:11 +01:00
vanessa gil
f18f2e1068 New file. 2017-03-14 12:11:16 +01:00
vanessa gil
f49d7f3eec New file. 2017-03-14 10:21:38 +01:00
Ramon Novoa
9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
m-lopez-f
68803706d4 Add querys to remove from DB graph availability widget. Gitlab: #470 2017-03-08 13:53:24 +01:00
vanessa gil
469c276512 Added file. 2017-03-08 13:26:06 +01:00
Ramon Novoa
dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
vanessa gil
bbab12f50e added file. 2017-03-08 13:12:31 +01:00
vanessa gil
ef0f55e2c2 added file. 2017-03-08 11:44:49 +01:00
daniel
631a4d0777 fixed minor error in table metaconsole_agent 2017-03-06 16:19:03 +01:00
daniel
8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
daniel
c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
vanessa gil
eea926255b Added new files. 2017-03-06 13:44:41 +01:00
Arturo Gonzalez
bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
Junichi Satoh
17015c4afc Fixed syntax error. 2017-03-03 16:05:58 +09:00
Arturo Gonzalez
217cffbf05 Merge um packages system. Ticket #439 2017-03-02 15:45:27 +01:00
daniel
45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Alejandro Gallardo Escobar
58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Arturo Gonzalez
651e7ea8e6 Changed migration file name. Ticket #297 2017-02-20 12:35:52 +01:00
Alejandro Gallardo Escobar
545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez
f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
Arturo Gonzalez
f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
enriquecd
c8c79e6fec Add session_time column to tusuario table - #61 2017-02-16 17:33:17 +01:00
Daniel Maya
d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
nramon
165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7'
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
2017-02-15 15:49:16 +01:00
Ramon Novoa
de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00
Arturo Gonzalez
584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez
5b7f4a5139 Merge branch 'develop' into feature/rolling_release
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
Arturo Gonzalez
46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +01:00
Arturo Gonzalez
1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00