Commit Graph

8293 Commits

Author SHA1 Message Date
mdtrooper 05ba19fa46 Added font styles for 4 and 6pt for the labels 2014-09-11 17:50:42 +02:00
mdtrooper acb75b2ed4 Fixed the link to visualmaps in the linked items. 2014-09-11 11:55:46 +02:00
Vanessa Gil e09815c447 Moved tooltip. Ticket #1254
pandora_console/include/styles/pandora.css
2014-09-11 09:59:50 +02:00
mdtrooper afcab1836f Fixed PHP warning. 2014-09-10 18:21:45 +02:00
mdtrooper 875a65d633 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-10 18:11:34 +02:00
Vanessa Gil 0a7dad3aa1 Fixed bug:Error to assign server plugins using templates. Ticket #1161
pandora_console/godmode/agentes/agent_template.php
2014-09-10 18:05:33 +02:00
Ramon Novoa 8a6afbb8f3 Fixed the master server query.
The master server should only take modules from servers of the same type.
2014-09-10 18:05:33 +02:00
Ramon Novoa a7c0010ec5 Added constants for server types. 2014-09-10 18:05:33 +02:00
mdtrooper 5093927c62 Fixed the english message of my last commit. Thanks Sancho. 2014-09-10 18:04:59 +02:00
Vanessa Gil 3e9c5684a7 Fixed bug:Error to assign server plugins using templates. Ticket #1161
pandora_console/godmode/agentes/agent_template.php
2014-09-10 17:08:48 +02:00
Ramon Novoa 12190834a0 Fixed the master server query.
The master server should only take modules from servers of the same type.
2014-09-10 16:51:45 +02:00
Ramon Novoa 37aa4cc88c Added constants for server types. 2014-09-10 16:51:45 +02:00
mdtrooper df0a246760 Fixed the templates with equal min and max as 0. TICKETS #1245 2014-09-10 16:33:19 +02:00
mdtrooper 633cc6e73e Fixes the javascript for the macros in module plugins. TICKETS #1258 2014-09-10 16:12:59 +02:00
mdtrooper 757ad9a58d Uploaded constants about the collection status. 2014-09-10 16:11:36 +02:00
mdtrooper fe2a53eb46 Fixed PHP warnings. 2014-09-10 15:37:31 +02:00
mdtrooper 2a3f51c68c Fixed the height of dinamic map. TICKETS #1246 2014-09-10 13:31:05 +02:00
mdtrooper 394929100a Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-10 13:09:10 +02:00
mdtrooper 1191c80e64 Fixed the PHP warnings. 2014-09-10 13:09:04 +02:00
Junichi Satoh 6a0b7c1a46 Added missing macros to alert macros help. 2014-09-10 19:34:04 +09:00
mdtrooper 5b59a92881 Fixed the check a empty dir for the graphviz directory 2014-09-10 12:28:13 +02:00
Junichi Satoh 2544d44dbc Added new text to the ipam help. 2014-09-10 14:06:41 +09:00
Alejandro Gallardo Escobar a60f20e788 Removed the ChangeLog files :D 2014-09-09 17:41:42 +02:00
mdtrooper 1db206598f Added text into the ipam help about the unassigned addresses 2014-09-09 17:13:07 +02:00
mdtrooper 6d22779d92 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-09 15:22:48 +02:00
mdtrooper 21bc1b52a4 Added function 'db_get_fields' and the code for mysql 2014-09-09 15:22:31 +02:00
Ramon Novoa e925a221ed Force nmap to use seconds as the timeout unit. 2014-09-09 13:06:42 +02:00
Ramon Novoa 0656960395 Added support for on-demand macros to the Plug-in Server. 2014-09-09 11:03:07 +02:00
Sancho Lerena 54acaba824 Added missing macros to helpfiles 2014-09-09 09:35:08 +02:00
mdtrooper 0bf9ce2d34 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-08 15:26:19 +02:00
mdtrooper 952efb4b55 Cleaned source code style, only for to test the github webhooks 2014-09-08 15:26:04 +02:00
Vanessa Gil 7c470bc30d Commented autocreate_group parameter in config file.
pandora_server/NetBSD/pandora_server.conf.new
2014-09-08 15:20:48 +02:00
mdtrooper 6f36a0fc7c Added the feature for the set the working directory of filemanager. Ticket #1228 2014-09-08 14:17:46 +02:00
Sancho Lerena cd22d5cd12 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-09-08 13:52:06 +02:00
Sancho Lerena effe95fc24 Added empty files to recreate directories (due problems in SVN migration) 2014-09-08 13:51:15 +02:00
mdtrooper 7a629e2f12 Some fixes for the empty text files in the filemanager. 2014-09-08 13:45:52 +02:00
Sancho Lerena efacbd3480 Added missing blank directories missed from SVN migration. Added a blank
HTML file to avoid directory listing and to solve GIT commit of blank
directories.
2014-09-08 13:01:42 +02:00
Sancho Lerena 14c480c1a6 2014-09-08 Sancho Lerena <slerena@gmail.com>
* pandora_server_installer: Fixed problems on linux due
        bad link paths from /usr/local/bin -> /usr/bin
2014-09-08 12:49:15 +02:00
Junichi Satoh f2720423f0 2014-09-06 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_macros.php: Translated new macro
	descriptions.
2014-09-06 11:57:38 +09:00
Junichi Satoh 8808685b8b 2014-09-06 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed that unknown modules are never
	recovered when module data is received correctly in/after the
	race condition (module execution time exceeds its interval).
2014-09-06 11:16:46 +09:00
Alejandro Gallardo Escobar c7c1203a36 Added hooks to the enterprise services SLA reports
* include/ajax/reporting.ajax.php
  godmode/reporting/reporting_builder.item_editor.php:
	Added hooks to the enterprise services SLA reports.
2014-09-05 12:53:09 +02:00
Vanessa Gil 3ee4f73a58 Update languages from launchpad 2014-09-04 17:45:16 +02:00
vgilc 71a98bdbaf Updated new strings to translate.
pandora_console/include/languages/index.pot
2014-09-04 13:20:55 +02:00
Ramon Novoa b1e9373d82 2014-09-03 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Added basic support to log to syslog.
2014-09-04 13:02:23 +02:00
Ramon Novoa 5c2a8134cf 2014-09-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Tools.pm: Added basic support to log to syslog.
2014-09-04 13:02:23 +02:00
Ramon Novoa e4b4a43245 2014-09-03 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Added support for global macros.
2014-09-04 13:02:22 +02:00
mdtrooper c749c6f4c9 Upload some lost lines in the Changelog. Sorry 2014-09-04 12:21:44 +02:00
mdtrooper 810754d310 Changes some bad colors and others aesthetic changes. Thanks Carla.
2014-09-04  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/extensions/module_groups.php,
	pandora_console/general/login_help_dialog.php,
	pandora_console/images/close_button_dialog.png,
	pandora_console/images/documentation.png,
	pandora_console/images/enterprise_version.png,
	pandora_console/images/error_login.png,
	pandora_console/images/online_help.png,
	pandora_console/images/support.png,
	pandora_console/include/ajax/events.php,
	pandora_console/include/constants.php,
	pandora_console/include/functions_events.php,
	pandora_console/include/javascript/pandora_events.js,
	pandora_console/include/styles/jquery-ui-1.10.0.custom.css,
	pandora_console/include/styles/pandora.css,
	pandora_console/mobile/include/style/main.css,
	pandora_console/operation/events/events_list.php: changes some
	bad colors and others aesthetic changes. Thanks Carla.
2014-09-04 12:19:55 +02:00
Alejandro Gallardo Escobar f9c1d822cc Added hooks to the service SLA wizard for reports
* godmode/reporting/reporting_builder.item_editor.php,
  godmode/reporting/reporting_builder.php,
  include/functions_reporting.php,
  include/functions_reports.php: Added hooks to the
	enterprise services SLA wizard.
2014-09-03 19:46:29 +02:00
Alejandro Gallardo Escobar d3b484372e Fixed the search of enterprise help files
* general/pandora_help.php: Error fixes on the help file
	search.
2014-09-03 19:40:37 +02:00