Commit Graph

191 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar ed2781f46b Added the TreeEnterprise hooks 2015-01-05 13:23:11 +01:00
mdtrooper 1e47df9ab2 Starting the OS type treeview. 2014-12-19 18:39:18 +01:00
mdtrooper fa475c38f4 Uploaded lost changes from the last day 2014-12-19 11:40:59 +01:00
mdtrooper e94b685231 Added status of group nodes 2014-12-18 18:52:35 +01:00
Alejandro Gallardo Escobar 278ceefb32 Added new info to the tree 2014-12-18 18:13:22 +01:00
Alejandro Gallardo Escobar 606d2128ce Moved code 2014-12-18 16:23:39 +01:00
Alejandro Gallardo Escobar 5fb3e94203 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/tree.ajax.php
2014-12-18 14:48:18 +01:00
Alejandro Gallardo Escobar 93b248bf14 Preparing the element detail output for the tree view 2014-12-18 14:40:29 +01:00
mdtrooper c18b0b6066 Added ajax call for the stats. And fixed the function 'groups_agent_ok' in functions_groups.php 2014-12-18 14:25:38 +01:00
Alejandro Gallardo Escobar a045faeb6d Minor changes 2014-12-18 09:55:54 +01:00
mdtrooper 3556621cf0 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
mdtrooper 9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
2014-12-15 15:06:29 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
mdtrooper 03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 6ba6290830 Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 16:37:07 +01:00
mdtrooper a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
mdtrooper 9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
mdtrooper afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper 97278f60d2 Erased the deprecated field 'no_link_color' in table 'tlayout_data' 2014-11-19 16:30:00 +01:00
Vanessa Gil e8f5fabeba Fixed tickets #1562, #1556. 2014-11-18 11:27:04 +01:00
Alejandro Gallardo Escobar dcee34c715 Added a special behaviour when the section is 'mobile' to get the Pandora FMS mobile sections 2014-10-15 18:14:56 +02:00
mdtrooper 065e6bb6ec Fixed the check items of visualmap as module items when the are a visualmap linked items 2014-10-06 18:35:09 +02:00
mdtrooper 99e7229437 Cleaned source code style 2014-09-26 16:22:43 +02:00
Alejandro Gallardo Escobar eeb9725334 Merge branch 'feature/ticket#1243-PlannedDowntime' into develop 2014-09-22 11:48:22 +02:00
mdtrooper 92acbb9b44 Added the feature show the combined graph in the agent graph tabs. TICKET #1277 2014-09-16 12:25:40 +02:00
Alejandro Gallardo Escobar 0e768e003f Improved the autocomplete input for modules
* pandora_console/include/ajax/module.php: Improved the module name search.

* pandora_consle/include/functons_html.php: Improved the autocomplete input
	for modules.
2014-09-10 17:49:17 +02:00
Alejandro Gallardo Escobar 6412dc7e17 Added hooks to the enterprise services SLA reports
* include/ajax/reporting.ajax.php
  godmode/reporting/reporting_builder.item_editor.php:
	Added hooks to the enterprise services SLA reports.
2014-09-05 12:53:09 +02:00
mdtrooper 32101ccfe2 Changes some bad colors and others aesthetic changes. Thanks Carla.
2014-09-04  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/extensions/module_groups.php,
	pandora_console/general/login_help_dialog.php,
	pandora_console/images/close_button_dialog.png,
	pandora_console/images/documentation.png,
	pandora_console/images/enterprise_version.png,
	pandora_console/images/error_login.png,
	pandora_console/images/online_help.png,
	pandora_console/images/support.png,
	pandora_console/include/ajax/events.php,
	pandora_console/include/constants.php,
	pandora_console/include/functions_events.php,
	pandora_console/include/javascript/pandora_events.js,
	pandora_console/include/styles/jquery-ui-1.10.0.custom.css,
	pandora_console/include/styles/pandora.css,
	pandora_console/mobile/include/style/main.css,
	pandora_console/operation/events/events_list.php: changes some
	bad colors and others aesthetic changes. Thanks Carla.
2014-09-04 12:19:55 +02:00
mdtrooper 63506ccd55 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 fa3b615111 2014-07-30 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php: tiny fixes for the improve the support of
	postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 16:54:10 +00:00
mdtrooper 478d521f59 2014-07-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php,
	include/functions_treeview.php, include/ajax/module.php,
	include/functions_reporting.php, include/db/postgresql.php,
	include/functions_servers.php, operation/agentes/estado_agente.php,
	operation/tree.php: tiny fixes for the improve
	the support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 14:29:44 +00:00
juanmanuelr 2a11c5ab1e 2014-07-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/events.php: Fixed custom fields view in
        metaconsole event extended view.

        This is my last commit for Pandora guys! Bye ;-)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-22 17:41:39 +00:00
mdtrooper e2a5bd5b98 2014-06-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.offline.php,
	godmode/update_manager/update_manager.online.php,
	include/functions_update_manager.php,
	include/ajax/update_manager.ajax.php,
	include/javascript/update_manager.js: a lot of fixes into the update
	manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 15:00:43 +00:00
zarzuelo 7e84d8346f 2014-06-13 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.editor.js
	include/graphs/fgraph.php
	include/graphs/functions_pchart.php
	include/graphs/pChart/pImage.class.php
	include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	include/functions_visual_map_editor.php
	include/functions_custom_graphs.php
	include/functions_graph.php: Added option to cusomize the
	background of the graphs in visual consoles for ticket: #886



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10181 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-13 07:53:50 +00:00
mdtrooper 1666cd187f 2014-06-10 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager_xxx/update_manager.online.php,
	include/functions_update_manager.php,
	include/javascript/update_manager.js,
	include/ajax/update_manager.ajax.php: work in the first version of
	new update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10153 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-10 12:57:17 +00:00
mdtrooper 7f5a47eaa8 2014-06-09 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/update_manager.js,
	include/functions_update_manager.php,
	include/ajax/update_manager.ajax.php, include/config_process.php:
	work in the first version of new update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-09 16:11:58 +00:00
mdtrooper 11e9271316 2014-06-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, general/login_page.php: improved
	the source code style.
	
	* godmode/setup/os.builder.php: fixed the form.
	
	* godmode/update_manager_xxx/*, godmode/menu.php,
	include/functions_update_manager.php,
	include/ajax/update_manager.ajax.php,
	include/graphs/functions_gd.php, include/graphs/functions_flot.php,
	include/config_process.php, include/javascript/update_manager.js,
	include/javascript/jquery.knob.js,
	include/javascript/jquery.iframe-transport.js,
	include/javascript/jquery.fileupload.js, images/check-cross.png:
	first version of new update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-09 13:33:55 +00:00