tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,407 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

7407 Commits

Author SHA1 Message Date
pandora-release 6e3bdaacb1 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9036 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-08 00:28:01 +00:00
hax0l 2bbc2e6a04 2013-11-07 Axel Amigo <axel.amigo@artica.es> 
* ChangeLog: Added description of the last commit

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9035 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 16:48:28 +00:00
zarzuelo 8400d8f60d 2013-11-07 Sergio Martin <sergio.martin@artica.es> 
* include/functions_events.php: Change the way of store
	the event comments (supporting old way)

	* include/functions_api.php: Improve API clean process
	of the csv output.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9034 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 16:37:43 +00:00
hax0l 5d6eb36fc8 2013-11-07 Axel Amigo <axel.amigo@artica.es> 
* pandora_server\lib\PandoraFMS\Config.pm: Added support for SNMP Forwarding tokens

         pandora_server\lib\PandoraFMS\SNMPServer.pm: Added new SNMP forwarding feature

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9033 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 16:23:44 +00:00
mdtrooper a1822102db 2013-11-07 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the validate event with the
	new validation form.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9032 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 15:47:17 +00:00
mdtrooper aa608bffae 2013-11-07 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java:
	fixed the validation event.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9031 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 15:45:37 +00:00
mdtrooper 724fe74003 2013-11-07 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java,
	res/layout/create_incident.xml: fixed the popup dialog for the
	create incident.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9030 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 12:40:21 +00:00
ramonn 055c773492 2013-11-07 Ramon Novoa <rnovoa@artica.es> 
* godmode/agentes/modificar_agente.php: Fixed a duplicated id.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9029 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 11:27:23 +00:00
mdtrooper ed4851cefb 2013-11-07 Miguel de Dios <miguel.dedios@artica.es> 
* res/drawable/round_event_item_grey.xml,
	res/drawable/round_event_item_blue.xml: added two lost colors,
	thanks Carla ;) .




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9028 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 10:55:47 +00:00
mdtrooper 7c02ae2d3b 2013-11-07 Miguel de Dios <miguel.dedios@artica.es> 
* res/values-ja/strings.xml, res/values/strings.xml,
	res/values-es/strings.xml, res/layout/main.xml: changes in the
	themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9027 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 10:36:07 +00:00
pandora-release 409469e1f5 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9025 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-07 00:27:40 +00:00
mdtrooper c944f2a92a 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/item_list_event_extended.xml, res/layout/main.xml,
	res/layout/options.xml, res/drawable/button_pressed.9.png,
	res/drawable/pandora_button.xml, res/drawable/button_normal.9.png:
	changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9024 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 19:02:17 +00:00
mdtrooper c4e97a674d 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/drawable-ldpi/delete_pressed.png,
	res/drawable-ldpi/save_pressed.png, res/layout/main.xml,
	res/drawable/save_icon_button.xml,
	res/drawable/delete_icon_button.xml: changes in the themes. 




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9023 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 18:39:24 +00:00
mdtrooper e60532d26b 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/main.xml, res/drawable/combobox_pressed.9.png: changes
	in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9022 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 18:32:03 +00:00
mdtrooper d0ff17942f 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/main.xml, res/layout/list_view_layout.xml,
	res/drawable/refresh_icon_button.xml,
	res/drawable/filter_icon_button.xml,
	res/drawable-ldpi/icon_refresh_pressed.png,
	res/drawable-ldpi/refrest_icon.png,
	res/drawable-ldpi/filter_icon.png,
	res/drawable-ldpi/icon_filter_pressed.png,
	res/drawable-ldpi/pandorafms_logo.png: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9021 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 18:10:22 +00:00
mdtrooper 5b227d3630 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/drawable-ldpi/about.png, res/drawable-ldpi/save.png,
	res/drawable-ldpi/delete.png, res/drawable-ldpi/config.png,
	res/layout/list_view_layout.xml: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9020 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 16:54:05 +00:00
mdtrooper ec818d4afa 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/item_list_event_extended.xml: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9019 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 16:27:08 +00:00
mdtrooper 8e706095f6 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/layout/item_list_event_layout.xml,
	res/layout/list_view_layout.xml,
	res/layout/item_list_event_extended.xml: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9018 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 16:17:06 +00:00
mdtrooper 7597d332bd 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/layout/item_list_event_layout.xml,
	res/layout/list_view_layout.xml, res/drawable/round_event_item.xml,
	res/drawable/round_event_item_blue.xml,
	res/drawable/round_event_item_green.xml,
	res/drawable/round_event_item_grey.xml,
	res/drawable/round_event_item_red.xml,
	res/drawable/round_event_item_yellow.xml: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9017 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 15:40:00 +00:00
mdtrooper 087410661b 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/About.java,
	res/layout/list_view_layout.xml, res/layout/main.xml,
	res/layout/info.xml, res/drawable/btn_dropdown_pressed.9.png,
	res/drawable/combobox_pressed.9.png, res/drawable/btn_dropdown.xml,
	res/drawable-ldpi/save.png, res/drawable-ldpi/delete.png: changes
	in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9016 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 12:21:04 +00:00
zarzuelo fe4e32aaa7 2013-11-06 Sergio Martin <sergio.martin@artica.es> 
* include/functions_api.php: Fix create event typo 
	errors in api. Fix sent by tomas in incident #347



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9015 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 12:17:09 +00:00
zarzuelo b3375a79a1 2013-11-06 Sergio Martin <sergio.martin@artica.es> 
* util/pandora_revent_create.pl: Adapt the script
	of event creation to new API version. Fix by Tomas
	in Incident #347



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9014 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 12:15:42 +00:00
mdtrooper d508b0cc20 2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/About.java,
	res/values/styles.xml, res/layout/info.xml,
	res/drawable/btn_dropdown.xml,
	res/drawable/btn_dropdown_normal.9.png,
	res/drawable/round_dialog.xml, res/drawable/combobox_normal.9.png,
	AndroidManifest.xml: changes in th themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9013 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 11:52:16 +00:00
zarzuelo 424b51e900 2013-11-06 Sergio Martin <sergio.martin@artica.es> 
* include/constants.php
	include/functions_graph.php: Added color collection in
	constants file and use it in custom graphs to avoid
	ugly black colors in graphs with more than three graphs
	Incident #346



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9012 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 10:32:41 +00:00
ramonn be64e0fab0 2013-11-06 Ramon Novoa <rnovoa@artica.es> 
* build_vars.sh: Added console dirs to auto-create OUM packages.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9011 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 08:59:09 +00:00
pandora-release d88dd412a1 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9009 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-06 00:27:14 +00:00
zarzuelo 19cd4ac6f9 2013-11-05 Sergio Martin <sergio.martin@artica.es> 
* include/api.php: Create a special call on Pandora FMS
	API to verify if it is a correct installation of Pandora 
	and get the Version.
	This call only retrieve "Pandora FMS [version] - [build]"
	without any security check.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9008 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-05 17:23:13 +00:00
zarzuelo 0cec075eff 2013-11-05 Sergio Martin <sergio.martin@artica.es> 
* include/javascript/jquery.pandora.js: Fixed "press
	on scape" close event on enterprise dialog



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-05 15:17:44 +00:00
zarzuelo bb4d6a9081 2013-11-05 Sergio Martin <sergio.martin@artica.es> 
* include/functions_tags.php: Fix the tags acl 
	check function to be compatible with acl propagation
	incident #345



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9006 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-05 12:56:51 +00:00
mdtrooper 824962224f 2013-11-05 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	res/drawable-ldpi/save.png, res/drawable-ldpi/icon_filter.png,
	res/drawable-ldpi/icon_refresh.png, res/layout/main.xml,
	res/layout/options.xml, res/drawable/btn_dropdown_pressed.9.png,
	res/drawable/btn_dropdown.xml,
	res/drawable/btn_dropdown_normal.9.png, res/values-ja/arrays.xml,
	res/values/styles.xml, res/values/arrays.xml,
	res/menu/options_menu_list_events.xml, res/values-es/arrays.xml:
	changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9005 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-05 12:10:28 +00:00
pandora-release 3a74b003d0 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9004 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-05 10:57:02 +00:00
zarzuelo 4b6fb312ad 2013-11-04 Sergio Martin <sergio.martin@artica.es> 
* operation/tree.php: Truncate the name of agents
	and modules in tree view to avoid ugly view for 
	incident #306



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9002 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-04 15:16:37 +00:00
zarzuelo ed7a78ffe1 2013-11-04 Sergio Martin <sergio.martin@artica.es> 
* godmode/massive/massive_edit_modules.php: Added
	module description to massive operations for 
	incident #148



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9000 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-04 14:21:45 +00:00
mdtrooper 73f1ea106c 2013-11-04 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/layout/list_view_layout.xml: changes in the theme of the app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8999 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-04 12:02:48 +00:00
mdtrooper 6c08ad3d81 2013-11-01 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	res/layout/list_view_layout.xml, res/layout/main.xml: changes in the
	theme of app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8998 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-04 11:31:42 +00:00
zarzuelo e27e030bf8 2013-11-04 Sergio Martin <sergio.martin@artica.es> 
* include/functions_groups.php: Fixed function that
	returns the user groups in tree way. It was broken
	when the user has acls over a group but not in his
	father. Incident: #342
	Merged from 4.1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8997 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-04 11:30:24 +00:00
mdtrooper 8ef36d72fe 2013-10-31 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/Main.java,
	res/drawable-ldpi/filter_icon.png,
	res/drawable-ldpi/refrest_icon.png, res/layout/main.xml: changed the
	style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8991 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-31 16:48:59 +00:00
mdtrooper 215fe472f4 2013-10-31 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/main.xml: changed the style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8990 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-31 14:48:02 +00:00
mdtrooper 331c225fba 2013-10-31 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/main.xml, res/layout/options.xml,
	res/values-ja/strings.xml, res/values/strings.xml,
	res/values/styles.xml, res/menu/options_menu_list_events.xml,
	res/menu/options_menu.xml, res/values-es/strings.xml: changed the
	style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8989 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-31 14:19:04 +00:00
mdtrooper 8dbc298695 2012-10-31 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/options.xml,
	res/drawable/edittext_pandora_default_shape.xml,
	res/drawable/edittext_pandora_colors_states.xml,
	res/drawable/edittext_pandora_select_shape.xml,
	res/values/styles.xml: changed the style of options layout.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8988 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-31 12:56:38 +00:00
hkosaka e75eef0711 2013-10-31 Hirofumi Kosaka <kosaka@rworks.jp> 
* include/functions_api.php: Added some parameters to
	'create_group' API function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8987 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-31 11:50:06 +00:00
mdtrooper 77aae4ab07 2012-10-30 Miguel de Dios <miguel.dedios@artica.es> 
* res/layout/options.xml, res/values-ja/strings.xml,
	res/values/strings.xml, res/values-es/strings.xml: changed the
	style of app, wip.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8985 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 16:14:36 +00:00
zarzuelo dd5993fad2 2013-10-30 Sergio Martin <sergio.martin@artica.es> 
* godmode/setup/performance.php: Added tip messages to
	advice possible conflicts of performance configuration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8984 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 16:06:51 +00:00
mdtrooper 4b6f5285f0 2012-10-30 Miguel de Dios <miguel.dedios@artica.es> 
* res/values/styles.xml, res/layout/options.xml: I have started to
	set the new style of app (Thanks Carla).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8983 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 15:50:54 +00:00
mdtrooper c4d24dc2cd 2012-10-29 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
	fixed when the data return to call for get events is bad format,
	before it was fails all app, now it tries to get correct event for
	each line.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 15:03:00 +00:00
mdtrooper 0d95b97b09 2013-10-30 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the output of data as csv when
	the data have a return carriges.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 15:00:46 +00:00
hkosaka c170bd356c 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp> 
* include/help/en/help_alert_config.php,
	include/help/en/help_alert_macros.php,
	include/help/es/help_alert_config.php,
	include/help/es/help_alert_macros.php,
	include/help/ja/help_alert_config.php,
	include/help/ja/help_alert_macros.php: Added _timezone_
	alert macro descriptions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8980 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-30 06:39:15 +00:00
mdtrooper c39571dd8f 2013-10-29 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_config.php: fixed the message to show the
	user, and fixed the checks.
	
	INCIDENT: #320




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8978 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-29 13:16:47 +00:00
mdtrooper 335189f55a 2013-10-29 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_agents.php: fixed the delete the nodes in the
	networkmap enterprise.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8977 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-29 11:11:32 +00:00
zarzuelo 9edc002919 2013-10-29 Sergio Martin <sergio.martin@artica.es> 
* extensions/insert_data.php: Fix broken insert data
	feature for incident #331



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8975 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-29 11:05:31 +00:00