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

343 Commits

Author SHA1 Message Date
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
 2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707 
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
 2019-03-27 17:03:55 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them 
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
 2019-03-26 15:42:33 +01:00
fbsanchez 05c03d2d46 NetworkMap class 
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
 2019-03-20 17:22:06 +01:00
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
 2019-03-12 13:07:12 +01:00
daniel 560c6090a4 deprecated files 
Former-commit-id: e5c9fb8f58ee78207514d045b478f5d534d86f89
 2019-03-07 11:13:44 +01:00
daniel db150470cb fixed errors in custom net scan 
Former-commit-id: 15243259cbffa8c639e6412866349357753e1198
 2019-03-07 11:09:28 +01:00
fbsanchez 63ee3b0329 wip: style checks 
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
 2019-03-05 19:02:23 +01:00
Daniel Rodriguez e18eaaf415 Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop' 
Ent 3287 sincronizacion plugin de servidor

See merge request artica/pandorafms!2199

Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
 2019-02-27 09:58:42 +01:00
Daniel Maya 2c0c050507 Disabled cache in server plugin synchronization 
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
 2019-02-26 17:20:23 +01:00
Daniel Maya 45419fbfb0 Fixed href in plugins with centralized node 
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
 2019-02-26 12:23:46 +01:00
fbsanchez cdca720d9a minor fix user_edig 
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
 2019-02-25 14:41:27 +01:00
daniel 504a8e9d1a fixed warnings php 
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
 2019-02-25 13:02:39 +01:00
fbsanchez 797f922748 Discovery Tasklist minor fixes 
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
 2019-02-23 12:13:54 +01:00
Daniel Maya 12b8042c53 Added server plugins in meta 
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
 2019-02-22 14:26:58 +01:00
fbsanchez 64679ee72e discovery minor fixes 
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
 2019-02-21 18:00:50 +01:00
manuel ad3e2b88bf Minor fixes Wiz.Discovery 
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
 2019-02-21 11:19:38 +01:00
fermin831 0ed6c6d620 Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
 2019-02-20 16:54:52 +01:00
fbsanchez 1b82a970b1 WIP: App wiz 
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
 2019-02-19 14:36:16 +01:00
fermin831 cb94692491 Added function addBreadcrum in Wizard main 
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
 2019-02-18 14:30:03 +01:00
fermin831 a6bbd17423 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
 2019-02-18 10:24:35 +01:00
fermin831 a9caebbbf4 Put the list into a function 
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
 2019-02-18 10:24:19 +01:00
fermin831 2332001884 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Conflicts:
	pandora_console/godmode/servers/discovery.php

Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
 2019-02-18 08:50:54 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes 
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
 2019-02-15 18:05:59 +01:00
manuel e04a61df98 Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices 
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
 2019-02-15 14:03:29 +01:00
manuel 32d34cd09b Changed styles in host and devices 
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
 2019-02-15 14:02:32 +01:00
fbsanchez ec672d6bfb H&D network scan 
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
 2019-02-15 13:57:33 +01:00
Fermin 6c485795c7 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
 2019-02-15 13:48:08 +01:00
Fermin c9c855da9a Added new Cloud Wizard class 
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
 2019-02-15 13:47:11 +01:00
fbsanchez efdc17b801 WIP: H&D 
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
 2019-02-15 13:08:44 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov 
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
 2019-02-15 10:00:23 +01:00
fbsanchez 8acb658266 WIP: H&D 
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
 2019-02-14 13:27:49 +01:00
fbsanchez 6ff357595d Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices 
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
 2019-02-14 10:58:26 +01:00
fermin831 57991495e4 Use the CSV extension to import CSV on host and devices 
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
 2019-02-14 10:30:01 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer 
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
 2019-02-13 14:56:10 +01:00
manuel 27da41c7da WIP Host&devices 
Former-commit-id: cc18e55a30f72c606bb5b5736a5fa771987e0a45
 2019-02-12 14:39:01 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
manuel.montes 40bf163fed Disabled vlan vhen SNMP version is v3 2018-09-18 11:03:30 +02:00
manuel.montes cfec231107 Especified SNMP version in recon task 2018-09-17 12:48:08 +02:00
tatiana.llorente@artica.es 22bb52759c Resolved conflict - #2429 2018-09-13 16:25:53 +02:00
tatiana.llorente@artica.es d652a9c942 Created function that adds class checkselected and added inputs to select all in several tables - #2429 2018-09-13 16:07:40 +02:00
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
fermin831 cef3cb2ae0 [Console Plugins][Console Recon Scripts] Fixed deletion macro 2018-02-22 16:13:25 +01:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
Arturo Gonzalez 2521727ee1 Added ssh check connection 2017-08-24 11:05:10 +02:00
Arturo Gonzalez dce27f3ac2 Added new items to satellite editor view 2017-08-23 15:01:09 +02:00
enriquecd 912ec3dc34 Remove pandorfms name column link in server manager - #442 2017-06-07 15:05:19 +02:00
enriquecd 2df8eb9454 Add icon to recon server row in operation column for pandora servers view - #442 2017-05-17 15:08:05 +02:00
vgilc 5e72afaec8 Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop' 
Added tooltips in recon

See merge request !335
 2017-04-25 16:19:09 +02:00
Daniel Maya 7450e19d96 Added tooltips in recon 2017-03-31 13:56:43 +02:00
m-lopez-f 599a8b7e11 Fixed problems with remote config view files of conf about server and satellite. 2017-03-30 17:27:19 +02:00
daniel 0c52b0487f fixed visual error in recorn task 2017-03-23 09:57:50 +01:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
Ramon Novoa e12b7f0b58 Recon tasks do not generate random names currently. 2017-03-14 08:28:30 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
Arturo Gonzalez 7d6aae01cd Fixed interval field in recon task form 2017-03-08 13:56:10 +01:00
daniel 8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
m-lopez-f fb56c16e19 Fixed problems with ACL. Ticket: #4057 2016-09-23 10:13:54 +02:00
Daniel Maya a3cd8a7c86 FFixed editing plugins. Ticket #4032. 2016-09-15 15:47:10 +02:00
Arturo Gonzalez f9b1954d3e Deleted group All for agents in recontask creation menu 2016-09-13 15:11:17 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Daniel Maya 108340dbee Fixed bug in recontask form. Ticket #3960. 2016-08-29 12:56:23 +02:00
m-lopez-f 0367f88f56 Fixed problems with form in recon task. GitHub #59 2016-08-17 15:11:37 +02:00
daniel d855f72f59 ticket integria: 3980 fixed error link recon_task IPAM #25 2016-08-17 11:52:46 +02:00
fermin831 744b60cbd1 Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:49:17 +01:00
fermin831 f397b657f1 Added new server_keepalive column to have individual keepalive TICKETS #3273 2016-03-15 16:02:27 +01:00
mdtrooper 95525bf21d Add get servers from the type filter. TICKET: #1855 2016-01-21 14:21:01 +01:00
m-lopez-f 28aba1c646 Add not hidden parts of tactical view when this view have refresh. Tiquet: #2956 
(cherry picked from commit efabeb887b)
 2015-11-10 10:07:37 +01:00
fermin831 f5199099f1 Fixed unwanted traces into console due to server remote config implementation 2015-10-13 17:51:24 +02:00
fermin831 18e3c4a927 Added open files to server remote config 2015-10-09 16:00:34 +02:00
m-lopez-f 7a98fb79f7 Fixed problems with show data in recon task and save data. Tiquet: #2780 2015-10-02 15:02:35 +02:00
Arturo Gonzalez Diaz 2d7ae13c3f Fixed error in recon task (pandora with oracle db). Ticket #2640 2015-08-27 16:41:14 +02:00
Arturo Gonzalez Diaz 64fed83bbf Now when don't creates manage recontask, comes back to the creation page with the anterior values. Ticket #2543. 2015-08-18 16:59:43 +02:00
Arturo Gonzalez Diaz 6b82b9674a Fixed error in recontasks. Ticket#2594 2015-08-12 16:22:21 +02:00
Arturo Gonzalez Diaz 697357b0a3 Recon-task ACL changed. Ticket #2179 2015-07-23 16:30:15 +02:00
Arturo Gonzalez Diaz 49b0ef565b Update recon-task changed. Ticket #2179 2015-07-23 15:51:39 +02:00
Arturo Gonzalez Diaz 4629d46408 Permissions in recon-task changed. Ticket#2179 2015-07-23 11:57:06 +02:00
Arturo Gonzalez Diaz ad6c95413b Now is not possible create two recon task with the same name. Ticket #2179 2015-07-21 13:01:44 +02:00
Arturo Gonzalez Diaz 34a17df3b7 Permissions in recontask changed. Ticket #2179 2015-07-21 11:55:10 +02:00
mdtrooper 04b6621da5 Now the recon task editor avoid edit the ipam recons. TICKET: #2428 2015-07-15 18:15:30 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
m-lopez-f 98d51e7548 Change visual of nodo 2015-07-03 11:13:10 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
Alejandro Gallardo Escobar 4f9f8d2449 Fixed the title of the locked button dialog 2015-06-23 12:07:18 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar 7864e993d4 Error fixes 2015-06-09 12:43:12 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00