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

13976 Commits

Author SHA1 Message Date
vanessa gil 0eb8e9cb79 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-14 17:06:17 +01:00
Arturo Gonzalez 02b5400d2f Removed mr sql 2017-03-14 17:03:34 +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
m-lopez-f 3e46b001a1 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-14 16:47:25 +01:00
m-lopez-f ce576441fa Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518 2017-03-14 16:47:09 +01:00
vanessa gil 2ccde70442 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-14 16:46:57 +01:00
vanessa gil cc39f6d1a8 New file. 2017-03-14 16:46:21 +01:00
Arturo Gonzalez 252b43122e Added a new index.pot 2017-03-14 16:29:58 +01:00
Arturo Gonzalez aa157b575d Added new translation and fix an error. 2017-03-14 16:28:30 +01:00
Arturo Gonzalez 00ffbb6fcb New index.pot. Ticket #347 2017-03-14 16:21:07 +01:00
Arturo Gonzalez 0b62513fea Updated translations. Ticket #347 2017-03-14 16:17:13 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
vanessa gil fd4b62f604 Delete files 2017-03-14 15:47:11 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
mlopez e777e5be77 Merge branch 'revert-4dce98e2' into 'develop' 
Revert "Only stop service in windows when error not XML PARSER problems. Gitlab: #518"

See merge request !253
 2017-03-14 14:43:17 +01:00
mlopez 75e8926c11 Revert "Only stop service in windows when error not XML PARSER problems. Gitlab: #518" 
This reverts commit 4dce98e2d2
 2017-03-14 14:30:08 +01:00
Enrique Camargo 8b2c0d2e51 Merge branch '94-icono-fantasma-extension-fantasma' into 'develop' 
Not show Check ACL extension tab in agent view - #94

See merge request !252
 2017-03-14 14:10:57 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez fe23e81481 Fixed negative id to pandorafms node in networkmaps. 2017-03-14 13:38:19 +01:00
enriquecd 79b5f73844 Not show Check ACL extension tab in agent view - #94 2017-03-14 13:28:39 +01:00
Daniel Maya cdd2363912 ticket 348. Fixed problem of access to the database 2017-03-14 13:14:39 +01:00
m-lopez-f 4dce98e2d2 Only stop service in windows when error not XML PARSER problems. Gitlab: #518 2017-03-14 12:45:50 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
vanessa gil f18f2e1068 New file. 2017-03-14 12:11:16 +01:00
Ramon Novoa a314495a2e Do not reset the progress when multiple subnets are scanned. 2017-03-14 11:51:01 +01:00
Arturo Gonzalez 9cd9eb6fb4 Added filter to non-relation modules. (networkmap) 2017-03-14 11:30:41 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
vanessa gil f49d7f3eec New file. 2017-03-14 10:21:38 +01:00
Arturo Gonzalez 6f935f27ce Fixed recon task field to get subnet (networkmaps) 2017-03-14 08:53:41 +01:00
Arturo Gonzalez b70e8b8f6f Added all type of recon task to networkmap editor. 2017-03-14 08:35:16 +01:00
Ramon Novoa e12b7f0b58 Recon tasks do not generate random names currently. 2017-03-14 08:28:30 +01:00
Ramon Novoa fcb75ec1aa Clean blanks and HTML entities from recon tasks. 2017-03-14 08:28:12 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Ramon Novoa c00a072139 Update the version of the server installers for win32. 2017-03-13 18:07:26 +01:00
Enrique Camargo 294477a982 Merge branch '517-footer-metaconsola-vs-footer-consola-open' into 'develop' 
Print metaconsole footer in buttom and change marks order - open - #517

See merge request !244
 2017-03-13 17:46:42 +01:00
Arturo Gonzalez ca8910ad90 Added an image to new dialog styles. Ticket #486 2017-03-13 17:33:49 +01:00
Daniel Maya abf43a4230 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-03-13 17:24:34 +01:00
Daniel Maya 40562d56f2 Added alias in broker agents 2017-03-13 17:21:35 +01:00
artu30 2c8af1d54a Merge branch 'new_jquery_dialog_view' into 'develop' 
New styles to jquery dialog. (Header done)

See merge request !250
 2017-03-13 17:06:00 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
daniel 4e18b82165 Merge branch '493-fallan-los-adjuntos-de-graficas-en-los-envios-de-mail-de-alerta-open' into 'develop' 
493 fallan los adjuntos de graficas en los envios de mail de alerta open

See merge request !248
 2017-03-13 14:03:12 +01:00
Enrique Camargo 8d1e8cf49a Merge branch '93-caja-de-dialogo-de-alertas' into 'develop' 
Center alert modal window when is opened - #93

See merge request !247
 2017-03-13 13:57:00 +01:00
daniel 5872cd1f49 fixed errors in install.php mysql 2017-03-13 13:32:05 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
Enrique Camargo 4c243f28a2 Merge branch '92-ordenacion-de-usuarios-2' into 'develop' 
Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92

See merge request !246
 2017-03-13 12:04:53 +01:00