Commit Graph

10519 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +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
Arturo Gonzalez dfa7552fcd New styles to jquery dialog. (Header done) 2017-03-10 09:41:07 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
enriquecd 94fceaaa5d Fix printing elements in visual console (revert) - #90 2017-03-09 19:52:37 +01:00
m-lopez-f a06389b652 Change size of rows in bulk add alerts. Gitlab: #490 2017-03-09 16:09:50 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f cb2ff6e9f8 Fixed problems with resize imgs when dont do it. Gitlab: #504 2017-03-09 12:50:51 +01:00
m-lopez-f 54d2ee6790 Remove file 2017-03-09 12:41:16 +01:00
daniel 66e7d71858 fixed errors in search tree view 2017-03-09 12:16:35 +01:00
m-lopez-f b0f600e9f0 Add AW acl in network exteension tool. Gitlab: #498 2017-03-09 11:55:12 +01:00
m-lopez-f baf16db154 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:40:32 +01:00
Arturo Gonzalez 944f891f93 Added modules nodes to non interface relacions. 2017-03-09 11:20:06 +01:00
daniel b7d44c4c62 add new macro in helps 2017-03-09 11:14:58 +01:00
Arturo Gonzalez 65fcfd7f4c Fixed module type in map relations, again, and now its true. 2017-03-09 11:06:51 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
Arturo Gonzalez 7dd279b902 Rewrite code to modules type cause it was broken. 2017-03-09 08:58:11 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
Arturo Gonzalez 6548443c82 Removed module tipe filter in networkmaps. 2017-03-08 16:09:08 +01:00
Ramon Novoa a832ae99ab Add icons for the Mainframe and Sync servers. 2017-03-08 14:59:24 +01:00
Arturo Gonzalez 7d6aae01cd Fixed interval field in recon task form 2017-03-08 13:56:10 +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 d79f2b421a Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-08 13:26:53 +01:00
vanessa gil 469c276512 Added file. 2017-03-08 13:26:06 +01:00