tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-30 22:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
24,820 Commits 34 Branches 30 Tags
Commit Graph

497 Commits

Author SHA1 Message Date
mdtrooper
3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
m-lopez-f
94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f
5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
mdtrooper
447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
Alejandro Gallardo Escobar
3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f
ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar
e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
m-lopez-f
9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper
7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper
89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper
b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +02:00
Alejandro Gallardo Escobar
8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
m-lopez-f
84fb973c6f Change privilege in call function to return groups of view this user. Tiquet: #2259 
(cherry picked from commit 73ae001a3fcb8e23b95e6f972b385e9d2acb14ef)
 2015-06-01 10:13:42 +02:00
Alejandro Gallardo Escobar
137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
Alejandro Gallardo Escobar
d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
mdtrooper
73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
m-lopez-f
50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +02:00
Alejandro Gallardo Escobar
c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
m-lopez-f
b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f
514ab2556b Change visual of agents detail and admin agent 2015-04-21 17:41:33 +02:00
m-lopez-f
2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f
e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
mdtrooper
f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
m-lopez-f
0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f
c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
m-lopez-f
7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f
6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
mdtrooper
db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944 
(cherry picked from commit b7264f61c34c12f95dbfd0d67cf354740bf27a6e)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
 2015-03-10 15:38:56 +01:00
mdtrooper
7883e08af5 Working in the files for the next cherry pick. 2015-03-10 15:36:23 +01:00
m-lopez-f
e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper
d2accaae68 Fixed the update of alert command usability. 
(cherry picked from commit f475dc80bd03a44ec5e541c6970827533d3cf675)

Conflicts:
	pandora_console/godmode/alerts/configure_alert_command.php
 2015-03-09 16:25:58 +01:00
m-lopez-f
58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper
0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
Alejandro Gallardo Escobar
a3783f70e1 Now the alert action command fields can have a HTML wysiwyg editor 2015-02-04 16:52:28 +01:00
Alejandro Gallardo Escobar
0023caf6ea Fixed an error that prevented the creation of a template when a template was selected 2015-02-02 19:53:08 +01:00
m-lopez-f
340c965f92 Fixed alert command previews in 'Configure alert action' when variable contained a double or single quotes 
(cherry picked from commit 443440f99868166431618e9d9b49fe479f4e3467)
 2015-01-29 13:41:33 +01:00
m-lopez-f
82c794a14e add links in agent name and alert name 2015-01-23 12:21:57 +01:00
mdtrooper
d01b82bc3b Fixed the english message of my last commit. Thanks Sancho. 2014-09-10 18:04:59 +02:00
mdtrooper
5655a7d16f Fixed the templates with equal min and max as 0. TICKETS #1245 2014-09-10 16:33:19 +02:00
mdtrooper
09958981c0 some changes in the clippy 
2014-09-02  Miguel de Dios <miguel.dedios@artica.es>

	* pandora_console/godmode/alerts/configure_alert_action.php,
	pandora_console/include/functions_clippy.php,
	pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php,
	pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php,
	pandora_console/include/help/clippy/homepage.php,
	pandora_console/include/help/clippy/operation_agentes_ver_agente.php:
	some changes in the clippy.
 2014-09-02 16:42:59 +02:00
mdtrooper
66a9c59ddb 2014-08-26 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/alerts/configure_alert_action.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/module_unknow.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/help/clippy/godmode_alerts_alert_actions.php,
	include/help/clippy/operation_agentes_ver_agente.php,
	include/help/clippy/godmode_alerts_configure_alert_action.php,
	include/help/clippy/operation_agentes_status_monitor.php,
	include/help/en/help_context_pandora_server_email.php,
	include/functions_clippy.php, operation/menu.php,
	operation/agentes/status_monitor.php: some changes suggested by
	Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-08-26 11:22:06 +00:00
mdtrooper
a6197fccb2 2014-07-31 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-07-31 14:27:43 +00:00
mdtrooper
ab110f04ad 2014-06-02 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/alerts/configure_alert_template.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
	include/ajax/module.php, include/functions.php,
	include/functions_ui.php, extensions/insert_data.php,
	operation/netflow/nf_live_view.php,
	operation/reporting/reporting_viewer.php,
	operation/reporting/graph_viewer.php, operation/tree.php,
	operation/agentes/datos_agente.php,
	operation/agentes/estado_monitores.php: fixed the i18n of the
	timepicker.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-02 15:57:36 +00:00
zarzuelo
6cd21beca0 2014-05-30 Sergio Martin <sergio.martin@artica.es> 
* general/news_dialog.php: Missed file in last commit

	* godmode/alerts/configure_alert_action.php
	godmode/alerts/configure_alert_command.php
	include/javascript/pandora_alerts.js: fixed preview
	of commands in action configuration and changed the 
	text input by a textarea in command configuration for
	ticket: #852



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10046 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-30 10:34:21 +00:00
alexhigh
5f7feb75aa 2014-05-07 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* godmode/agentes/planned_downtime.editor.php,
	  godmode/alerts/configure_alert_template.php,
	  godmode/reporting/reporting_builder.item_editor.php,
	  operation/netflow/nf_live_view.php: Changed the maximum
	character length of the time inputs from 7 to 8.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-07 14:14:23 +00:00
alexhigh
7e8b2333e9 2014-05-06 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* godmode/alerts/alert_list.list.php: Now the form and
	sort values are keeped.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9873 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-06 17:28:34 +00:00
vgilc
f799be11bd 2014-03-27 Vanessa Gil <vanessa.gil@artica.es> 
* godmode/alerts/alert_commands.php
	  godmode/snmpconsole/snmp_alert.php: Fixed
	bug:load recovery fields of alert actions.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-27 13:02:34 +00:00
mdtrooper
0b7a657d56 2014-03-20 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/snmpconsole/snmp_alert.php,
	godmode/alerts/alert_list.list.php,
	godmode/agentes/agent_manager.php,
	godmode/agentes/configurar_agente.php,
	godmode/agentes/modificar_agente.php,
	include/functions_reporting.php,
	operation/agentes/estado_agente.php,
	images/remote_configuration.png: added a tab for enterprise remote
	configuration.
	
	Incident: #311




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9619 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-20 12:02:07 +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
zarzuelo
2b23793949 2014-01-24 Sergio Martin <sergio.martin@artica.es> 
* godmode/alerts/alert_list.list.php
	godmode/alerts/alert_view.php
	include/styles/pandora.css
	include/functions_alerts.php: Fix some bugs when 
	doesnt exist an action with min-infinite situation.
	Some visual fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-01-24 10:17:23 +00:00