Commit Graph

5973 Commits

Author SHA1 Message Date
mdtrooper 43bdb38d11 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-02 16:43:37 +02:00
mdtrooper 6a74af80ec 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
vgilc ab58d1e4f5 Merge branch 'feature/traps' into develop 2014-09-02 09:07:44 +02:00
vgilc a74fbd201c Ask for confirmation before deleting an alert. Ticket #1153.
pandora_console/godmode/snmpconsole/snmp_alert.php
2014-09-02 09:02:44 +02:00
mdtrooper 6efed27e16 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-01 15:31:53 +02:00
mdtrooper 4902233d45 Update lost line in the changelog 2014-09-01 15:27:49 +02:00
mdtrooper 12abf276ca 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
vgilc 9095ba87cb Fixed parents on visual console
pandora_console/godmode/reporting/visual_console_builder.editor.js
2014-09-01 12:02:47 +02:00
mdtrooper cd853362f2 Merge the master branch (we are use gitflow as workflow) 2014-09-01 10:25:13 +02:00
Junichi Satoh 5128497c5d 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 c6ff94b429 Lost lines in the changelog. 2014-08-29 16:56:29 +02:00
mdtrooper bebe6eeb50 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-08-29 16:51:17 +02:00
mdtrooper 36c53cfa45 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
Alejandro Gallardo Escobar a888837f55 Fixed a checkbox of the installation step 3
* install.php: Removed the disabled option of the "drop database
	if exists" checkbox on the step 3.
2014-08-29 16:32:53 +02:00
alexhigh fcb5b43a23 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
vgilc 8a72faa99c 2014-08-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/reporting_builder.php: Owner of a report can be delete it.
	Ticket #1199.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 14:58:24 +00:00
vgilc 098aa68d80 2014-08-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/group_list.php: Fixed problem displaying empty 
	agents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 06:42:49 +00:00
mdtrooper 82018e914c 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 5cb3d96656 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 bc5cc2a995 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 4445c8f090 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
vgilc c9fb471e29 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 4e1fb18412 2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/group_list.php: Fixed bug listing
	group hierarchy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 09:05:48 +00:00
vgilc 539efb3151 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 68423b473e 2014-08-22 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql: Fixed the id column in an
	alert command insertion.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-22 11:54:29 +00:00
alexhigh 0141338088 2014-08-22 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql: Fixed the id column in an
	alert command insertion.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-22 11:53:36 +00:00
jsatoh 753b0e5d68 2014-08-22 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/events.php: Fixed present event filter loading
	failure.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10447 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-22 11:01:20 +00:00
alexhigh aa7a9dc7e2 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 4687305f2d 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* images/radial_dynamic_network_icon.png: Added file.
	
	* operation/agentes/networkmap.php: Changed the icon
	of the 'radial dinamic' tab.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 13:26:11 +00:00
alexhigh 8504ffcc45 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 30245d129a 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 4bdd03de41 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 71eed89bca 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
alexhigh f776ff096f 2014-08-20 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Fixed the function
	"graph_monitor_wheel".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-20 11:10:19 +00:00
mdtrooper 45db99663a 2014-08-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php, operation/search_helps.php,
	operation/search_results.php, operation/search_helps.getdata.php,
	general/pandora_help.php: added feature to search into the help
	files, it is in the search bar header.
	
	* operation/search_main.php: fixed the search any term of several
	words separated with whitespaces.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-18 14:50:07 +00:00
alexhigh 1e99530fbc 2014-08-18 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
	Added some inserts with the new action and command to create
	a ticket in Integria IMS.

	* include/styles/pandora.css: Fixed the header style.

	* operation/menu.php: Now the incidents statistics menu option
	takes the user to the correct place if the "Integria incidents"
	option is selected.

	* operation/integria_incidents/incident.incident.php: Fixed the
	incident edition.

	* operation/integria_incidents/incident.php: Improved the tab
	images.

	* operation/integria_incidents/incident.workunits.php: Now the
	default time of the incident workunits is 0.

	* operation/integria_incidents/incident_detail.php: File removed.

	* operation/integria_incidents/incident_statistics.php: Now this
	section show the real statistics of the Integria IMS incidents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10431 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-18 12:53:59 +00:00
mdtrooper 21f74c8a25 2014-08-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.online.php,
	include/functions_update_manager.php,
	include/ajax/update_manager.ajax.php: fixed the update manager when
	some tar formats, and fixed the versions copy&paste error in the
	code.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-14 16:01:59 +00:00
mdtrooper c1674b109e 2014-08-14 Miguel de Dios <miguel.dedios@artica.es>
* include/help/clippy/agent_out_of_limits.php,
	include/help/clippy/modules_not_init.php,
	include/functions_clippy.php,
	operation/agentes/estado_monitores.php,
	operation/agentes/estado_generalagente.php: wip in the clippy
	project.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-14 11:25:46 +00:00
mdtrooper 01c84256d9 2014-08-14 Miguel de Dios <miguel.dedios@artica.es>
* include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php: updated
	the text from the works of Carla. Thanks Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-14 10:11:46 +00:00
mdtrooper 98d9f97bb6 2014-08-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_clippy.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/javascript/intro.js: some fixes and improves in the clippy.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-14 09:26:04 +00:00
koichirok 178d2d6b33 2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_console_install: Refactored code and added "fakeroot"
	 installation support.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-14 00:22:48 +00:00
jsatoh 18b3fcc0b7 2014-08-13 Junichi Satoh <junichi@rworks.jp>
* pandoradb.sql: Fixed sql error with MySQL 5.6 when NO_ZERO_DATE
	SQL mode is enabled.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-13 05:02:30 +00:00
jsatoh d499a3ed16 2014-08-13 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/events.php: Improved to show event comment.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10411 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-13 01:57:55 +00:00
mdtrooper f6b0af4f0c 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* index.php, operation/agentes/ver_agente.php,
	operation/agentes/estado_monitores.php, general/header.php,
	include/functions_clippy.php, include/functions_ui.php,
	include/help/en/help_context_module_unknow.php,
	include/help/clippy/module_unknow.php, include/styles/pandora.css,
	include/javascript/intro.js: added first version of context help
	interactive.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 16:31:27 +00:00
mdtrooper 7a58f9fa1f 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: killed some unicorns and magic
	numbers into the function "modules_get_status".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 12:58:21 +00:00
mdtrooper 98cd7ca340 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* images/clippy_icon.png, images/pandorin.png,
	include/help/clippy/homepage.php, general/header.php: yes there is
	a octopus another time in Pandora.

2014-08-12  Miguel de Dios <miguel.dedios@artica.es>
	
	* include/functions_clippy.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/godmode_agentes_configurar_agente.php: fixed the
	execution of help tour when never it started. Sorry the clippy is
	less annoying.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 11:41:55 +00:00
mdtrooper 5d032c72fc 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_clippy.php: changed to modal version.
	
	* include/javascript/intro.js: added feature to avoid the exit, and
	the pull request to original repository is solicited too
	(https://github.com/usablica/intro.js/pull/311).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 10:20:53 +00:00
mdtrooper 761a9b3924 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
slerena 956cf4747a 2014-08-12 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql: No more "welcome to Pandora FMS 5.0" 
        removed version code to allow the same text for next releases
        :-)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 08:53:02 +00:00
mdtrooper 0edbe523d2 2014-08-11 Miguel de Dios <miguel.dedios@artica.es>
* include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/functions_clippy.php: wip in the clippy.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-11 14:30:09 +00:00