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

7646 Commits

Author SHA1 Message Date
zarzuelo 716103645d 2014-03-06 Sergio Martin <sergio.martin@artica.es> 
* include/javascript/pandora_alerts.js: Added missed code
	in action recovery fields feature



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-06 10:09:19 +00:00
pandora-release 192b45646f Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-06 00:32:41 +00:00
zarzuelo 2d30ddd044 2014-03-05 Sergio Martin <sergio.martin@artica.es> 
* include/help/en/help_ipam.php: Fix typo



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9513 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 16:46:54 +00:00
zarzuelo 7270573614 2014-03-05 Sergio Martin <sergio.martin@artica.es> 
* images/automatic.png
	images/manual.png
	images/calculator.png: Add missed images for IPAM



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9511 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 15:39:15 +00:00
mdtrooper 4acd8e9b95 2014-03-05 Miguel de Dios <miguel.dedios@artica.es> 
* index.php, operation/search_results.php: fixed the global search
	when the text to search end with whitespace.
	
	Incident: #605




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 15:29:57 +00:00
mdtrooper 97ff2c0e46 2014-03-05 Miguel de Dios <miguel.dedios@artica.es> 
* include/ajax/module.php: fixed the ajax calls for to get json
	data.
	
	Incident: #619




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9508 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 12:07:01 +00:00
zarzuelo ef2caf6a43 2014-03-05 Sergio Martin <sergio.martin@artica.es> 
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql: Add recovery fields in actions 
	table and recovery field1 in template table in creation
	scripts of 5.1.
	Ticket #501



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 11:43:03 +00:00
zarzuelo 790470de5e 2014-03-05 Sergio Martin <sergio.martin@artica.es> 
* lib/PandoraFMS/Core.pm: Add action recovery fields to the
	recovery logic in alerts.
	Ticket #501



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9506 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 11:39:27 +00:00
zarzuelo db9b118bdb 2014-03-05 Sergio Martin <sergio.martin@artica.es> 
* include/styles/pandora.css
	include/javascript/pandora_alerts.js
	extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql
	extras/pandoradb_migrate_4.1_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.1_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	extras/check_other_languages.sh
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
	extras/network_components.postgreSQL.sql
	extras/network_components.oracle.sql
	extras/network_components.mysql.sql
	godmode/alerts/alert_actions.php
	godmode/alerts/alert_commands.php
	godmode/alerts/alert_view.php
	godmode/alerts/configure_alert_template.php
	godmode/alerts/alert_templates.php
	godmode/alerts/configure_alert_action.php: Clean sql scripts,
	reorganise the alert template creation interface, add field1 
	to template recovery fields and add action recovery fields. 
	Ticket #501




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 11:34:05 +00:00
pandora-release c60799e6cd Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 00:32:33 +00:00
slerena e4e63dc469 2014-03-04 Sancho Lerena <slerena@artica.es> 
* en/help_ipam.php: Added translation for IPAM help.

        * e?/help_pcap_filter.php: Added small sample.

        * es/help_ipam.php: Some adittions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9502 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 18:10:38 +00:00
mdtrooper 1ab0555617 2014-03-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the function "get_module_name".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9501 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 16:51:30 +00:00
zarzuelo b2f3572da0 2014-03-04 Sergio Martin <sergio.martin@artica.es> 
* include/help/es/help_ipam.php: Typo fix in ipam text



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 15:17:46 +00:00
zarzuelo b40f18983d 2014-03-04 Sergio Martin <sergio.martin@artica.es> 
* include/help/es/help_ipam.php: Added spanish IPAM help

	* include/styles/pandora.css: Little fix on help 
	styles changing size to h3 tag



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 14:49:56 +00:00
mdtrooper 6d579568a9 2014-03-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the function "api_get_policies".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 14:39:19 +00:00
mdtrooper 66c459e425 2014-03-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the function
	"api_get_tactical_view". Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 10:53:09 +00:00
mdtrooper 468d49df9e 2014-03-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the function "api_get_gis_agent".
	Thanks Cucumber.
	
	* include/functions_io.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9491 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 09:57:31 +00:00
pandora-release 0e3d993b59 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-04 00:33:04 +00:00
mdtrooper 6c1f81f899 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2014-03-03 17:08:35 +00:00
mdtrooper 6f266063ca 2014-03-03 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the call "get_total_modules" now
	it does not count the pending delete modules. And thanks Cucumber for
	to the advise.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-03 17:06:31 +00:00
pandora-release fcabe2ae8a Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9483 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-03 00:32:09 +00:00
pandora-release 6eee9296f9 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9480 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-02 00:32:14 +00:00
pandora-release 4e4a85e71b Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-01 00:32:03 +00:00
pandora-release aed123d0f2 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-28 00:31:54 +00:00
pandora-release 474ce404a8 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-27 00:35:09 +00:00
pandora-release f16fd5d054 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9471 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-26 10:19:31 +00:00
zarzuelo 91310bd03e 2014-02-25 Sergio Martin <sergio.martin@artica.es> 
* include/javascript/pandora_events.js
	include/ajax/events.php: Change command timeouts in responses
	from 10 to 9 seconds to avoid problems in certain systems. Add
	little feedback when command reach timeout time



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-25 12:38:53 +00:00
pandora-release 842e7f9fed Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-25 00:50:54 +00:00
pandora-release eb5ef6eece Updated version string. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-24 15:25:36 +00:00
pandora-release b2cc0d2747 Reverted the previous commit. This changes belong into the 5.0 branch. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-24 14:59:25 +00:00
pandora-release 77197f6fa4 Updated to build the 5.0 branch. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-24 14:54:30 +00:00
slerena 25626dd5f3 2014-02-24 Sancho Lerena <slerena@artica.es> 
* pandorafms-agent.spec: Lots of changes to adapt spec to fedora standards.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-24 01:08:19 +00:00
pandora-release c9759289db Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-24 00:50:30 +00:00
pandora-release 1a669c7dea Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9456 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-23 00:50:29 +00:00
pandora-release f745c4cc53 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-22 00:50:29 +00:00
pandora-release 60e9e0ce8b Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-21 00:50:59 +00:00
mdtrooper f4e359fdbd 2014-02-20 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/agentes/fields_manager.php: added the id column in the
	list of fields because it is needed in some api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-20 15:01:23 +00:00
pandora-release 07b6e0f844 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-20 00:50:21 +00:00
mdtrooper 548d050a0c 2014-02-19 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/agentes/module_manager_editor_common.php: added lost id
	of module, because the user needs for example the api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-19 10:29:45 +00:00
juanmanuelr 7b7db80c11 2014-02-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 
* operation/agentes/ver_agente.php: Fixed agent tooltip
        for metaconsole networkmap. Now check ACL tags are checked.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-18 11:56:24 +00:00
juanmanuelr e99a72eb8f 2014-02-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 
* operation/agentes/status_monitor.php: Fixed tag combo,
        now only shows user tags not all.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-17 16:51:15 +00:00
pandora-release d173db149e Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-17 00:50:04 +00:00
pandora-release f78054f92c Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-16 00:50:01 +00:00
pandora-release 0d0c0c66e9 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9439 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-15 00:49:59 +00:00
juanmanuelr 563391b808 2014-02-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 
* include/functions_tags.php: Fixed several bugs with
        ACL propagation and ACL tags.

        * include/functions_graph.php: Implemented ACL tags in
        graph_event_module function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-14 13:20:38 +00:00
pandora-release 7e4210fc4a Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-14 00:49:55 +00:00
pandora-release 61f20f50e9 Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9434 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-13 00:49:58 +00:00
mdtrooper 8d8899e597 2014-02-12 Miguel de Dios <miguel.dedios@artica.es> 
* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: fixed
	the access with passwords or users with non-ascii characters.
	
	* AndroidManifest.xml: update the version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9433 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-12 15:42:17 +00:00
zarzuelo 205f648c4a 2014-02-12 Sergio Martin <sergio.martin@artica.es> 
* mobile/operation/events.php: Fix order of the event 
	list on mobile console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-12 12:07:58 +00:00
pandora-release bb8d3ec15a Auto-updated build strings. 
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9430 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-12 00:52:53 +00:00