a06f56a413
added function to convert cidr prefixes to mask
2019-10-23 17:22:18 +02:00
4e56f6751a
Continue work diagnostics
2019-10-17 15:17:28 +02:00
c9cfbf0bf2
Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
...
Ent 4461 configuracion integracion integria
See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
0df2447770
added comment management and fixed some errors in incident edition
2019-09-20 12:37:47 +02:00
8acdde9f3a
Added date filter - #4642
2019-09-18 18:19:29 +02:00
eb271a93eb
Added button for export to csv - #4642
2019-09-18 15:32:36 +02:00
84d1979c9e
fixed error percentil label
2019-09-18 11:15:55 +02:00
f2a6dbb60e
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
2019-09-17 14:56:54 +02:00
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
027f9fd9d4
New view - List of Integria IMS tickets - #4642
2019-09-17 12:59:29 +02:00
ca6fe42298
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
2019-09-13 12:00:04 +02:00
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
c46686981e
Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop'
...
modified function to export audit csv to decode entities as separator
See merge request artica/pandorafms!2692
2019-08-30 14:29:44 +02:00
f423ddc42f
modified function to export audit csv to decode entities as separator
2019-08-30 09:42:58 +02:00
fadccf0ff3
Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop'
...
Fixed bug in public visual console view
See merge request artica/pandorafms!2672
2019-08-26 13:12:31 +02:00
e439e7349f
Fixed bug in public visual console view
2019-08-21 09:22:13 +02:00
5ab2bfacbd
Modified date formatting to avoid entities
2019-07-25 15:43:46 +02:00
5cdfb871a1
Modified the divider in print_audit_csv function
2019-07-25 15:35:57 +02:00
7fa95d3e43
PHP-FPM
2019-07-17 17:20:09 +02:00
fc0d9463d5
Fixed
2019-06-25 12:07:56 +02:00
265202f1ed
Merge branch 'ent-4136-button-styles' into 'develop'
...
Review 1
See merge request artica/pandorafms!2470
2019-06-20 16:35:12 +02:00
4424189632
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-06-19 10:51:34 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
419a90d69c
wip event list
2019-06-07 17:35:13 +02:00
419b3f4fb1
Fixed module_manager with Agent limit surpassed or license expired
2019-06-03 10:47:54 +02:00
eb5ee75d33
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-06-03 09:18:49 +02:00
94153b823f
Help links
2019-05-30 11:25:09 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
4fe7680694
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-05-22 15:33:13 +02:00
bd88cbd42d
1st approach simplifying MC management
2019-05-22 15:31:59 +02:00
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
3548070ec1
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
...
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
35c7ea1f48
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
...
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
2019-05-14 17:14:02 +02:00
bc849c16fb
Only one image for welcome new board
...
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
2019-05-14 17:13:44 +02:00
827ebcfbc5
Fix helps
...
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
2019-05-14 13:09:49 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
8ff62a58ce
Merge branch 'ent-3695-ipam-oids' into 'develop'
...
IPAM vlan wizard ExtremeXOS
See merge request artica/pandorafms!2409
Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
2019-05-14 11:30:55 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
ab2bf737d5
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
...
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
2019-05-10 12:18:10 +02:00
43ce4f9883
Added helps
2019-05-09 17:20:27 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
ac101af72f
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
...
Added module units in module graphs
See merge request artica/pandorafms!2237
2019-05-08 16:36:43 +02:00
9bc5a2d346
IPAM vlan wizard ExtremeXOS
2019-05-08 14:17:40 +02:00
b2b4372c9d
Added helps
...
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +02:00
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
3fcd854ae6
fixed error labels graphs and weight in chart
...
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
2019-05-06 16:43:59 +02:00
b1dd6edc64
Added changes in helps
...
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
7045e59e87
Added changes in helps
...
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
2019-04-30 10:44:53 +02:00
2aaeddd803
fixed errors IPAM subneting
...
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
2019-04-29 16:42:26 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
9ee095406b
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
d740b32810
Add support for DESTDIR.
...
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
2019-03-26 11:47:20 +01:00
00eb2766a9
Fixed labels in automatic combined graphs
...
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
2019-03-05 18:06:50 +01:00
942b160a3d
Use multiples in network explorer table
...
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
2019-03-05 08:03:18 +01:00
7d88af625e
Added module units in module graphs
...
Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813
2019-03-04 15:53:47 +01:00
e397353f71
minor fix get_parameter_switch
...
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
2019-02-15 14:03:16 +01:00
efdc17b801
WIP: H&D
...
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
2019-02-15 13:08:44 +01:00
f4c22d2250
added extra arguments to get_snmpwalk
...
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
2019-02-07 13:01:21 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
072ad0a1ea
Add return value to generate_hash_to_api function
...
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
2019-01-24 13:38:13 +01:00
dc2b738776
IPAM supernet
...
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
2019-01-21 09:24:00 +01:00
1c8d846574
WIP IPAM Supernet
...
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
2019-01-17 15:49:41 +01:00
9531065dbe
Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
...
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
807f7a0b74
fixed minor error
...
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
a76895f20e
fixed error metaconsole template send template
...
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
2018-12-13 12:47:22 +01:00
07f5455e28
fixed errors in cron jobs
...
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
2018-12-12 10:46:28 +01:00
c728cb1412
fixed related changes in phantomjs interface
2018-11-29 17:26:41 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
06830c9f69
Added profiller to docker
2018-11-13 12:55:25 +01:00
df8c5e8bf9
Fixed bug in deleted policies
2018-11-06 13:52:03 +01:00
6353af0482
Merge remote-tracking branch 'github/develop' into develop
2018-10-29 13:20:48 +01:00
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
aabd5435d0
Merge branch '2535-Macro-para-unidad-informes' into 'develop'
...
Added unit in label graphs
See merge request artica/pandorafms!1874
2018-10-25 13:12:26 +02:00
972f4b1e89
Added unit in label graphs
2018-10-19 14:03:15 +02:00
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
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
d0e7b86112
Fixed bug in deleted policies from the metaconsole
2018-09-18 09:41:05 +02:00
764b1125bd
Generate session csrf code to avoid attacks in user edition
2018-09-13 15:19:08 +02:00
f117d1af43
fixed heigth charts for reports
2018-09-11 09:33:24 +02:00
21bad5330b
Bug fix
2018-09-04 17:24:03 +02:00
ae6d7139b4
is_management_allowed fix
2018-07-24 18:24:03 +02:00
581cf7c5a0
Added management_allowed
2018-07-24 17:55:33 +02:00
001861b746
Hide policy edition on centralized management on node
2018-07-17 08:51:39 +02:00
23ef9c8f53
Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola
2018-07-12 14:49:59 +02:00
fce669ae21
fixed minor errors in legend charts
2018-07-10 17:53:19 +02:00
aaf8173b8a
Added is_central_policies function
2018-07-10 17:49:46 +02:00
de58fe7b90
Fixes
2018-07-06 14:03:05 +02:00
0dd39f1f00
fixed errors in graph slice for uncompresed
2018-07-05 11:52:52 +02:00
eaf5abd476
fixed keep alive bool type module 100
2018-06-25 15:35:12 +02:00
aa4f13d17a
fixed errors in graphs
2018-06-20 11:31:43 +02:00
73567f1859
Trying to adjust graph render sizes
2018-06-19 19:19:38 +02:00
4214577eea
Added new token for static graph height
2018-06-19 18:27:04 +02:00
9bff4f28f4
Fixed graph with https
2018-06-19 15:00:39 +02:00
7d4a29cbe2
fixed errors in meta and windows
2018-06-14 19:19:58 +02:00
9e229e6228
fixed minor errors
2018-06-14 18:14:54 +02:00
80ddcbe1b6
fixed security error phantomjs
2018-06-14 16:47:23 +02:00
46c23f9deb
fixed minor errors in graphs: tree, labels, tocken meta
2018-06-14 12:17:16 +02:00
05d8d0ccf5
fixed errors graph
2018-06-13 19:13:42 +02:00
9ecc770519
remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces
2018-06-13 11:02:58 +02:00
25942907cf
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-06-12 15:46:41 +02:00
2d6fa8d0e0
fixed errors graphs
2018-06-12 15:46:05 +02:00
24ec62b807
Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
...
fixed errors agent access and other fix
See merge request artica/pandorafms!1525
2018-06-12 12:13:46 +02:00
6eba3250da
fixed errors agent access and other fix
2018-06-12 12:08:04 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
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
abad4f4f4b
fixed minor errorstime graphs
2018-06-11 15:35:04 +02:00
adf9e4d1fe
fixed minor errors
2018-06-11 13:53:10 +02:00
f85a8b513a
fixed errors
2018-06-08 14:30:15 +02:00
eb7cdc7c90
fixed errors in graph delete to image pdf
2018-06-08 08:58:18 +02:00
7834869977
fixed water mark in graphs
2018-06-07 09:15:45 +02:00
d7da009804
fixed errors in graphs
2018-06-06 17:23:32 +02:00
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
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
5142112ae5
Fixed error and white screen with php7.2.
2018-06-05 11:34:19 +09:00
47a287b6f6
fixed errors in graph
2018-06-01 13:58:29 +02:00
a8b8f309e6
fixed graphs
2018-05-30 17:45:17 +02:00
dd57ddbd3c
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
02a442a8db
fixed errors in graph add phantom js
2018-05-28 17:47:40 +02:00
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
16dca6860f
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/graphs/flot/pandora.flot.js
2018-05-23 12:46:12 +02:00
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
dcdce9c8fc
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-05-22 17:58:47 +02:00
37f19dc9fd
Fixed a column name
2018-05-22 16:17:08 +02:00
78f73d5a76
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
2018-05-21 17:26:19 +02:00
b323d524d6
fixed errors in graph update version
2018-05-21 17:25:09 +02:00
79354a0ebf
fixed graphs
2018-05-18 14:22:39 +02:00
614db8b523
[Rebranding] Added product name and copyright notice to setup
2018-05-09 11:49:12 +02:00
57fb63bd91
Fixed snapshots view in string data
2018-05-07 19:40:38 +02:00
f1985313ab
The audit view and csv now use the user defined timezone
2018-05-07 16:10:31 +02:00
30dc841bae
custom graph
2018-04-27 10:03:05 +02:00
2a81703a68
fixed minor error custom graph
2018-04-26 10:24:37 +02:00
e7a8706434
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
pandora_console/include/graphs/flot/pandora.flot.js
pandora_console/include/graphs/functions_flot.php
2018-04-23 12:21:11 +02:00
778be05874
Merge branch 'ent-1902-sql-error' into 'develop'
...
Elimina un error SQL al obtener noticias
See merge request artica/pandorafms!1415
2018-04-17 16:22:44 +02:00
d1608400f9
Avoid the news search for users without groups
2018-04-09 17:17:01 +02:00
c96b883614
[Secondary groups] Fixed agent view to include secondary agents
2018-03-26 12:52:37 +02:00
d2390528ac
fixed errors in graphs
2018-02-27 16:28:00 +01:00
688acb8a4b
fixed error graphs
2018-02-23 14:31:00 +01:00
4b654bd87d
fixed errors grapgh
2018-02-21 11:54:24 +01:00
b6798bf31c
update flot.js
2018-02-16 13:41:31 +01:00
fbbc070b39
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
2018-02-15 09:34:24 -05:00
74a8212032
fixed error show events
2018-02-09 14:20:49 +01:00
571ed36276
Fixed image handle in data view
2018-02-08 14:17:08 +01:00
ab24c3bf80
Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-02-06 10:46:59 +01:00
0d0b7ada48
Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola
...
Conflicts:
pandora_console/include/functions_users.php
2018-01-30 17:56:30 +01:00
ad0b463d13
fixed errors acl
2018-01-30 17:44:51 +01:00
2e1ab72a21
Reapplied #1000 solution
2018-01-24 17:28:00 +01:00
955c183cd8
fixed error ip validate
2018-01-08 11:12:07 +01:00
a335732267
fixed errors in graphs webproc and keep alive
2017-12-19 13:13:42 +01:00
4a1a0ae8b7
fixed errors in graphs
2017-12-13 17:17:45 +01:00
afd84ce74d
Change system audit log extended info to table format with change info - #1571
2017-11-24 10:59:44 +01:00
cea0f90117
Remove HTML entities from the SNMP community.
...
Ref. pandora_enterprise#1565.
2017-11-08 09:15:13 +01:00
526f76d7d1
Added minor change to fix this issue
2017-09-20 12:08:31 +02:00
da763824a9
Added a minor change to test optimization
2017-09-19 10:48:30 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
0e7b00f26e
Added correct user and fixed db error
2017-08-28 16:38:30 +02:00
bab1f14a31
Added remote command execute to agent wizard
2017-08-28 12:44:51 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
c09033ae03
Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop'
...
allow UNION sql reports
See merge request !704
2017-08-18 13:01:53 +02:00
ea06ba213b
Added registration method to reset pass
2017-08-03 13:05:57 +02:00
20fc24b99e
allow UNION sql reports
2017-08-03 11:32:43 +02:00
179325447f
Revert "Use session and not exec sql if already exists acl perms in session - #1017"
...
This reverts commit 78bb583824
2017-07-28 12:46:17 +02:00
78bb583824
Use session and not exec sql if already exists acl perms in session - #1017
2017-06-28 11:31:45 +02:00
faa353bc5c
Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
...
# Conflicts:
# pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
b10f1f422f
Added more restrictions to user dashboard function
2017-04-20 18:02:34 +02:00
87f3798499
Added dashboards to "edit my user" section
2017-04-20 17:36:26 +02:00
df80304a80
Move code to enterprise section
2017-04-20 11:36:40 +02:00
727bd095f5
Added function to reset password in node
2017-04-20 10:59:32 +02:00
4a4f52c459
Added send mail function
2017-04-19 17:29:22 +02:00
48f7fa50dd
Added error control and email handler
2017-04-19 16:04:24 +02:00
277a3b656d
Fixed mr and um mix in um online open
2017-03-24 11:22:30 +01:00
aebbc783df
Added changes to um online open to integrate mr
2017-03-17 13:27:06 +01:00
e7b811c39d
Fixed error in um offline oum path to get mrs.
2017-03-17 09:02:40 +01:00
831b5e2c7d
Added a lot of modifications to integrate mr with um
2017-03-16 19:14:33 +01:00
01b9572edc
Added more changes to um online open with mr
2017-03-16 18:23:07 +01:00
54959257c0
Added more code to um and rr
2017-03-16 16:00:57 +01:00
5a612b3ab6
Added check to PNG extensions. Ticket #51
2017-03-06 15:32:24 +01:00
023f4b1703
Fixed setcookie() usage.
2017-02-27 13:45:45 +09:00
584427de06
Added changes to finish rr feature. Ticket #169
2017-02-14 09:36:11 +01:00
5b7f4a5139
Merge branch 'develop' into feature/rolling_release
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/functions.php
pandora_console/index.php
pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
0e179a1725
Added "G" in srtftime format from date format. Ticket #241
2017-02-09 12:19:59 +01:00
e9fc39b53b
add percentil dinamic ticket: 4262
2016-12-23 09:36:44 +01:00
85475bd6cc
Fixed that exported csv file of audit log contains unnecessary data.
2016-12-08 09:35:34 +09:00
bba75aa166
Now non decimal numbers have all right zeros. Ticket #4254
2016-12-01 08:55:44 +01:00
70f609b204
Fixed timestamp text corruption when language setting is Japanese.
2016-11-24 11:38:28 +09:00
3b0344298c
Revert "Fixed problems with double pandora in servers. Ticket: #3557"
...
This reverts commit e7021d8a0f
2016-11-18 13:01:13 +01:00
0b5d8831df
Fixed problems with data in visual console. Ticket: #4181
...
(cherry picked from commit b8a0a542f2
2016-11-15 10:56:20 +01:00
e7021d8a0f
Fixed problems with double pandora in servers. Ticket: #3557
2016-11-07 09:12:58 +01:00
287c2a7477
Feature: Translate timestick of snmps to humen readable. Ticket: #2494
2016-10-26 16:17:02 +02:00
26862b5f9d
Added a function to remove right zeros in precision data feature
2016-10-20 10:47:12 +02:00
43ad1c0f55
Minor fix
2016-10-14 11:54:24 +02:00
2513dea2b5
Added switch to image content
...
(cherry picked from commit d0a83b5021
2016-10-14 11:44:36 +02:00
6d2c1c126e
Fixed confilcts with onlyOneGroup
2016-08-09 10:22:54 +02:00
8c20874a88
Changed rolling release manager system.
2016-07-19 12:39:03 +02:00
11aba4ce63
Removed unused argument from check_acl() and added new option(argument) for
...
roots up.
Fixed that users_can_manage_group_all() returns ture even if user does not
have rights to manage group all.
2016-07-15 15:37:56 +09:00
dbde4ffc43
Added dummy and undesigned identification wizard
...
Conflicts:
pandora_console/godmode/update_manager/update_manager.setup.php
pandora_console/include/functions_config.php
pandora_console/index.php
2016-06-16 12:59:11 +02:00
0618dbbab3
Rolling release in progress... (Added minor releases)
2016-06-01 14:43:31 +02:00
c817d96937
Cleaned source code.
2016-01-27 15:58:54 +01:00
ab64f9100c
Added the snmp editor for other data uses in the form wizard snmp. TICKET: #1805
2016-01-25 16:31:02 +01:00
82c890410d
Now the dates are showed in the locale of user. TICKET: #2487
2016-01-18 11:54:17 +01:00
1242db08f8
Fixed the refresh time in the enterprise dashboard. TICKET: #3156
...
(cherry picked from commit b94f47f3a9
2016-01-13 14:11:19 +01:00
0b914a39c7
Added a declaration of the function 'hex2bin' for the users that has a PHP version <5.4
2015-09-22 18:10:31 +02:00
786cf45344
Updated update manager URLs.
2015-09-22 12:55:38 +02:00
63498fdbf7
Added percentile 95º in the stat win of module. TICKET: #2613
2015-08-20 17:55:10 +02:00
f1ada9076e
Added a filter 'normal & critical' in severity into events.
2015-07-21 10:40:29 +02:00
f14b07014f
Merge pull request #34 from pandorafms/feature/ticket#2404-planned-downtimes-acl
...
Ended, tested and aproved
2015-07-16 13:48:41 +01:00
cbd4b60aca
Fixed an error in the function 'extract_column'
2015-07-16 13:27:11 +02:00
85b47df1fe
Fixed the xml reports with & in the values.
2015-07-16 11:48:17 +02:00
f3d6513c65
Added useful function 'is_metaconsole' in functions.php
2015-07-10 15:00:12 +02:00
35654709d1
Added a function to extract the column or columns of an array easily
2015-07-06 11:48:15 +02:00
447c4ccd6d
Some fixes in the code.
2015-06-22 16:10:15 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
dac4d30e91
Some fixes in the javascript visualmap.
2015-06-16 18:45:42 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
819b1d5d77
Clean the source code style.
2015-06-08 09:32:01 +02:00
8fbe1175b5
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/DEBIAN/control
pandora_console/DEBIAN/make_deb_package.sh
pandora_console/include/config_process.php
pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
127f53e8c8
Added the new function "set_when_empty"
2015-06-02 18:03:39 +02:00
988228a90a
Fixed problems with snmpwalks, when server have mibs text in hexadeximal-string. Tiquet: #2288
...
(cherry picked from commit 127daf8fdc
2015-06-01 15:24:53 +02:00
09998429b7
Modified the alert messages the system stores in the user session
2015-05-27 16:01:52 +02:00
1160fd800c
Fixed the 'availability' item in report. (Merge from 5d25b7c8e6)
2015-05-26 17:20:34 +02:00
d212fd5543
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-14 11:09:37 +02:00
0ec32cc826
Fixed the PHP Warnings about the re-start the session.
...
(cherry picked from commit 1a035873dc
2015-05-06 18:43:10 +02:00
1a035873dc
Fixed the PHP Warnings about the re-start the session.
2015-05-06 18:42:42 +02:00
7ae97fa48b
Added a new function to sort an associative array by key
2015-05-04 20:10:13 +02:00
4008b12add
Error fixes related with the improved oracle compatibility
2015-04-29 15:31:46 +02:00
d25c32b76d
Added some lost columns to check the ACL permissions
2015-04-09 15:03:26 +02:00
e61ecd3f73
Added the new 'tperfil' columns to the function "get_acl_column"
2015-04-06 16:54:24 +02:00
91b7bf19a5
Added functions to help with the data assign to the variables
2015-03-30 17:28:12 +02:00
5f57ca716b
Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP)
2015-03-17 16:48:52 +01:00
0473856048
Killing pink unicorns and magic numbers.
2015-02-16 18:37:16 +01:00
45d036acdb
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop
2015-02-02 14:18:32 +01:00
9bed03aefd
Fixed PHP warnings.
2015-02-02 14:18:05 +01:00
626a3b5527
Fixed problems with export audit log to csv when no data to show
2015-01-30 11:41:52 +01:00
a240b71fb4
fixed error in mysql to login user without AR permisions
2015-01-22 15:35:40 +01:00
52e6dda3b4
Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop
...
Resolved conflicts:
pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
pandora_console/include/styles/pandora.css
2014-12-15 15:06:29 +01:00
d46c114fd8
Small changes to support the Z/OS extension.
2014-12-12 12:56:21 +01:00
9512216ed6
Moved some functions
2014-12-11 18:19:47 +01:00
ebee411646
Added some lost types to the "get_event_types" function
2014-10-03 12:53:38 +02:00
8c7ac00f14
2014-08-08 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions.php,
include/help/clippy/godmode_agentes_modificar_agente.php,
include/help/clippy/homepage.php,
include/help/clippy/godmode_agentes_configurar_agente.php,
include/javascript/intro.js,
include/javascript/introjs.css,
include/javascript/clippy.js,
include/functions_ui.php,
include/functions_clippy.php,
index.php,
general/header.php: first version of the new feature a annoying
clippy such as the lovely micro$oft mascot.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-08 15:11:00 +00:00
7503a1f5be
2014-07-22 Miguel de Dios <miguel.dedios@artica.es>
...
*
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-22 16:07:31 +00:00
ce8438645d
2014-07-14 Vanessa Gil <vanessa.gil@artica.es>
...
* godmode/admin_access_log.php
include/functions.php: Added export to csv.
* godmode/audit_log_csv.php: Added file.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-14 06:18:11 +00:00
c3f456bacf
2014-06-11 Sergio Martin <sergio.martin@artica.es>
...
* include/functions.php: Change incorrect color assigned to
maintenance events on pdf reports events
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10164 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-11 12:57:05 +00:00
0f2c9f28c5
2014-06-04 Sergio Martin <sergio.martin@artica.es>
...
* include/constants.php
include/functions_graph.php
include/functions_reporting.php
include/graphs/functions_pchart.php
include/graphs/functions_flot.php
include/functions.php
include/functions_events.php: Fix a lot of errors
on events items on reports using now the same query
as events view, etc.
* include/styles/pandora.css: Little aesthetic
improvement in focus buttons and unset webfont
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10105 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-04 14:05:20 +00:00
ab110f04ad
2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/alerts/configure_alert_template.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
include/ajax/module.php, include/functions.php,
include/functions_ui.php, extensions/insert_data.php,
operation/netflow/nf_live_view.php,
operation/reporting/reporting_viewer.php,
operation/reporting/graph_viewer.php, operation/tree.php,
operation/agentes/datos_agente.php,
operation/agentes/estado_monitores.php: fixed the i18n of the
timepicker.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 15:57:36 +00:00
3a4ec99fe5
2014-05-30 Sergio Martin <sergio.martin@artica.es>
...
* general/logon_ok.php
godmode/setup/news.php
include/functions.php
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
index.php
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql: Added modal window mode
to the pandora news for ticket: #821
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10044 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 09:27:20 +00:00
d5fe74b10d
2014-05-28 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* include/functions.php: Improved the Windows
compatibility of the function "get_snmpwalk".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10031 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-28 16:29:00 +00:00
9cb9bbd3a3
2014-05-27 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* extensions/files_repo.php: Fixed a weird error when
uploading big files.
* godmode/setup/setup_general.php,
include/functions_config.php: Now is possible to set
a custom path to the pandora server logs.
* extensions/pandora_logs.php,
extensions/system_info.php: Now the custom server log path
is used if exists.
* include/functions.php: Now the function "get_file_upload_status"
returns -1 when the $_FILES array is empty.
* include/config_process.php: Fixed an error that could
avoid the log in pandora_console.log.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10023 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-27 17:05:37 +00:00
347e24e761
2014-04-08 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* include/functions.php: Added the functions
"get_file_upload_status" and "translate_file_upload_status".
* extensions/files_repo.php,
extensions/files_repo/functions_files_repo.php,
extensions/files_repo/files_repo_list.php,
extensions/files_repo/files_repo_form.php,
extensions/files_repo/sql/files_repo.sql,
extensions/files_repo/sql/files_repo.postgreSQL.sql,
extensions/files_repo/sql/files_repo.oracle.sql: Added
new files. New extension "Files repository".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-08 16:26:23 +00:00
alejandro-campos
Daniel Barbero Martin
Daniel Rodriguez
Tatiana Llorente
Alejandro Fraguas
manuel
Jose Gonzalez
fbsanchez
Daniel Maya
marcos.alconada
fermin831
Ramon Novoa
samucarc
artica
vgilc
Ramón Novoa
manuel.montes
Alejandro Gallardo Escobar
Junichi Satoh
daniel
Ian Blenke
enriquecd
Arturo Gonzalez
m-lopez-f
mdtrooper
Alejandro Gallardo Escobar
Alejandro Gallardo Escobar
zarzuelo