Commit Graph

3410 Commits

Author SHA1 Message Date
mdtrooper 71d472b6e6 Added get some user field into the function 'users_get_user_users' 2014-09-16 17:53:50 +02:00
mdtrooper 72257865b5 Fixed the group count for to show delete icon in the list 2014-09-16 15:35:28 +02:00
mdtrooper fbb99fbd0c Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-16 13:47:53 +02:00
mdtrooper 8bf33754e5 Fixed the server performance stadistics. TIKET #1272 2014-09-16 13:47:41 +02:00
Junichi Satoh 0a78522d03 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-09-16 19:30:53 +09:00
Junichi Satoh ce2fe9ac54 Updated Japanese translations. 2014-09-16 19:28:47 +09:00
mdtrooper 8a37afe374 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-16 12:25:53 +02:00
mdtrooper 92acbb9b44 Added the feature show the combined graph in the agent graph tabs. TICKET #1277 2014-09-16 12:25:40 +02:00
artica 3018c5d1f3 Auto-updated build strings. 2014-09-16 09:46:20 +02:00
Sancho Lerena 446269e482 We're approaching to 5.1 SP1 release. 2014-09-15 15:46:27 +02:00
mdtrooper f4ec4654db In the function 'agents_get_modules' improved/fixed the filter of kind 'x IN (N,M,O..)' 2014-09-15 15:27:48 +02:00
Vanessa Gil 8028e1ad04 Fixed mysql error. Ticket #1273
pandora_console/include/functions_treeview.php
2014-09-12 09:56:39 +02:00
mdtrooper 761b9d786b Added font styles for 4 and 6pt for the labels 2014-09-11 17:50:42 +02:00
mdtrooper 3eac088727 Fixed the link to visualmaps in the linked items. 2014-09-11 11:55:46 +02:00
Vanessa Gil 968c513bee Moved tooltip. Ticket #1254
pandora_console/include/styles/pandora.css
2014-09-11 09:59:50 +02:00
mdtrooper 322cd38984 Fixes the javascript for the macros in module plugins. TICKETS #1258 2014-09-10 16:12:59 +02:00
mdtrooper 4033f5dae8 Uploaded constants about the collection status. 2014-09-10 16:11:36 +02:00
mdtrooper bf8101229f Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-10 13:09:10 +02:00
mdtrooper d6e31b6ab3 Fixed the PHP warnings. 2014-09-10 13:09:04 +02:00
Junichi Satoh 0bed6ab851 Added missing macros to alert macros help. 2014-09-10 19:34:04 +09:00
Junichi Satoh cfe6cf5c61 Added new text to the ipam help. 2014-09-10 14:06:41 +09:00
mdtrooper 74bd7c3bd1 Added text into the ipam help about the unassigned addresses 2014-09-09 17:13:07 +02:00
mdtrooper 71e50388e7 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-09 15:22:48 +02:00
mdtrooper a3bc8a4e0d Added function 'db_get_fields' and the code for mysql 2014-09-09 15:22:31 +02:00
Sancho Lerena 8399608b10 Added missing macros to helpfiles 2014-09-09 09:35:08 +02:00
mdtrooper 8efc616d19 Added the feature for the set the working directory of filemanager. Ticket #1228 2014-09-08 14:17:46 +02:00
mdtrooper bbc314b776 Some fixes for the empty text files in the filemanager. 2014-09-08 13:45:52 +02:00
Junichi Satoh a9bb9f84ea 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
Alejandro Gallardo Escobar 6412dc7e17 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 1108416ee3 Update languages from launchpad 2014-09-04 17:45:16 +02:00
vgilc d717d440a7 Updated new strings to translate.
pandora_console/include/languages/index.pot
2014-09-04 13:20:55 +02:00
mdtrooper 32101ccfe2 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 5edbda24c6 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
Ramon Novoa 72e221113b 2014-09-03 Ramon Novoa <rnovoa@artica.es>
* include/help/en/help_alert_macros.php,
	  include/help/es/help_alert_macros.php,
	  include/help/ja/help_alert_macros.php: Added new macros.
2014-09-03 16:48:16 +02:00
mdtrooper 09958981c0 some changes in the clippy
2014-09-02  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/godmode/alerts/configure_alert_action.php,
	pandora_console/include/functions_clippy.php,
	pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php,
	pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php,
	pandora_console/include/help/clippy/homepage.php,
	pandora_console/include/help/clippy/operation_agentes_ver_agente.php:
	some changes in the clippy.
2014-09-02 16:42:59 +02:00
mdtrooper cffdcdd4a3 Added feature to filter by module in events.
2014-09-01  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/include/functions_graph.php,
	pandora_console/operation/events/events.build_query.php,
	pandora_console/operation/events/events.php,
	pandora_console/operation/events/events_list.php: added feature to
	filter by module in events.

	TICKETS #385
2014-09-01 15:23:45 +02:00
mdtrooper b62e6ff8ac Merge the master branch (we are use gitflow as workflow) 2014-09-01 10:25:13 +02:00
Junichi Satoh 9e2e87fb55 2014-08-30 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_context_pandora_server_email.php,
	include/help/ja/help_propagate_acl.php: Added new help files.
2014-08-30 17:55:25 +09:00
mdtrooper 61949a2224 Added the easter egg for clippy
* pandora_console/images/clippy/clippy.png,
  pandora_console/images/clippy/easter_egg_00.png,
  pandora_console/images/clippy/easter_egg_01.png,
  pandora_console/images/clippy/easter_egg_02.png,
  pandora_console/images/clippy/easter_egg_03.png,
  pandora_console/images/clippy/easter_egg_04.png,
  pandora_console/images/pandorin.png,
  pandora_console/include/help/clippy/homepage.php: added the
	easter egg for clippy.
2014-08-29 16:49:01 +02:00
alexhigh ebf958afc1 2014-08-27 Alejandro Gallardo <alejandro.gallardo@artica.es>
* operation/visual_console/render_view.php,
	  godmode/reporting/visual_console_builder.php: Added hooks
	to the enterprise wizard of services.

	* include/constants.php: Added constants for the services modes.

	* operation/events/events.php,
	  operation/events/events.build_query.php: Now is possible to
	filter the events by module id programmatically.

	* images/wand_services.png: Added image.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 17:09:07 +00:00
mdtrooper a281b0bd9e 2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_clippy.php, include/styles/pandora.css: some
	aesthetic changes suggested by Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10459 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-26 13:30:08 +00:00
mdtrooper c76e39d17f 2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/introjs.css, include/styles/pandora_black.css,
	include/styles/pandora.css, general/logon_ok.php,
	mobile/include/style/main.css: some aesthetic changes suggested by
	Carla.
	
	* include/help/clippy/godmode_agentes_modificar_agente.php: fixed
	the position of dialog.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-26 12:22:33 +00:00
mdtrooper 66a9c59ddb 2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/module_unknow.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/help/clippy/godmode_alerts_alert_actions.php,
	include/help/clippy/operation_agentes_ver_agente.php,
	include/help/clippy/godmode_alerts_configure_alert_action.php,
	include/help/clippy/operation_agentes_status_monitor.php,
	include/help/en/help_context_pandora_server_email.php,
	include/functions_clippy.php, operation/menu.php,
	operation/agentes/status_monitor.php: some changes suggested by
	Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-26 11:22:06 +00:00
vgilc d1cc110f83 2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* include/help/en/help_propagate_acl.php
	  include/help/es/help_propagate_acl.php: Added help.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 09:37:03 +00:00
vgilc 5d4b94466e 2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/configure_group.php
	  include/functions_tags.php
	  operation/events/events.build_query.php
	  operation/events/events.build_table.php: Fixed ACL propagation + Tags. 
	Tickets #1079 and #1072.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 09:02:45 +00:00
alexhigh dcf974bb46 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_networkmap.php,
	  operation/agentes/networkmap.dinamic.php,
	  operation/agentes/networkmap.php: Renamed some text
	from 'dinamic' to 'dynamic'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 13:56:48 +00:00
alexhigh fe497317be 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Added filters to the
	function "graph_monitor_wheel".
	
	* operation/agentes/networkmap.dinamic.php,
	  operation/agentes/networkmap.php,
	  include/functions_networkmap.php: Added the 'radial
	dinamic' type.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 11:41:30 +00:00
alexhigh 34ea647346 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Improved the function
	"graph_monitor_wheel" to remove the html encoding.
	
	* include/graphs/pandora.d3.js: Mayor improvements
	on the function "solarburst".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 10:15:12 +00:00
jsatoh 9fcc2c76a5 2014-08-21 Junichi Satoh <junichi@rworks.jp>
* include/functions_api.php: Added a function to add an event comment.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10439 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 01:04:00 +00:00
alexhigh 774d4dc2d7 2014-08-20 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Modified the color of
	the main node on the function "graph_monitor_wheel".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-20 11:13:44 +00:00