4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
2c97708373
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
...
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
bf7e7f1e5c
Fixed merge errors
...
Former-commit-id: 30312c4b1ae7a3615576abbae90776f278586f27
2019-02-06 18:11:50 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
c05b4c53e8
fix bug when updating path of ssl certificate in general setup
...
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +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
e2f7157545
fixed php7
2018-10-04 11:43:08 +02:00
69ec75e392
Capital letter in the letter a of audit - #2762
2018-09-14 09:38:36 +02:00
2d6fa8d0e0
fixed errors graphs
2018-06-12 15:46:05 +02:00
a3ebd00876
[Rebranding] Node setup and footer
2018-05-09 13:12:03 +02:00
c5d778fd14
Merge branch '1650-Public-url-rompe-vista-móvil-si-no-acaba-en-/-dev' into 'develop'
...
Added help_tip in public url
See merge request artica/pandorafms!1125
2018-01-29 12:53:02 +01:00
1840d08f7a
Added help_tip in public url
2017-11-27 16:55:42 +01:00
089a0f94ea
Change texts in pandora - #1257
2017-11-14 11:37:49 +01:00
ca24fbc270
Change token text in general setup - #1255
2017-10-05 12:58:40 +02:00
13f12baa33
Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop'
...
Use alias as name with option default tconfig - #1255
See merge request !803
2017-10-04 15:52:17 +02:00
74e4ae3f71
Use alias as name with option default tconfig - #1255
2017-09-08 12:11:15 +02:00
70a226540e
"Massive Operations" had remained at Pandora Console. #161
2017-08-14 12:03:35 +09:00
6bf672a846
Added changes
2017-05-26 14:47:37 +02:00
d066c5f88f
Erase integria incidents integration with integria tickets - #29
2017-01-25 12:40:42 +01:00
be3a520488
Add if use ssl cert and path of this cert. #5
2016-08-26 12:41:34 +02:00
6a5538346a
Added audit log. Tciket #3714 .
2016-07-05 16:53:40 +02:00
9a11ac5f9a
Label changed in setup_general. Ticket #3878 .
2016-07-04 15:59:41 +02:00
e9e5520ea9
Exclude disabled agents scheduled stops. Ticket #3878 .
2016-07-04 15:46:56 +02: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
df9748712d
change input type of text a password. Tiquet: #2860
2015-10-19 16:12:56 +02:00
c4d6c18b25
Fixed styles and errors of php
2015-07-14 15:59:39 +02:00
94c742bfbe
Merge from Develop
2015-06-25 10:40:35 +02:00
5b4214277b
Changed of visual
2015-06-25 10:07:53 +02:00
2754bfeeb0
Fixed inserts paths in DB. Tiquet: #2325
2015-06-22 10:30:57 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
7574f6ed09
Clean the source code style.
2015-06-08 13:13:09 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
33129d89ce
Instantiated an object (table) to avoid PHP warnings
2015-06-03 15:56:25 +02:00
df651810d4
Added support for password encryption to the Pandora FMS Console.
2015-03-02 17:30:19 +01:00
7628ddb5c6
Set a data limit in the forms of massive operations. TICKET: #1700
2015-02-04 11:19:11 +01:00
bb05dfcd58
Fixed PHP warning about the unset 'server_log_dir'
2014-11-20 12:49:13 +01:00
3c4cc38c90
Removed old deprecated and commented/disabled code
2014-09-30 11:57:11 +02:00
a4da2ec6c3
Added support to create scheduled downtimes with past dates
...
* pandora_console/godmode/setup/setup_general.php,
pandora_console/include/functions_config.php: Added a config token
to allow the creation of scheduled downtimes in the past.
* pandora_console/godmode/agentes/planned_downtime.editor.php: Now
is possible to create a scheduled downtime with a past date
if the config token is activated.
2014-09-11 11:42:57 +02:00
1bc3f0f98e
2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
...
* godmode/setup/setup_general.php: Improved timezone
edition.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10456 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 10:59:12 +00:00
de5a16b29d
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
...
* general/header.php, godmode/setup/setup_general.php,
include/functions_clippy.php, include/functions_config.php,
include/help/clippy/homepage.php: wip in the clippy.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 09:36:05 +00:00
086dda7d90
2014-06-26 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* operation/netflow/nf_live_view.php,
godmode/netflow/nf_edit.php,
godmode/servers/manage_recontask_form.php,
godmode/servers/plugin.php,
godmode/setup/setup_general.php: Added messages to
warn about incompatibilities for Windows users.
* include/functions_graph.php: Added the function
"graph_monitor_wheel".
* include/graphs/functions_d3.php: Added the function
"d3_sunburst_graph".
* include/graphs/pandora.d3.js: Added the function "sunburst".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 11:32:14 +00:00
6b62d3355f
2014-06-05 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* extensions/files_repo/files_repo_get_file.php,
extensions/files_repo/files_repo_list.php,
extensions/files_repo/functions_files_repo.php,
godmode/setup/setup_general.php: Improved the Windows
compatibility and fixed some errors.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10120 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-05 12:06:03 +00:00
1757927cd5
2014-06-04 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* godmode/setup/setup_general.php: Disable the "Enable
Netflow" radio buttons if the server is installed on a
Windows machine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10108 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-04 17:09:30 +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
02a8c4ecec
2013-10-02 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/setup/setup_general.php: removed the field
to change the license.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8843 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-02 14:39:45 +00:00
Daniel Rodriguez
alejandro-campos
Tatiana Llorente
manuel.montes
artica
daniel
fermin831
vgilc
danielmaya
enriquecd
Hirofumi Kosaka
Arturo Gonzalez
m-lopez-f
mdtrooper
Alejandro Gallardo Escobar
Ramon Novoa