Commit Graph

5280 Commits

Author SHA1 Message Date
vgilc a8ca5cd305 2012-04-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed bug: In tab alert
	within agent detail, the actions depends on the template.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6057 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 09:07:34 +00:00
koichirok ba288dd09a 2012-04-20 Koichiro Kikuchi <koichiro@rworks.jp>
* ChangeLog: Fixed date and message.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6056 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 07:20:11 +00:00
koichirok cc4c44cd80 2012-04-20 Kikuchi Koichiro <koichiro@rworks.jp>
* extensions/update_manager.php,
	  extensions/update_manager/sql/update_manager.sql,
	  extensions/update_manager/sql/update_manager.postgreSQL.sql,
	  extensions/update_manager/sql/update_manager.oracle.sql,
	  extensions/update_manager/lib/libupdate_manager_client.php,
	  extensions/update_manager/lib/libupdate_manager.php,
	  include/db/postgresql.php,
	  include/db/oracle.php,
	  include/db/mysql.php,
	  include/functions_config.php,
	  include/config_process.php,
	  include/functions_db.php: Now pandora_console support DB
	 running on non-standard port.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6055 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 07:18:01 +00:00
koichirok 95950df2ad 2012-04-19 Koichiro Kikuchi <koichiro@rworks.jp>
* conf/pandora_server.conf.windows,
	  conf/pandora_server.conf,
	  lib/PandoraFMS/DB.pm
	  lib/PandoraFMS/Core.pm
	  lib/PandoraFMS/SNMPServer.pm
	  lib/PandoraFMS/Config.pm
	  lib/PandoraFMS/ProducerConsumerServer.pm
	  bin/pandora_server
	  FreeBSD/pandora_server.conf
	  util/pandora_db.pl
	  util/recon_scripts/snmpdevices.pl
	  util/recon_scripts/ipmi-recon.pl
	  util/plugin/pandora_inventory_change.pl
	  util/plugin/pandora_server_status.pl
	  util/pandora_manage.pl
	  util/pandora_recode_db.pl
	  util/pandora_dbstress.pl: Now pandora_server supports MySQL
	 server running on non-standard port.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6054 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 03:56:09 +00:00
slerena 9b6bb7419c 2012-04-19 Sancho Lerena <slerena@artica.es>
* operation/agentes/estado_monitores.php: Put units in module view. 
	Fixed a Postgrest missing ")" in SQL.

	* operation/agentes/status_monitor.php: Put units in module view.

	* operation/agentes/alerts_status.php: better layout on alert 
	tabular view, now using dynamic width.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6053 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 18:48:35 +00:00
slerena faef022112 2012-04-19 Sancho Lerena <slerena@artica.es>
(Merged from 4.0.x Branch)

        * util/pandora_xml_stress.conf: default path for default agentname list.

        * lib/PandoraFMS/DataServer.pm: Units are not overwrite by an empty XML
        parameter.

        * lib/PandoraFMS/ReconServer.pm: Fixed creation of network components
        with double encoding.

        * lib/PandoraFMS/Core.pm: Applied Junichi patch (from trunk) for detecting
        keepalive in some newer SQL systems. Added a lot of safe_output in logfile.
        Added aditional check for INC types on date collision (same date for different
        data). Fixed generation of some events with double encoding.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6052 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 18:47:57 +00:00
juanmanuelr 15c0d1fb56 2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/gis_maps/render_view.php: Resize GIS map on normal view.
	
	Bugfix merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 18:16:40 +00:00
juanmanuelr 8c0f71d643 2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/gis_maps/render_view.php: Resize GIS map on fullscreen.
	
	Bugfix merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6047 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 17:26:15 +00:00
vgilc e82a5c7b74 2012-04-19 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  include/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  include/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  include/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Added
	table 'ttimezone' and data.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6046 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 17:24:20 +00:00
juanmanuelr 22263ffec4 2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_config.php: Added check for update manager in 
	the config process.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6043 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 16:00:32 +00:00
juanmanuelr 50ccfa2ac8 2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extensions/update_license_info.php: Delete innecesary extension.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6042 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 15:50:22 +00:00
juanmanuelr ae63f2dac6 2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin/skin_default/include/styles/pandora.css: Modified 
	styles in skin like in the main css style file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6041 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 15:29:57 +00:00
ramonn d1d86bb875 2012-04-19 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module.cc: Default to generic_data if no module_type
	  is not set.

	* installer/pandora.mpi: Remove the util directory from the PATH when
	  uninstalling.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 14:52:24 +00:00
darode a1189ca0cc 2012-04-19 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Added sencodary server parameters example
	in agent configuration.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6037 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 13:18:41 +00:00
koichirok 8a5e86820d 2012-04-19 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_agent: Also added the temporal directory to the file path
	 for symlink check.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6034 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 12:19:30 +00:00
vgilc 4a14bbfe99 2012-04-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup.php: Changed timezone by default.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6033 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 10:23:37 +00:00
vgilc cbf2fc44c4 2012-04-19 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php: Changes in tab os.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6032 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 09:54:03 +00:00
vgilc 7b8a15e7f2 2012-04-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup.php
	  index.php
	  pandora_db.sql
	  pandoradb_data.sql: Changed timezone setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6031 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-19 09:50:52 +00:00
mdtrooper 39fc3636f5 2012-04-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, extensions/update_manager.php,
	extensions/update_manager/lib/functions.php: fixed the first
	intallation of update manager.
	
	Merged from the branch "pandora_4.0".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6030 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 18:39:58 +00:00
slerena 515c98a920 2012-04-18 Sancho Lerena <slerena@artica.es>
* operation/servers/recon_view.php: Fix	column header.

        * godmode/agentes/module_manager_editor_plugin.php: Now	plugin description
        is shown formatted (\n -> <br>). Some fields have better layout.

        * godmode/servers/plugin.php: Ajax load	of description is now formatted.

        * godmode/servers/manage_recontask.php:	Fix link to show recon server.

        * godmode/servers/manage_recontask_form.php: Wider textarea.

        * pandoradb_data.sql: New defaults (4 plugins, 2 recon scripts).

        * include/functions_events.php:	More space visible in event info, smaller
        font.

        * include/config_process.php: Updated version.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6028 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 18:28:08 +00:00
slerena 713a2f2205 2012-04-18 Sancho Lerena <slerena@artica.es>
* pandora_server_installer: Fixed version.

	* lib/PandoraFMS/Config.pm: Updated version.

	* util/pandora_db.pl: Updated version.

	* util/plugin/SMTP_check.pl: New remote plugin to check SMTP.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6026 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 17:04:53 +00:00
juanmanuelr eccfc0c400 2012-04-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_minimal.css
	 include/javascript/pandora.js
	 operation/agentes/stat_win.php: Changed layout of interactive graph
	 menu.
	
	* images/graphmenu_arrow.png
	 images/graphmenu_arrow_hide.png: Added images for interactive 
	 graph menu.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6024 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 16:08:48 +00:00
ramonn ae37653850 2012-04-18 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Add the temporal directory to the file path before
	  trying to send a buffered XML file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6022 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 15:35:39 +00:00
darode d45486d4ed 2012-04-18 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/pandora_agent: Fixed a problem detecting agent user to launch
	proxy mode. Added logger function when an error occurs.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6019 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 14:13:41 +00:00
mdtrooper d7f5a9d320 2012-04-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: into the function
	"agents_get_agent_id" the parameter "$io_safe_input" for transform
	the names if true, by default false.
	
	* operation/agentes/networkmap.topology.php,
	operation/agentes/networkmap.php, include/functions_ui.php: cleaned
	source code style.
	
	Merged from th branch "pandora_4.0".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6017 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 12:56:14 +00:00
darode f95fb56b8d 2012-04-18 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/agent_manager.php: Fixed a problem with links
	and new menu strcuture.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6013 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 09:42:22 +00:00
darode 8bad805bd1 2012-04-18 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/agent_disk_conf_editor.php: Print message
	using new message box

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6010 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 09:26:29 +00:00
koichirok 3f9a08f79c 2012-04-18 Koichiro Kikuchi <koichiro@rworks.jp>
* util/pandora_db.pl: Fixed syntax error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6009 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 09:24:56 +00:00
darode db4360cc48 2012-04-18 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_server_installer: Fixed a problem setting permissions
	for /var/spool/pandora directory because an incorrect web server
	group mathcing

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6007 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 09:21:28 +00:00
juanmanuelr 4cc9bda89b 2012-04-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php
	 include/styles/pandora.css
	 include/javascript/jquery.pandora.js
	 include/functions_config.php
	 include/functions_ui.php
	 extensions/update_manager.php
	 extensions/update_manager/load_updatemanager.php
	 extensions/update_manager/lib/functions.ajax.php
	 extensions/update_manager/settings.php
	 operation/system_alert.php
	 general/login_page.php
	 godmode/setup/setup.php: Changed layout in modal windows for 
	 license information also changed several styles.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6005 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-18 08:08:04 +00:00
zarzuelo a4d15adbe0 2012-04-17 Sergio Martin <sergio.martin@artica.es>
* include/config_process.php
	extensions/users_connected.php: Improved users connected extension
	to know users connected last 5 minutes (connected means charge
	any page, not only login)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-17 13:44:10 +00:00
mdtrooper 14f5937b2f 2012-04-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, extensions/net_tools.php: cleaned
	source code style.
	
	* include/functions_networkmap.php: into the functions
	"networkmap_generate_dot" and "networkmap_create_agent_node"
	added new parameter $relative for set the url of icons as relative.
	It is used in networmap enterprise.
	
	* include/functions_ui.php: fixed into the function
	"ui_print_message" lost the javascript code when the first messages
	are without close button. And into the function "ui_print_os_icon"
	added new parameter $relative for set the url of icons as relative.
	It is used in networmap enterprise.
	
	Merged from the branch "pandora_4.0".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6000 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-17 13:08:08 +00:00
zarzuelo ecc07fc278 2012-04-17 Sergio Martin <sergio.martin@artica.es>
* util/pandora_db.pl: Fixed parameters gathering and
	clean undeveloped options from help for bug 3486190



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5997 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-17 11:38:41 +00:00
vgilc f60dfd5981 2012-04-17 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/reporting_builder.item_editor.php: Fixed
	bug: In the item list of a report appears a wrong period.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5994 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-17 10:55:34 +00:00
zarzuelo af44fad789 2012-04-17 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Stripped # character in a 
	string before converted it to image 3504479



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5991 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-17 09:36:28 +00:00
vgilc 508d7fe648 2012-04-16 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php
	  operation/menu.php
	  operation/tree/no_branch.png
	  operation/tree/branch.png
	  operation/tree/closed.png
	  operation/tree/expanded.png
	  operation/tree/first_closed.png
	  operation/tree/first_expanded.png
	  operation/tree/last_closed.png
	  operation/tree/last_expanded.png
	  operation/tree/last_leaf.png
	  operation/tree/leaf.png
	  operation/tree/one_closed.png
	  operation/tree/one_expanded.png. Changed path.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5988 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 17:26:01 +00:00
zarzuelo e69ebbcc9a 2012-04-16 Sergio Martin <sergio.martin@artica.es>
* operation/menu.php: Switched the visual console and custom reports
	order in the menu and change the main Reporting section link 
	to give more important to reports.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5985 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 16:59:27 +00:00
zarzuelo 1c60e0bc06 2012-04-16 Sergio Martin <sergio.martin@artica.es>
* include/graphs/fgraph.php
	include/functions_visual_map.php: Improved the 
	min size of the area graphs and clean code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5984 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 15:34:54 +00:00
juanmanuelr f582477c0d 2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/dialog.css
	 include/styles/pandora.css
	 operation/system_alert.php
	 include/functions_config.php
	 general/login_page.php: Modified style in UM license advises, also
	 modified style in system alerts dialog. 

	* include/functions_ui.php: Modified function ui_print_message to 
	allow force the style.
	
	* include/styles/pandora_legacy.css: New css style with Pandora old
	style "legacy". New style has 100% page width.

	* images/spinner.gif
	 images/spinner.png: Added new spinners with transparency.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 11:24:47 +00:00
juanmanuelr 7968412133 2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extensions/update_license_info.php: Added view to show UM license
	info.
	
	* extensions/update_manager.php
	 extensions/update_manager/settings.php: Added UM license dialog in 
	 this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 11:15:12 +00:00
vgilc 025a3c11dd 2012-04-16 Vanessa Gil <vanessa.gil@artica.es>
* extensions/tree.php: Added policy tab.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5978 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 10:18:41 +00:00
vgilc 6b07dee452 2012-04-16 Vanessa Gil <vanessa.gil@artica.es>
* extensions/tree.php
	  extensions/tree/no_branch.png
	  extensions/tree/branch.png
	  extensions/tree/closed.png
	  extensions/tree/expanded.png
	  extensions/tree/first_closed.png
	  extensions/tree/first_expanded.png
	  extensions/tree/last_closed.png
	  extensions/tree/last_expanded.png
	  extensions/tree/last_leaf.png
	  extensions/tree/leaf.png
	  extensions/tree/one_closed.png
	  extensions/tree/one_expanded.png. Changed tree view images.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5977 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-16 07:46:13 +00:00
jsatoh 21e7df6936 2012-04-14 Junichi Satoh <junichi@rworks.jp>
* include/functions_tags.php: Fixed SQL error with PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5976 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-14 14:51:14 +00:00
jsatoh 7921fca578 2012-04-14 Junichi Satoh <junichi@rworks.jp>
* pandoradb.postgreSQL.sql: Fixed database creation failure with
	version 9.0 or later of PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5973 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-14 12:16:34 +00:00
jsatoh b8fffb6f4d 2012-04-14 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/stat_win.php: Fixed i18n support. Changed
	the description for reloading and the name of the submit button.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5972 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-14 02:30:59 +00:00
zarzuelo b6dc6b56a2 2012-04-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	godmode/reporting/visual_console_builder.editor.js: Fixed several
	bugs in the simple value item in the visual console and unified 
	repeated code merged from 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-13 11:15:14 +00:00
mdtrooper 065a5cca77 2012-04-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, index.php,
	extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/lib/functions.php,
	extensions/update_manager/main.php,
	extensions/update_manager/update_pandora.php,
	general/logon_ok.php:: some fixeds and some changes for run fine and
	pretty the update manager. 
	
	Merged from the branch "pandora_4.0"
	



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5970 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-13 10:39:28 +00:00
zarzuelo 5ba12da9d3 2012-04-13 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Fixed entities trouble in the action
	exist check



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5966 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-13 08:36:08 +00:00
jsatoh d69755ee59 2012-04-13 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/configure_alert_compound.php: Added special days
	feature.

	* pandoradb.sql, pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Added column
	'special_day' to 'talert_compound'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5965 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-13 06:41:28 +00:00
vgilc b2069cc5c1 2012-04-12 Vanessa Gil <vanessa.gil@artica.es>
* extensions/tree.php
	  extensions/tree/no_branch_.png
	  extensions/tree/branch_.png
	  extensions/tree/closed_.png
	  extensions/tree/expanded_.png
	  extensions/tree/first_closed_.png
	  extensions/tree/first_expanded_.png
	  extensions/tree/last_closed_.png
	  extensions/tree/last_expanded_.png
	  extensions/tree/last_leaf_.png
	  extensions/tree/leaf_.png
	  extensions/tree/one_closed_.png
	  extensions/tree/one_expanded_.png. Added files to new open tree view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5962 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-12 16:49:33 +00:00