8e2616e642
Merge branch 'develop' into ent-1536-macro-para-id-extra
2017-12-21 12:18:58 +01:00
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
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
4a1a0ae8b7
fixed errors in graphs
2017-12-13 17:17:45 +01:00
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
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
34da44f9fb
Added cron help
2017-11-23 17:00:59 +01:00
f021664336
Added new events response macros documentation
2017-11-20 15:06:20 +01:00
76685aefe0
Added help documentation to _event_extra_id_
2017-11-20 12:54:32 +01:00
e638113f28
Added autodisable mode help
2017-10-25 20:31:18 +02:00
f9abfa043c
Added _event_cfX_ to macros help
2017-10-13 11:59:37 +02:00
274fc2e15f
Modified help to include _server_ip_ and _server_name_ macros
2017-10-09 12:35:46 +02:00
5b2eec0b1d
Updated Japanese help.
2017-09-04 11:38:32 +09:00
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
9d59f4cf2a
Updated help.
2017-05-18 14:26:24 +09:00
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
a077c3a59d
Updated japanese help for cascade protection.
2017-05-17 14:59:41 +09:00
36aa71df56
Added macro _agentos_ to help actions
2017-04-27 10:14:50 +02:00
1d5afbb36a
Added _alert_unkown_instructions_ macro
2017-03-17 11:23:28 +01:00
65033788f0
Added macro _agentos_
2017-03-17 09:37:10 +01:00
c39657f233
Translated a help file into japanese.
2017-03-07 15:33:36 +09:00
31ea5bf5ec
Added Time lapse in #434
2017-03-02 16:37:28 +01:00
009b026a82
Added description for _agentcustomfield_n_
2017-01-06 11:22:43 +09:00
57a9afee62
Added missing help files.
2016-10-02 10:38:34 +09:00
d443309fee
Translated.
2015-11-06 19:08:59 +09:00
8eb41da69c
Added help to SNMP alert position
2015-11-04 18:40:22 +01:00
4437c36995
Added a new alert and plugin macro, _id_group_.
2015-11-04 13:53:13 +09:00
907949c03c
Added a new help.
2015-09-20 15:12:33 +09:00
f16ba3e1da
Updated the alert-matches help files with documentation from the Wiki.
2015-05-04 10:55:59 +02:00
484a5c1c2c
Added missing help files.
2015-04-28 14:59:57 +02:00
b4dbefaf66
Updated help.
2015-04-19 17:06:05 +09:00
ece9cdb4b3
Updated help.
2015-04-19 13:48:46 +09:00
308c538dd7
Updated help.
2015-02-22 15:50:29 +09:00
244b02516d
Updated help.
2014-10-22 18:32:47 +09:00
d85762d596
Updated help.
2014-10-05 09:42:11 +09:00
4b2901670f
Added the alert macros _groupcustomid_.
2014-10-02 17:15:38 +09:00
0bed6ab851
Added missing macros to alert macros help.
2014-09-10 19:34:04 +09:00
cfe6cf5c61
Added new text to the ipam help.
2014-09-10 14:06:41 +09:00
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
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
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
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
159689fcf1
2014-07-09 Mario Pulido <mario.pulido@artica.es>
...
* include/help/ja/help_snmp_alert_field1.php: Added macros snmp alert help
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-09 10:05:42 +00:00
f88178897d
2014-07-09 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@10329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-09 06:43:30 +00:00
94aca86871
2014-06-25 Junichi Satoh <junichi@rworks.jp>
...
* include/help/ja/help_ff_interval.php,
include/help/ja/help_ff_timeout.php: Translated to Japanese.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 00:47:24 +00:00
5cb5106b1d
2014-06-24 Ramon Novoa <rnovoa@artica.es>
...
* godmode/agentes/module_manager_editor_common.php,
include/help/en/help_ff_interval.php,
include/help/en/help_ff_threshold.php,
include/help/en/help_ff_timeout.php,
include/help/es/help_ff_interval.php,
include/help/es/help_ff_threshold.php,
include/help/es/help_ff_timeout.php,
include/help/ja/help_ff_interval.php,
include/help/ja/help_ff_threshold.php,
include/help/ja/help_ff_timeout.php: Updated help files for the FF threshold.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10270 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-24 09:02:18 +00:00
b1e81abb17
2014-06-05 Junichi Satoh <junichi@rworks.jp>
...
* include/help/ja/help_plugin_macros.php,
include/help/ja/help_alert_macros.php: Added new macros.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10113 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-05 04:30:13 +00:00
2ef9cdf23a
2014-04-05 Junichi Satoh <junichi@rworks.jp>
...
* include/help/ja/help_field_match_snmp.php: Updated help.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-05 08:13:39 +00:00
b59aa6a064
2014-03-09 Junichi Satoh <junichi@rworks.jp>
...
* include/help/ja/help_ipam.php: Added japanese ipam help file.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-09 13:48:43 +00:00
32466ffa49
2013-11-23 Junichi Satoh <junichi@rworks.jp>
...
* include/help/ja/help_visual_console_editor_editor_tab.php: Added
a new description for rich label.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9118 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-23 12:19:19 +00:00
fermin831
vgilc
daniel
Junichi Satoh
Junichi Satoh
Ramon Novoa
hkosaka
mariopulido