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

145 Commits

Author SHA1 Message Date
fermin831 6c6c9625fc [Console help] Fixed and revisted alert macros 2018-02-28 19:22:31 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc ce43dd91d8 Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop' 
Added _event_description_ in help_alert_macros.php

See merge request artica/pandorafms!1110
 2018-02-05 15:42:14 +01:00
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
Junichi Satoh 55d392efc8 Added a new Japanese help and fixed typo. 2018-01-16 14:39:17 +09:00
fermin831 8e2616e642 Merge branch 'develop' into ent-1536-macro-para-id-extra 2017-12-21 12:18:58 +01:00
fermin831 9a43f1fa7d Merge branch 'develop' into ent-1536-macro-para-id-extra 
Conflicts resolved:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
	pandora_console/include/help/ja/help_alert_config.php
	pandora_console/include/help/ja/help_alert_macros.php
 2017-12-21 11:10:38 +01:00
vgilc 45c642a6a0 Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop' 
Ent 1435 incluir macros en event responses

See merge request artica/pandorafms!1100
 2017-12-21 09:46:55 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
vgilc 66d15f3e4f Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop' 
Added autodisable mode help

See merge request artica/pandorafms!976
 2017-11-29 16:55:24 +01:00
vgilc f8695a2781 Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop' 
Added _event_cfX_ to macros help

See merge request artica/pandorafms!920
 2017-11-29 16:47:09 +01:00
fermin831 94a3bc85d3 Fixed module definition help and add autodisable mode to bulk operations 2017-11-28 15:56:38 +01:00
fermin831 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
danielmaya 13b6be4994 Added _event_description_ in help_alert_macros.php 2017-11-22 17:10:25 +01:00
fermin831 f021664336 Added new events response macros documentation 2017-11-20 15:06:20 +01:00
fermin831 76685aefe0 Added help documentation to _event_extra_id_ 2017-11-20 12:54:32 +01:00
fermin831 e638113f28 Added autodisable mode help 2017-10-25 20:31:18 +02:00
fermin831 f9abfa043c Added _event_cfX_ to macros help 2017-10-13 11:59:37 +02:00
fermin831 274fc2e15f Modified help to include _server_ip_ and _server_name_ macros 2017-10-09 12:35:46 +02:00
Junichi Satoh 5b2eec0b1d Updated Japanese help. 2017-09-04 11:38:32 +09:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop' 
japanese help for cascade protection.

See merge request !474
 2017-05-31 11:30:30 +02:00
Junichi Satoh 9d59f4cf2a Updated help. 2017-05-18 14:26:24 +09:00
vgilc a2f664f0c9 Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop' 
Added _alert_unkown_instructions_ macro

See merge request !279
 2017-05-17 17:10:46 +02:00
Junichi Satoh a077c3a59d Updated japanese help for cascade protection. 2017-05-17 14:59:41 +09:00
fermin831 36aa71df56 Added macro _agentos_ to help actions 2017-04-27 10:14:50 +02:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
Junichi Satoh c39657f233 Translated a help file into japanese. 2017-03-07 15:33:36 +09:00
fermin831 31ea5bf5ec Added Time lapse in #434 2017-03-02 16:37:28 +01:00
Junichi Satoh 009b026a82 Added description for _agentcustomfield_n_ 2017-01-06 11:22:43 +09:00
Junichi Satoh 57a9afee62 Added missing help files. 2016-10-02 10:38:34 +09:00
Junichi Satoh d443309fee Translated. 2015-11-06 19:08:59 +09:00
fermin831 8eb41da69c Added help to SNMP alert position 2015-11-04 18:40:22 +01:00
Junichi Satoh 4437c36995 Added a new alert and plugin macro, _id_group_. 2015-11-04 13:53:13 +09:00
Junichi Satoh 907949c03c Added a new help. 2015-09-20 15:12:33 +09:00
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
Junichi Satoh b4dbefaf66 Updated help. 2015-04-19 17:06:05 +09:00
Junichi Satoh ece9cdb4b3 Updated help. 2015-04-19 13:48:46 +09:00
Junichi Satoh 308c538dd7 Updated help. 2015-02-22 15:50:29 +09:00
Junichi Satoh 244b02516d Updated help. 2014-10-22 18:32:47 +09:00
Junichi Satoh d85762d596 Updated help. 2014-10-05 09:42:11 +09:00
hkosaka 4b2901670f Added the alert macros _groupcustomid_. 2014-10-02 17:15:38 +09:00
Junichi Satoh 0bed6ab851 Added missing macros to alert macros help. 2014-09-10 19:34:04 +09:00
Junichi Satoh cfe6cf5c61 Added new text to the ipam help. 2014-09-10 14:06:41 +09:00
Junichi Satoh a9bb9f84ea 2014-09-06 Junichi Satoh <junichi@rworks.jp> 
* include/help/ja/help_alert_macros.php: Translated new macro
	descriptions.
 2014-09-06 11:57:38 +09:00
Ramon Novoa 72e221113b 2014-09-03 Ramon Novoa <rnovoa@artica.es> 
* include/help/en/help_alert_macros.php,
	  include/help/es/help_alert_macros.php,
	  include/help/ja/help_alert_macros.php: Added new macros.
 2014-09-03 16:48:16 +02:00
Junichi Satoh 9e2e87fb55 2014-08-30 Junichi Satoh <junichi@rworks.jp> 
* include/help/ja/help_context_pandora_server_email.php,
	include/help/ja/help_propagate_acl.php: Added new help files.
 2014-08-30 17:55:25 +09:00
jsatoh 524019b690 2014-07-10 Junichi Satoh <junichi@rworks.jp> 
* include/help/ja/help_snmp_alert_field1.php: Updated help.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10331 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-07-10 07:08:36 +00:00