fbsanchez
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
fbsanchez
0d67d23cb6
quickShell support for ws_proxy_url
2019-10-23 19:19:38 +02:00
fbsanchez
66ceb93d04
minor changes and init.d script for websocket engine
2019-10-23 15:23:21 +02:00
fbsanchez
c963681098
Quick shell telnet improvements
2019-10-21 21:10:26 +02:00
fbsanchez
9d8bb880fa
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:50 +02:00
fbsanchez
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
fbsanchez
e24024d2f4
WS gotty extension - global
2019-10-17 15:31:17 +02:00
fbsanchez
4cceb38762
1st RC WebSocketProxy
2019-10-15 22:16:54 +02:00
fbsanchez
06f8f920b8
wip WS redirection
2019-10-15 17:20:23 +02:00
fbsanchez
3a9e5fa477
wip: gotty redirection experiment p2
2019-10-14 19:33:00 +02:00
fbsanchez
86170b3ad8
experiments
2019-10-14 07:59:29 +02:00
marcos.alconada
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
Jose Gonzalez
d7ca703c99
Cleaned the javascript call
2019-09-20 10:53:09 +02:00
Jose Gonzalez
914ac28151
Changed checkboxes for combo multiselect in File repository manager
2019-09-03 12:59:24 +02:00
Tatiana Llorente
eaf29b798a
Fixed minor visual bugs in black theme- #4194
2019-07-09 15:03:38 +02:00
Alejandro Fraguas
39ac83ae5e
Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'
...
Style changes - #4250
See merge request artica/pandorafms!2557
2019-07-01 10:02:02 +02:00
Alejandro Fraguas
47838a1134
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
...
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
2019-07-01 09:48:33 +02:00
Tatiana Llorente
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
fbsanchez
fc0d9463d5
Fixed
2019-06-25 12:07:56 +02:00
fbsanchez
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
Daniel Rodriguez
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
Tatiana Llorente
46f64f75c8
Fixed autorefresh in full screen - #3739
2019-06-18 14:54:40 +02:00
Luis Calvo
9bdf048fae
Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers
2019-06-17 16:39:27 +02:00
Luis Calvo
08c035a612
Refactorf SNMPBrowserWndow in one unique function
2019-06-17 16:33:57 +02:00
fbsanchez
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
Tatiana Llorente
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
Alejandro Fraguas
021ae9b1cd
Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop'
...
Ticket Resolved
See merge request artica/pandorafms!2227
2019-06-07 09:48:51 +02:00
fbsanchez
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
manuel
cc43e40694
Merge branch 'develop' into ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco
...
Conflicts:
pandora_console/extensions/agents_modules.php
2019-06-05 08:47:16 +02:00
fbsanchez
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
fbsanchez
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
manuel
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
manuel
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Rodriguez
f807c23df7
Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop'
...
Fixed policy import with centralized management in node
See merge request artica/pandorafms!2217
Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
2019-05-14 16:50:42 +02:00
Daniel Maya
26bc3af1d1
Fixed centralized mode message
2019-05-14 15:16:24 +02:00
manuel
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Daniel Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Tatiana Llorente
05261e7924
Changed styles from table database interface - #3904
...
Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
2019-04-17 11:49:49 +02:00
Tatiana Llorente
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Tatiana Llorente
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Tatiana Llorente
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
manuel
f0d664eec3
Fixed bug in Agent-Module fullscreen view
...
Former-commit-id: 7dfaa8e637af0d6a0865f5f6eb0505f79393d026
2019-03-27 12:29:15 +01:00
Tatiana Llorente
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
marcos.alconada
dcb0d5e1ee
Ticket Resolved
...
Former-commit-id: 82c331ef17b17a875ad5e6cb95177c035d8435bd
2019-02-28 16:44:37 +01:00
Daniel Maya
fd3762cabe
Fixed policy import with centralized management in node
...
Former-commit-id: f76d8a777c155aa706af34cbe2091b3c8bf09a9d
2019-02-27 16:26:15 +01:00
daniel
f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
Tatiana Llorente
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
artica
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
artica
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
tatiana.llorente@artica.es
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
vgilc
9d557ced84
Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'
...
implemented search filters for module group and agent group in module groups view
See merge request artica/pandorafms!1956
Former-commit-id: 622169f4682d7197e6551e96568f6ff17f313f08
2018-12-21 10:32:45 +01:00
vgilc
b9fd907933
Merge branch '2992-Realtime-Graph-decimales' into 'develop'
...
Implemented limitation decimals in y-axis realtime graphs
See merge request artica/pandorafms!1941
Former-commit-id: 0ca73da98323fa3880cccd96d12150228ce2dead
2018-12-21 10:25:57 +01:00
alejandro-campos
5c0f85a4bb
fix bug when searching non existing agent group in module groups view
2018-12-20 15:37:00 +01:00
daniel
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
alejandro-campos
420adb4630
implemented search filters for module group and agent group in module groups view
2018-11-12 13:02:37 +01:00
manuel.montes
a3f4bfaa3d
Implemented limitation decimals in y-axis realtime graphs
2018-11-07 13:57:47 +01:00
daniel
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
vgilc
08a8165b93
Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop'
...
Added number of times an alert is fired - #2827
See merge request artica/pandorafms!1823
2018-10-29 09:15:32 +01:00
daniel
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
vgilc
3ed5b97e1d
Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop'
...
Fixed bug in the construction of the name of the xml file
See merge request artica/pandorafms!1737
2018-10-25 13:20:05 +02:00
fermin831
e7663fc5f0
Fixed booleans realtime graphs
2018-10-17 19:20:22 +02:00
daniel
16be9488c8
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/include/functions_graph.php
2018-10-11 13:06:17 +02:00
fermin831
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
daniel
a59ecc7ef3
fixed minor error counters alert fired in module_group view
2018-10-05 11:55:06 +02:00
danielmaya
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
daniel
0ce7d3a2ed
fixed errors php7
2018-10-04 17:17:39 +02:00
fermin831
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
danielmaya
942c5391f9
Fixed agents/modules view. it shows nothing if there are no agents and modules selected
2018-10-03 10:31:45 +02:00
tatiana.llorente@artica.es
2dd10a4328
Added number of times an alert is fired - #2827
2018-10-02 12:35:20 +02:00
fermin831
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
fermin831
995bfe0fad
Removed unused code
2018-10-01 17:04:00 +02:00
vgilc
f73b4a55e6
Merge branch '2741-Refactorizar_vista_module_groups' into 'develop'
...
refactoriced view module_groups
See merge request artica/pandorafms!1788
2018-10-01 10:59:09 +02:00
danielmaya
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
daniel
26c08d9309
refactoriced view module_groups
2018-09-20 15:51:36 +02:00
Alejandro Gallardo Escobar
5f732d035b
Now the integer numbers of the Y axis of the realtime graphs are shorter
2018-09-17 13:13:10 +02:00
manuel.montes
a721eadcbd
Fixed bug in the construction of the name of the xml file
2018-09-07 08:36:06 +02:00
vgilc
69545d7ed8
Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop'
...
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios
See merge request artica/pandorafms!1708
2018-08-27 09:10:00 +02:00
fermin831
399c9c2d58
[Secondary groups] Fixed agent/modules view
2018-08-21 13:33:16 +02:00
Alejandro Gallardo Escobar
28336d3e1a
Update realtime_graphs.js
2018-08-20 09:53:11 +02:00
Alejandro Gallardo Escobar
5934f141a8
Fixed the incremental realtime charts
2018-08-17 13:17:27 +02:00
Alejandro Gallardo Escobar
568484cf6e
Fixed the incremental mode of the realtime charts and overall improvements
2018-08-02 14:59:10 +02:00
manuel.montes
7da00bca8a
Fixed bug in realtime_graphs.php
2018-06-18 11:12:38 +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
daniel
badfd83b0d
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
daniel
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
danielmaya
f8aa351987
Fixed line graph and box item when exporting visual consoles
2018-06-05 15:14:27 +02:00
danielmaya
89aa85626c
Fixed export and import visual consoles
2018-06-04 15:56:17 +02:00
fermin831
88e060893a
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts resolved:
pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
fbsanchez
2f8cdb5ea5
Added check_login to plugin registration
2018-05-28 11:31:09 +02:00
danielmaya
3f1a1a816b
Fixed id_agente lost in insert_data
2018-05-24 17:24:53 +02:00
fermin831
43447bbee4
[Rebranding] Minor ended fixed
2018-05-23 18:19:24 +02:00
fermin831
e71fd399fb
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts:
pandora_console/godmode/admin_access_logs.php
pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar
cada865042
Fixed XSS vulnerability
2018-05-18 11:00:41 +02:00
fermin831
d8f63e9963
[Rebranding] Some missing string in extension
2018-05-14 17:51:10 +02:00
fermin831
34b953964a
[Rebranding] Added rebranding to extensions
2018-05-09 13:42:20 +02:00
fermin831
bd3f0712f1
Added separated window view to SNMP realtime graphs
2018-05-04 10:58:37 +02:00
fermin831
8bc9805288
[Realtime Graphs] Added the hidden type snmp_module
2018-05-03 12:57:24 +02:00
fermin831
1001240cf4
[SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details
2018-03-15 16:03:46 +01:00
danielmaya
d8ad6d514e
Deleted console.log
2018-02-20 11:42:08 +01:00
danielmaya
17a1f8f390
Fixed group and agents filter in agents/modules
2018-02-20 11:36:30 +01:00
daniel
ad0b463d13
fixed errors acl
2018-01-30 17:44:51 +01:00
daniel
955c183cd8
fixed error ip validate
2018-01-08 11:12:07 +01:00
daniel
d2bc062766
fixed errors extensions agent-modules and recursion groups
2018-01-05 10:29:46 +01:00
danielmaya
6d4f460ef8
Fixed get oid
2017-12-05 12:13:38 +01:00
vgilc
2531e43d4a
Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop'
...
Change phrases in system logfile viewer - #1263
See merge request artica/pandorafms!968
2017-11-29 17:03:42 +01:00
enriquecd
130349e955
Put togehter error and info messages in db_status extension - #1530
2017-11-07 18:45:08 +01:00
enriquecd
8b11ba0e07
Merge branch 'develop' into 1125-Vista-de-Agente-Modulo
...
Conflicts:
pandora_console/extensions/agents_modules.php
2017-10-30 15:15:39 +01:00
vgilc
f654bdd241
Merge branch '1113-Enumeración-recursiva-de-grupos-en-vista-agente-modulo-3805-media-open' into 'develop'
...
Add recursion group search for agent/module view and angent/module item in reports - #1113
See merge request artica/pandorafms!812
2017-10-26 11:07:46 +02:00
enriquecd
4473d16727
Change phrases in system logfile viewer - #1263
2017-10-25 11:35:58 +02:00
enriquecd
5812b56e0b
Delete system info section file - #1350
2017-10-09 15:50:51 +02:00
daniel
b431be44cd
fixed minor error in db status
2017-10-06 09:40:48 +02:00
enriquecd
570a209861
Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350
2017-10-04 19:02:45 +02:00
daniel
b23f83036c
fixed errors in extension db status
2017-09-25 17:23:57 +02:00
enriquecd
dc33195358
Add recursion group search for agent/module view and angent/module item in reports - #1113
2017-09-11 17:20:07 +02:00
vgilc
df1489e08f
Merge branch '1194-Extension-DB-inface-en-panel-de-ultima-actividad' into 'develop'
...
Fix dbmanager when insert db activity in activity login info panel - #1194
See merge request !739
2017-09-11 09:42:56 +02:00
fbsanchez
629f5aa237
Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc
2017-09-04 16:20:20 +02:00
fbsanchez
ad0bedb4a8
Removed VNC & SSH extensions, go ehorus!
2017-09-01 13:49:23 +02:00
enriquecd
29703c708a
Disable autosubmit in agent module view - #1125
2017-08-28 11:14:04 +02:00
fbsanchez
ef132fde80
Removed sshgateway extension
...
Ehorus!!!!!
2017-08-21 19:48:19 +02:00
enriquecd
a399652873
Fix dbmanager when insert db activity in activity login info panel - #1194
2017-08-21 11:29:58 +02:00
vgilc
50a7ea3dd9
Merge branch '1045-Insert-data-pierde-información-dev' into 'develop'
...
Fixed agent lost in insert data
See merge request !614
2017-08-18 12:36:06 +02:00
vgilc
94f6683c16
Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop'
...
Change agent / module icons height a width - #1114
See merge request !659
2017-07-28 10:25:14 +02:00
vgilc
f855d25b54
Merge branch '1030-DB-Status-no-va' into 'develop'
...
Change connection data for mysql queries - #1030
See merge request !603
2017-07-13 11:29:53 +02:00
enriquecd
d9e6585234
Change agent / module icons height a width - #1114
2017-07-12 11:20:19 +02:00
Arturo Gonzalez
242667e162
Fixed selector
2017-06-27 11:10:07 +02:00
Daniel Maya
09d6991c92
Fixed agent lost in insert data
2017-06-22 17:00:30 +02:00
enriquecd
bd537cd891
Change connection data for mysql queries - #1030
2017-06-20 17:45:01 +02:00
Daniel Maya
c678d8ba50
Merge branch 'develop' into '330-Agentes-sin-alertas-dev'
...
# Conflicts:
# pandora_console/include/functions_ui.php
2017-06-20 11:06:24 +02:00
vgilc
7bfd3254a7
Merge branch '656-changes-in-system-log-viewer-dev' into 'develop'
...
Added changes
See merge request !518
2017-06-14 11:32:44 +02:00
vgilc
49e3beea27
Merge branch '869-Insert-data-no-funciona' into 'develop'
...
Fix insert data extension, bad parameters in xml format - #869
See merge request !492
2017-06-14 11:30:55 +02:00
Daniel Maya
f72f61c49e
Added new functionality to create alerts on modules without alerts
2017-06-01 16:54:51 +02:00
Arturo Gonzalez
6bf672a846
Added changes
2017-05-26 14:47:37 +02:00
enriquecd
61eb5e755e
Fix insert data extension, bad parameters in xml format - #869
2017-05-19 14:00:47 +02:00
m-lopez-f
bdde4e89e0
Only show files with extension is ptr.
2017-05-05 12:13:33 +02:00
Daniel Maya
eaf376094e
Fix problem with filters in agents / modules
2017-05-04 17:12:32 +02:00
Daniel Maya
6d1dc162e8
Added floating control in agents/modules, event list and snmp traps list
2017-04-07 12:08:42 +02: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
7f0359283d
Fixed problems with ACL permmisions. Gitlab: #451
2017-03-06 12:54:48 +01:00
m-lopez-f
0b943fcf08
Remove debug traces
2017-03-03 13:27:02 +01:00
Daniel Maya
811dc3ba8f
Added alias when group changed
2017-02-27 17:41:46 +01:00
Alejandro Gallardo Escobar
3d8af42834
Changed the agent name by its alias
2017-02-22 16:43:28 +01:00
daniel
bf29d4c5f9
fixed error in view agent/module
2017-02-21 17:21:10 +01:00
Daniel Maya
76cb61f288
Changes for the merge
2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar
58617c00aa
Merge branch 'develop' into feature/alias_friendly_name
2017-02-20 18:52:18 +01:00
daniel
65047c23a5
fixed errors in agent/module
2017-02-20 16:16:53 +01:00
Daniel Maya
3051ce4e23
Merge branch 'develop' into feature/alias_freandly_name
...
Conflicts:
pandora_console/include/functions_ui.php
2017-02-17 10:11:59 +01:00
Daniel Maya
d39b108c1f
Merge branch 'develop' into feature/alias_freandly_name
...
Conflicts:
pandora_agents/unix/pandora_agent
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/modificar_agente.php
pandora_console/godmode/agentes/planned_downtime.editor.php
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/godmode/massive/massive_edit_modules.php
pandora_console/include/class/Tree.class.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_treeview.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00