14570 Commits

Author SHA1 Message Date
vgilc
4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop'
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
2017-04-25 16:21:00 +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
vgilc
d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop'
Added macro _agentos_

See merge request !275
2017-04-25 16:18:00 +02:00
vgilc
a8d3ea7454 Merge branch '678-estadísticas-de-eventos-con-gráficas-desiguales' into 'develop'
Fixed size graphs in event_statistics

See merge request !340
2017-04-25 16:17:12 +02:00
vgilc
8802f1cdca Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop'
Fixed text overflow in help window

See merge request !332
2017-04-25 16:16:29 +02:00
Arturo Gonzalez
8383552a1f Added minor changes to ux widget 2017-04-25 16:16:25 +02:00
vgilc
ea6afb3701 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop'
Added floating control in agents/modules, event list and snmp traps list

See merge request !351
2017-04-25 16:15:41 +02:00
vgilc
48939e10e7 Merge branch '716-delete_all_checkbox_in_report_items' into 'develop'
Added checkbox to selet all items in report (to delete them)

See merge request !366
2017-04-25 16:06:34 +02:00
vgilc
dfd0bb38e8 Merge branch '672-change_forums_url_in_wellcome_window' into 'develop'
Changed forums url in wellcome window

See merge request !343
2017-04-25 16:05:34 +02:00
enriquecd
7ee4c77897 Change update manager offline icon - #783 2017-04-25 15:37:52 +02:00
artica
4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
Arturo Gonzalez
078d5e4357 Added data donut to ux widget 2017-04-25 15:34:11 +02:00
daniel
f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +02:00
vgilc
ed2597fab7 Merge branch 'Borrado-1.sql-dev' into 'develop'
deleted 1.sql

See merge request !403
2017-04-25 10:42:26 +02:00
Daniel Maya
bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00
daniel
13e2f2d05b fixed error duplicate alert SNMP 2017-04-25 09:30:59 +02:00
artica
d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
vgilc
d43de4f8ec Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales-2' into 'develop'
Change left margin in pie float - #99

See merge request !401
2017-04-24 17:44:41 +02:00
enriquecd
f2d52e80b6 Chango left margin in pie float - #99 2017-04-24 17:29:13 +02:00
vgilc
f0819db5c7 Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales-2' into 'develop'
Change default pie custom graph width size in visual console custom graph creator - #99

See merge request !400
2017-04-24 16:22:34 +02:00
enriquecd
c7af5c3b07 Change default pie custom graph width size in visual console custom graph creator - #99 2017-04-24 16:09:09 +02:00
artica
e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7b68dab8746940fe85f5507fe3ccc6b.
2017-04-24 15:59:34 +02:00
artica
8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
vgilc
19fb8eaf27 Merge branch '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open-2' into 'develop'
Change strings in minor release update manager / open / 2 - #486

See merge request !399
2017-04-24 13:50:35 +02:00
enriquecd
7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
Daniel Maya
3f6adf9f65 Fixed error in cron 2017-04-24 12:39:11 +02:00
vgilc
ba17d7793a Merge branch '139-no-se-ven-alias-de-agentes-con-acl-estricto-ext-3943' into 'develop'
fixed errors in agent detail acl strict

See merge request !397
2017-04-24 10:56:39 +02:00
daniel
8e481dc473 fixed errors in agent detail acl strict 2017-04-24 10:41:23 +02:00
artica
0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica
37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica
37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
Arturo Gonzalez
a2cff4195f Added code to autocomplete with ux transactions 2017-04-21 14:32:31 +02:00
artica
f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
Arturo Gonzalez
b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez
87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez
82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
Arturo Gonzalez
5b015dbcb9 Added new icon to meta mail setup and change mail message 2017-04-20 16:11:45 +02:00
Arturo Gonzalez
d93fa1bb3f Added new option to enable and disable reset pass 2017-04-20 15:31:39 +02:00
Arturo Gonzalez
14a3a79eb3 Changed cod type 2017-04-20 15:00:24 +02:00
vanessa gil
c3ccb00b2a new file. 2017-04-20 13:36:03 +02:00
vgilc
11b7212380 Merge branch 'changes-in-ntwrkmap-dev' into 'develop'
Added nodes regeneration in map group updates

See merge request !388
2017-04-20 13:28:55 +02:00
Arturo Gonzalez
4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
Arturo Gonzalez
ad065e2464 Changed cron help message 2017-04-20 12:56:22 +02:00
Arturo Gonzalez
63254ac7e4 Move mail setup section to enterprise setup 2017-04-20 12:54:15 +02:00
vgilc
868f84f3c4 Merge branch '126-problemas-en-el-visor-de-eventos-android' into 'develop'
Moved the project to the new Android Studio and bugfixes

Closes #126

See merge request !387
2017-04-20 12:45:25 +02:00
Arturo Gonzalez
bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Alejandro Gallardo Escobar
363b781aef Moved the project to the new Android Studio and bugfixes
Fixed the error which caused the agent name was replaced by the event source when using Pandora FMS >v5.
Improvements on some horrible old code.
2017-04-20 12:21:29 +02:00
Arturo Gonzalez
a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
m-lopez-f
fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
Arturo Gonzalez
df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00