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

7267 Commits

Author SHA1 Message Date
Ramon Novoa 0640418bfc 2013-11-11 Ramon Novoa <rnovoa@artica.es> 
* lib/PandoraFMS/Config.pm,
	  conf/pandora_server.conf.new: Added support for CURL web checks.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9050 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 15:17:26 +00:00
zarzuelo 56448babda 2013-11-11 Sergio Martin <sergio.martin@artica.es> 
* lib/PandoraFMS/Core.pm: Change the format of the comments when
	create event from server to adapt it to new json format



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9049 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 14:46:21 +00:00
mdtrooper 710c28cbbd 2013-11-11 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/About.java,
	res/values-es/strings.xml, res/layout/info.xml,
	res/values-ja/strings.xml, res/values/strings.xml: added ok button
	in the about view.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 13:09:29 +00:00
zarzuelo 479b58e9d7 2013-11-11 Sergio Martin <sergio.martin@artica.es> 
* include/functions_treeview.php: Fix the agents query in
	tree view of tags to avoid duplicated agents for
	incident #349



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9047 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 12:34:37 +00:00
mdtrooper d7ab0dc445 2013-11-11 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java: changed the
	style to show a better face the list of events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9046 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 12:22:51 +00:00
pandora-release dab8b7beb6 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9044 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-11 00:28:33 +00:00
pandora-release df80ea4c75 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9042 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-10 00:28:17 +00:00
pandora-release 9f5f6a5ec9 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9040 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-09 00:28:59 +00:00
Ramon Novoa cdd7f18501 2013-11-08 Ramon Novoa <rnovoa@artica.es> 
* pandora_server.spec: Copy the new pandora_server.conf.new to /etc/pandora/.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9039 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-08 11:20:27 +00:00
zarzuelo 19a6b2b77f 2013-11-08 Sergio Martin <sergio.martin@artica.es> 
* src/pandroid_event_viewer/pandorafms/EventList.java: Adapt
	the event comments to new storing format

	* res/layout/item_list_event_extended.xml: Improve event 
	comments layout to wrap the text to the container



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-08 10:03:47 +00:00
pandora-release d3769667bf 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 cf74f8dc80 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 5aaed435b8 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 16e3576795 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 53e2b98415 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 837ae9918d 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 e9eb7ed605 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
Ramon Novoa e12e5378ff 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 f130a8efdc 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 cd754bc627 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 6a581f42a4 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 1c35bb4eb9 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 6743cb2ef9 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 37d000f760 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 5a687ae0db 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 833966ef9c 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 5b68461c5b 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 da20ca6ee5 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 493cedbb2b 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 9615985a9a 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 b2652d8750 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 7cdb532844 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 dcd2fa7231 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 43570354c8 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
Ramon Novoa c7ce959c11 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 724f3b73a4 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 a7d3ad065d 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 cfdf56b544 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 1ab9d4608e 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 6e468fc1ee 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 dabdceec9e 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 5250224042 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 487673e2bb 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 3d02aa7654 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 21c8f492ec 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 273d72b050 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 ea486a6934 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 f7f95f63e8 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 3ad22bedd6 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 8e437c6789 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