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

14002 Commits

Author SHA1 Message Date
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
enriquecd d87dae44db Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92 2017-03-13 11:50:37 +01:00
daniel 43aaee9ae3 add templates for email in templates alerts and mail to admin command 2017-03-13 11:16:35 +01:00
Ramon Novoa 4a0a9bbd37 Move the Recon module to PandoraFMS. 2017-03-13 11:14:21 +01:00
m-lopez-f ed83c756e2 Fixed problems with search data in general search. Gitlab: #508 2017-03-13 09:49:19 +01:00
Arturo Gonzalez b5168928e8 Merge branch 'develop' into move_mr_to_um 2017-03-13 08:42:08 +01:00
daniel 7605de5794 Revert "add new templates for email in mail to admin and templates field3 and recovery" 
This reverts commit c347164f73.
 2017-03-13 08:40:20 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
enriquecd 6b625197ec Print metaconsole footer in buttom and change marks order - open - #517 2017-03-10 17:42:55 +01:00
daniel c347164f73 add new templates for email in mail to admin and templates field3 and recovery 2017-03-10 15:30:56 +01:00
fermin abf4d88955 Added df_percent_used_op.vbs (op version) 2017-03-10 15:01:53 +01:00
Alejandro Gallardo Escobar c795f56feb Fixed functions_agents.php 2017-03-10 14:58:19 +01:00
Enrique Camargo 3902314e82 Merge branch '92-ordenacion-de-usuarios' into 'develop' 
Massive operation profile actions - users select box  now is  ordered by user_id(primary name) - #92

See merge request !243
 2017-03-10 14:20:14 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
enriquecd 1dce7623f8 Massive operation profile actions - users select box now is ordered by user_id(primary name) - #92 2017-03-10 13:58:36 +01:00
daniel b7bf236f3c fixed error in macros send mail 2017-03-10 13:51:27 +01:00
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
Ramon Novoa 472d484583 Fix a typo. 2017-03-10 12:04:35 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
nramon c602872cc2 Merge branch 'feature#new-iface-names' into 'develop' 
Feature#new iface names

See merge request !242
 2017-03-10 11:02:31 +01:00
Ramon Novoa a022592e10 Merge the Recon module from the Satellite Server. 2017-03-10 10:36:37 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00