Commit Graph

24 Commits

Author SHA1 Message Date
miguel angel rasteu cb63ee92f7 #10328 Fix JS code 2023-05-17 10:54:43 +02:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Barbero Martin c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
fbsanchez bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +01:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
2019-06-25 12:19:01 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
2019-05-03 13:46:52 +02:00
Luis Calvo 4c95a160de Changed Jquery .text for .html for html conversion
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
2019-04-01 17:57:22 +02:00
artica dc238cf74a Changed the format of the .js and .html files
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
mdtrooper db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944
(cherry picked from commit b7264f61c3)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
2015-03-10 15:38:56 +01:00
m-lopez-f e2130fe482 Fixed problem with preview command in 'Configure alert action' 2015-01-20 12:11:01 +01: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
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
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
mdtrooper ede3a9a368 2013-07-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the default value for
	"prediction_module" in tagente_module.
	
	* include/graphs/functions_flot.php,
	include/graphs/functions_pchart.php,
	include/graphs/functions_gd.php, include/graphs/functions_utils.php,
	include/javascript/pandora_alerts.js,
	include/javascript/pandora_modules.js,
	include/javascript/pandora_events.js,
	include/functions_network_components.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8535 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 11:12:37 +00:00
mdtrooper 0d9606c92f 2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora_alerts.js: cleaned source code style.
	
	* include/functions_graph.php: added lost function
	"graph_events_validated".
	
	Fixes: #3603110




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7566 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-04 10:22:56 +00:00
zarzuelo 14c9b69e3f 2012-10-30 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_alerts.js
	godmode/alerts/configure_alert_action.php: Fix some bugs in
	the action form (jquery headache)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7116 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-10-30 16:52:56 +00:00
zarzuelo 7c328d07a9 2012-10-29 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	include/javascript/pandora_alerts.js
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	godmode/alerts/configure_alert_template.php
	godmode/alerts/alert_templates.php
	godmode/alerts/configure_alert_action.php
	godmode/alerts/configure_alert_command.php
	godmode/alerts/alert_actions.php
	godmode/alerts/alert_commands.php: Added 7 more fields to 
	alert actions and adapted templates to this feature (recovery
	included). Add the feature of custom the label and the possible
	data (to use textarea or select) from the command



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7102 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-10-29 08:45:06 +00:00
zarzuelo 5fd61467d8 2012-05-21 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_alerts.js
	godmode/alerts/configure_alert_action.php: Added descrption of
	the selected command under the combo when select one in 
	the action editor to help user.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-21 10:28:35 +00:00
koichirok e0e14c9db8 2012-02-13 Koichiro Kikuchi <koichiro@rworks.jp>
* include/javascript/pandora_alerts.js: Removed double quotes which encolse
	  substituted field[1-3] from command preview.  pandora_server doesn't add
	  double quotes to enclose these fields.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 10:23:30 +00:00
mdtrooper adbc90664f 2009-09-15 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora_alerts.js: fix the id for access to jquery
	in the field3.
	* godmode/alerts/configure_alert_action.php: fix the id for access to jquery
	in the event keyup.
	Fixes: 2845692



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1944 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-09-15 14:51:09 +00:00
Esteban Sanchez b55f4af721 2009-01-12 Esteban Sanchez <estebans@artica.es>
* include/javascript/pandora_alerts.js: Added to repository.
        Javascript functions for alerts.

        * pandoradb_data.sql: Added missing field in a talert_commands row.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2009-01-12 15:17:19 +00:00