fbsanchez
39b6164526
snapshot viewer fix
2018-10-30 18:20:10 +01:00
vgilc
b1bf1d7b4b
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
2326 unificar vistas ux y wux en un mismo portal
See merge request artica/pandorafms!1917
2018-10-30 16:20:26 +01:00
fbsanchez
a58bde2118
fixed UX historical snapshot viewer
2018-10-30 16:12:48 +01:00
Ramon Novoa
6353af0482
Merge remote-tracking branch 'github/develop' into develop
2018-10-29 13:20:48 +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
9b4eeb5c84
Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
...
new function that adds a border to the image if the status is warning - #2723
See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
daniel
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
tatiana.llorente@artica.es
6adcba4b39
Changed url for widgets in public dashboard - #2888
2018-10-15 16:12:16 +02:00
Ramón Novoa
3e584747b3
Merge pull request #104 from sofwerx/https-proxy
...
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
2018-10-11 09:34:26 +02:00
daniel
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
vgilc
5668857914
Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
...
2479 errores en vista de alertas de meta
See merge request artica/pandorafms!1821
2018-10-02 15:37:08 +02:00
tatiana.llorente@artica.es
2dd10a4328
Added number of times an alert is fired - #2827
2018-10-02 12:35:20 +02:00
alejandro-campos
1c2743797e
Revert "fixed conflict"
...
This reverts commit 1d726d59f3
.
2018-10-01 18:16:55 +02:00
alejandro-campos
1d726d59f3
fixed conflict
2018-10-01 15:34:36 +02:00
alejandro-campos
6b14754137
fixed conflict
2018-10-01 15:30:43 +02:00
vgilc
706a3ca4c0
Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop'
...
fixed bug in meta alert view: action field (other than default) not showing
See merge request artica/pandorafms!1621
2018-10-01 14:45:16 +02:00
alejandro-campos
0c899f5078
Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta
...
Conflicts:
pandora_console/include/functions_ui.php
2018-10-01 14:03:30 +02:00
vgilc
62dcf0f342
Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop'
...
Fixed welcome icone
See merge request artica/pandorafms!1640
2018-10-01 12:38:49 +02:00
vgilc
ad5581f0c2
Merge branch '2491-Alert-view-meta' into 'develop'
...
fixed bug in meta alert view: agent names not showing in table
See merge request artica/pandorafms!1618
2018-09-28 10:39:52 +02:00
tatiana.llorente@artica.es
d36c10fa08
new function that adds a border to the image if the status is warning - #2723
2018-09-10 13:22:02 +02:00
Alejandro Gallardo Escobar
1de746ab69
Fixed a problem with the autocomplete agent cache
2018-08-17 15:03:24 +02:00
fermin831
18800feaae
Refactorized snapshot link on node
2018-08-02 13:02:33 +02:00
vgilc
fcda8f56f9
Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'
...
fixed bug: when system timezone is equal to your timezone, dont show the…
See merge request artica/pandorafms!1645
2018-08-01 15:20:08 +02:00
alejandro-campos
443b70c39d
fixed bug: when system timezone is equal to your timezone, dont show the different timezones warning
2018-07-30 16:25:38 +02:00
daniel
d740240a51
fixed error data string show
2018-07-27 14:07:02 +02:00
samucarc
21db360ab8
Fixed welcome icone
2018-07-26 17:44:31 +02:00
daniel
3985316a9b
fixed errors in policies metaconsole
2018-07-26 12:41:09 +02:00
fermin831
cb0351de99
Fixed question mark hel header meta
2018-07-20 12:29:34 +02:00
alejandro-campos
b5c378d589
fixed bug in meta alert view: action field (other than default) not showing
2018-07-19 13:55:16 +02:00
alejandro-campos
5258d69e7e
fixed bug in meta alert view: agent names not showing in table
2018-07-18 17:44:18 +02:00
daniel
2c9a613f1b
fixed visual erros in metapolicies
2018-07-13 12:30:18 +02:00
Alejandro Gallardo Escobar
a258dc7e43
Fixed a message
2018-06-12 10:04:33 +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
fermin831
1391f8cc11
[Rebranding] Fixed get header logo on metaconsole
2018-05-29 12:45:08 +02:00
fermin831
a54c074b11
[Rebranding] Added hide help on node
2018-05-25 10:29:40 +02:00
fermin831
750ed29ac9
[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable
2018-05-24 16:59:50 +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
fermin831
946e897db6
[Rebranding] Get the correct header logo in the metaconsole
2018-05-22 15:26:11 +02:00
fermin831
2e8e3c27b6
[Rebranding] Modified tinylogo by custom_logo in node
2018-05-22 13:40:23 +02:00
Fermin
8f2302630c
[Rebranding] Docs and Support login icons are configurables
2018-05-21 14:29:11 +02:00
Fermin
0d6115726a
[Rebranding] Open include root files (except networkmaps related sources)
2018-05-11 12:49:16 +02:00
fermin831
57fb63bd91
Fixed snapshots view in string data
2018-05-07 19:40:38 +02:00
Ian Blenke
ecf21f1f45
Adding a check for HTTP_X_FORWARDED_PROTO in ui_get_full_url()
2018-03-29 10:57:23 -04:00
fermin831
a8cb366508
[Alerts view] Fixed validation in alerts view
2018-03-14 17:24:34 +01:00
fermin831
74f899736f
[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work
2018-03-12 15:17:59 +01:00
fermin831
e37768097f
[Visual] Refixed help images on node
2018-02-28 12:16:43 +01:00
fermin831
6093f6a0d8
[Metaconsole] Fixed img broken links on metaconsole
2018-02-28 12:08:15 +01:00
danielmaya
c54090a614
Fixed messages in warning popup
2018-01-05 11:32:16 +01:00
enriquecd
516c3b8d47
Fix pagination - #1728
2017-12-21 17:01:19 +01:00
enriquecd
e902baaf9d
Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574
2017-11-16 12:46:19 +01:00
Arturo Gonzalez
eb39d25c4b
Added field to get string modules
2017-11-10 15:03:52 +01:00
vgilc
2d87172558
Merge branch 'vulnerabilidad-en-consola' into 'develop'
...
Resolve: Vulnerabilidad en consola
See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
Alejandro Gallardo Escobar
83becb3e80
[Console] Fixed an error into the 'ui_print_truncate_text' function
2017-11-06 15:18:55 +01:00
Arturo Gonzalez
50e7e5fc17
Added changes to sort json in ajax return
2017-10-31 16:39:58 +01:00
Alejandro Gallardo Escobar
c687e6a97b
[Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function
2017-10-27 13:25:27 +02:00
daniel
4430a7b2fe
fixed errors in autocomplete field
2017-09-05 12:35:21 +02:00
daniel
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
daniel
fe2a2a36e8
fixed minor errors in WUX
2017-08-30 16:09:11 +02:00
Arturo Gonzalez
0eabf7a0ce
Do the autocomplete field correct
2017-08-30 15:52:28 +02:00
daniel
9c141c9049
fixed errors wux
2017-08-23 17:21:15 +02:00
daniel
4dfbdca423
add new field table view agents for type of agent
2017-07-24 15:53:31 +02:00
vgilc
87db7368c0
Merge branch '1028-Filtro-de-búsqueda-Agent-Detail-se-borra-al-cambiar-de-página-dev' into 'develop'
...
Fixed error in filter pagination
See merge request !597
2017-06-22 10:21:40 +02:00
Daniel Maya
a81b5b8239
Fixed error in filter pagination
2017-06-20 10:52:02 +02:00
Daniel Maya
f07f0d1a00
fixed conflict
2017-06-14 12:06:41 +02:00
Daniel Maya
f72f61c49e
Added new functionality to create alerts on modules without alerts
2017-06-01 16:54:51 +02:00
vgilc
3aa4fc7315
Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop'
...
Removed old code that breaks the autorefresh pause
See merge request !538
2017-06-01 09:32:42 +02:00
vgilc
4e4415a102
Merge branch '826-Error-en-paginación-de-usuarios-despues-de-borrar-crear-un-usuario' into 'develop'
...
Pagination links include delete, create and other params, now not use these para…
See merge request !442
2017-05-31 17:38:54 +02:00
Arturo Gonzalez
4ba94f065e
Removed old code that breaks the autorefresh pause
2017-05-31 16:40:10 +02:00
vgilc
8be3e434c8
Merge branch '761-pandora-ux-widget-dev' into 'develop'
...
761 pandora ux widget dev
See merge request !414
2017-05-17 17:39:52 +02:00
enriquecd
626111279b
Pagination links include delete, create and other params, now not use these params, and not retry the previous action - #826
2017-05-08 16:55:05 +02:00
Arturo Gonzalez
ba312476e3
Changed help section in cascade protection help button and fixed help language.
2017-04-27 15:49:23 +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
Arturo Gonzalez
a2cff4195f
Added code to autocomplete with ux transactions
2017-04-21 14:32:31 +02:00
vgilc
ca7d887bd4
Merge branch '108-tooltip-de-descripcion-cortado-por-comillas' into 'develop'
...
Show quotes in module template managment items description - #108
See merge request !316
2017-04-07 12:48:18 +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
enriquecd
4d4f4669ac
Show quotes in module template managment items description - #108
2017-03-29 11:25:50 +02:00
enriquecd
15749e323f
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562
2017-03-24 13:07:49 +01:00
fermin831
9354e845f7
Changed some icons
2017-02-28 19:17:38 +01:00
fermin831
4ae8963e2e
Added events active filter view (open side)
2017-02-28 15:41:03 +01:00
daniel
7609e85d3e
fixed errors in tab menu
2017-02-23 09:23:27 +01:00
Alejandro Gallardo Escobar
3d8af42834
Changed the agent name by its alias
2017-02-22 16:43:28 +01:00
m-lopez-f
1e4d784e72
Remove text from header and only indicated name of networkmap or agents. Gitlab: #353
2017-02-22 13:48:11 +01:00
Alejandro Gallardo Escobar
c26eb06adb
Now the function to print the agent name prints the alias by default. This behaviour can be modified by changing a parameter
2017-02-22 12:51:55 +01:00
Daniel Maya
c21bbfd88c
Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name
2017-02-21 15:31:45 +01:00
Daniel Maya
76cb61f288
Changes for the merge
2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar
430ae3e201
Merge branch 'develop' into feature/alias_friendly_name
...
Conflicts:
pandora_console/include/functions_ui.php
2017-02-21 15:23:44 +01:00
enriquecd
48a04d6c47
Improve custom graph interface - #66
2017-02-21 12:18:18 +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
daniel
cfb7a3a88e
fixed tabs in reports
2017-02-16 15:40:56 +01:00
m-lopez-f
68bdcdd74f
Fixed typo error
2017-02-15 13:43:15 +01:00
m-lopez-f
1fe9ded0fc
Add changes of visual mobile version of pandora. Gitlab: #148
2017-02-13 16:06:17 +01:00
enriquecd
18f1c96917
Show only service name in green header for service maps - #230
2017-02-07 13:58:04 +01:00
enriquecd
a6f546c8d8
Fix image pandora UX modules links - #90
2016-11-22 11:52:16 +01:00
m-lopez-f
ddf4366017
Fixed problems with user have AR bit and add column that didn't see in module and alerts list. Ticket: #4193
2016-11-15 11:21:04 +01:00
enriquecd
367c88fc9e
Fix icon bug and async string data without data:image string, Pandora UX #90
2016-11-07 13:49:33 +01:00
m-lopez-f
2476e499cf
Only show force button when user have a correct permmisions. Ticket: #3912
2016-11-03 15:41:31 +01:00
enriquecd
6f028ddd79
Change de menu_tab_left header style and checkboxes size - #54 #98
2016-10-24 13:34:08 +02:00
Daniel Maya
cf3d44872f
Changed agent name
2016-10-06 12:10:10 +02:00
enriquecd
78f5d79638
fix visual errors
2016-09-29 15:02:12 +02:00
m-lopez-f
aa553c14b3
Fixed version mobile in metaconsole version. Internal ticket: 79
2016-09-28 16:56:05 +02:00
m-lopez-f
657cd44a30
Revert "Fixed version mobile in metaconsole version"
...
This reverts commit a5e14a26bb
.
2016-09-28 16:06:51 +02:00
m-lopez-f
a5e14a26bb
Fixed version mobile in metaconsole version
2016-09-28 16:04:13 +02:00
enriquecd
b722e70620
Changes on enterpise alert icons, limit screens and favicons
2016-09-28 13:26:58 +02:00
Daniel Maya
9a39798f43
Changed agent name in tree view, alert status, agent/alert view and agent/modules view.
2016-09-26 10:58:42 +02:00
Daniel Maya
21dd508e53
Changed name by alias. Ticket #74 .
2016-09-22 10:27:35 +02:00
enriquecd
775644c247
Change menu header title truncate
2016-09-20 11:21:15 +02:00
enriquecd
a051243b64
GUI improvement, add enterprise edition popup - ticket gitlab 49/68
2016-09-19 16:20:18 +02:00
Alejandro Gallardo Escobar
a87de02e0b
Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections
...
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
2016-06-08 19:17:39 +02:00
mdtrooper
1facd4d69f
Some fixes in the skins.
2016-03-30 13:05:08 +02:00
mdtrooper
110241ecc8
Change the rossete icon for long strig module values in the console for a dialog. TICKET: #3019
2016-01-18 16:58:24 +01:00
mdtrooper
82c890410d
Now the dates are showed in the locale of user. TICKET: #2487
2016-01-18 11:54:17 +01:00
Arturo Gonzalez Diaz
435b7381de
Fixed broken image in module graph (meta). Ticket #2574
2015-08-17 14:54:04 +02:00
Arturo Gonzalez Diaz
52dc70143e
Fixed broken image in module graph (meta). Ticket #2574
2015-08-17 13:45:24 +02:00
Alejandro Gallardo Escobar
f8a5c503bf
Improved some js include functions to echo the htm tags
...
-Functions:
ui_require_javascript_file
ui_require_jquery_file
ui_include_time_picker
2015-08-10 17:03:40 +02:00
Alejandro Gallardo Escobar
3eddf9dbdc
Fixed another SQL injection point
2015-08-04 12:49:54 +02:00
m-lopez-f
b3c0d99fd2
Merge branch 'develop' into feature/NewView
2015-06-25 10:49:45 +02:00
m-lopez-f
94c742bfbe
Merge from Develop
2015-06-25 10:40:35 +02:00
Alejandro Gallardo Escobar
c80ba963ed
Added the awesome Underscore.js library
2015-06-24 19:16:58 +02:00
Alejandro Gallardo Escobar
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
m-lopez-f
9e528d0459
Change visual of console
2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar
11d50f06ba
Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties
2015-06-11 12:08:14 +02:00
mdtrooper
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
mdtrooper
b96fdad6d8
Sanitized the project (clean code and removed the deprecated htmLaWed)
2015-06-08 09:18:00 +02:00
m-lopez-f
90d6ea15cf
Merge branch 'develop' into feature/NewView
2015-04-27 10:12:45 +02:00
m-lopez-f
a7117fca61
Changed visual and changed images
2015-04-22 09:51:34 +02:00
m-lopez-f
50282ad121
Change image in print warning and add new images and chenge images
2015-04-21 18:03:08 +02:00
m-lopez-f
dc09a9a14e
Change visual and add new images
2015-04-21 17:26:20 +02:00
Alejandro Gallardo Escobar
968c179c0c
Merge branch 'develop' into feature/meta-agent-cache
2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar
190e105baa
Merge branch 'develop' into feature/meta-agent-cache
2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar
08dd1832ac
Found and removed the async ajax calls (finally!). That was a very bad practice.
...
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
2015-04-16 13:29:23 +02:00
m-lopez-f
a77d962590
Modify styles in tactical view and tables is responsibe with window size
2015-04-15 11:28:07 +02:00
m-lopez-f
25277eb550
Fixed menu smtp from agent detail and modify agent
2015-04-15 10:26:48 +02:00
m-lopez-f
2d9168ac8f
Changed styles from views in nodo
2015-04-15 09:45:13 +02:00
m-lopez-f
e29497c394
Changed style of Nodo
2015-04-10 09:43:44 +02:00
m-lopez-f
878c676c76
Fixed hidden menu and preparated immovable menu
2015-04-07 09:50:46 +02:00
m-lopez-f
d04575bec4
Changed visual of console
2015-04-06 15:30:53 +02:00
m-lopez-f
912462c71a
Solvented visualization of group in few views, tiquet: #1946
2015-03-18 11:46:27 +01:00
mdtrooper
1b5779eb57
Fixed the bug when the group name is showed instead the icon
2015-03-16 17:47:19 +01:00
mdtrooper
c11a81dbef
Fixed the ajax calls with timepicker in other languages instead english.
...
(cherry picked from commit 15c93c3bd9
)
Conflicts:
pandora_console/include/ajax/module.php
2015-02-19 18:37:12 +01:00
Alejandro Gallardo Escobar
c1ea771de0
Reduced the distance between the toggle and the content
2015-02-04 12:42:40 +01:00
Alejandro Gallardo Escobar
265dda2a3f
Merge branch 'develop' into feature/NewTreeView
...
Conflicts resolved:
pandora_console/include/ajax/module.php
pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
Sancho Lerena
82abedb021
Solved a problem with autorefresh URL. This fixes problem on refreshing the same URL for a long time (p.e: 4 hours). Problem was the filename was not passed, and this, in someway, makes the whole system to add parameters to the right until it too long and breaks it.
...
To avoid other problems, I've added a safe check to see if coming URL contains "index.php" before adding it. Tested on several subcomponents and works.
2015-01-09 16:10:14 +01:00
mdtrooper
ce7ca44e8a
Fixed the return icon when is unknown
2014-12-19 13:16:31 +01:00
mdtrooper
f25440d68a
Working in the improves of agent view. Ticket: #1285
2014-12-03 16:30:36 +01:00
mdtrooper
303b4f148f
Added feature to set bbcode links in agents description and custom fields. Ticket #1404
2014-12-02 16:38:07 +01:00
mdtrooper
bda09a22e1
Added in setup visual a check for to show the group as text. Ticket: #1501
2014-11-20 15:06:11 +01:00