Commit Graph

207 Commits

Author SHA1 Message Date
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 fd66f84d0b fixed minor errors 2017-12-19 09:57:52 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas
Conflicts:
	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
2017-11-30 11:47:47 +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 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
Arturo Gonzalez 3495bb5cbf Added help elements 2017-11-21 16:47:45 +01:00
fermin831 f021664336 Added new events response macros documentation 2017-11-20 15:06:20 +01:00
enriquecd 264b91d71e Change alert macros help texts and translations - #1242 2017-10-26 12:44:25 +02: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
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop'
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
2017-09-18 10:12:41 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
enriquecd 4f2e12dcf9 Add _id_module_ definition to help - #1072 2017-08-28 16:46:39 +02:00
daniel 45f33f9748 fixed errors in helps macros 2017-08-24 15:40:03 +02:00
daniel e97057a183 fixed minor error 2017-08-24 15:08:24 +02:00
daniel 94cb6ee060 documentation wux 2017-08-24 14:04:12 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop'
1005 graficas de alerta con umbrales

See merge request !702
2017-08-18 12:42:27 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
Arturo Gonzalez 6f343ccd74 Added moduledata macro help text 2017-06-12 17:10:19 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02: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
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02: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
daniel b7d44c4c62 add new macro in helps 2017-03-09 11:14:58 +01:00
fermin831 31ea5bf5ec Added Time lapse in #434 2017-03-02 16:37:28 +01:00
enriquecd 80ec4e06ec Postprocess module help error reference with coma format and is with dot - #43 2017-02-03 15:13:32 +01:00
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
Junichi Satoh 009b026a82 Added description for _agentcustomfield_n_ 2017-01-06 11:22:43 +09:00
daniel 93341a60e1 visual graph for critical and warning threshold 2016-10-20 16:26:05 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
axl89 9f22e7fec0 Updated english translations 2016-08-30 13:06:10 +02:00
Daniel Maya c0ec08d23b Changed Server Help. Ticket #2932. 2016-06-28 15:41:40 +02:00
Sancho Lerena 8c261793fb Added help about how to include a graph in the email 2016-06-25 10:36:50 +02: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
Arturo Gonzalez Diaz 2428436026 Changed texts in event replication helper 2015-10-22 12:09:12 +02:00
Arturo Gonzalez Diaz e95935244c Modified help message 2015-09-15 18:09:49 +02:00
mdtrooper ec8a65e728 Fixed the help in english about 'critical status'. TICKET: #2601 2015-08-21 11:52:20 +02:00
m-lopez-f 1de7476d09 Change help of advance permissions of AD. 2015-08-06 13:22:06 +02:00
m-lopez-f dfcfc85303 Add new funcionality of remote login with Active Directory 2015-07-28 16:10:45 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00