Commit Graph

344 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
vgilc 1949ee653b Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop'
1540 ayuda general en mapas de red dev

See merge request artica/pandorafms!1144
2017-12-01 11:21:37 +01:00
Arturo Gonzalez d1f198b80b Added new networkmaps help section 2017-12-01 11:16:09 +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
Arturo Gonzalez fbab43b451 In progress 2017-11-30 08:04:56 +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
fermin831 2425d19ddd Fixed typo 2017-11-20 11:16:18 +01:00
fermin831 2ef9d884ee Added spanish event responses new macros documentation 2017-11-20 11:14:26 +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 3ea66cbae8 Merge branch 'update-japanese-help' into 'develop'
Updated Japanese help.

See merge request !771
2017-09-29 08:32:27 +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
vgilc b4f0cf12ae Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop'
Change pandorin dialog font color with black theme - #1060

See merge request !635
2017-09-08 10:02:45 +02:00
Junichi Satoh 5b2eec0b1d Updated Japanese help. 2017-09-04 11:38:32 +09: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
enriquecd 95184cab21 Change pandorin dialog font color with black theme - #1060 2017-06-29 18:19:58 +02:00
Arturo Gonzalez 6f343ccd74 Added moduledata macro help text 2017-06-12 17:10:19 +02: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
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop'
Update japanese help for alert macros.

See merge request !483
2017-05-31 11:30:19 +02:00
vgilc c8251d62e0 Merge branch '788_Añadir_macros_para_varias_ips' into 'develop'
add new macros all_address and address_n

See merge request !497
2017-05-23 10:25:56 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +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
vgilc b384d058d9 Merge branch '653-ayuda-descuadrada' into 'develop'
Fixed tet in a help pop-up.

See merge request !323
2017-05-17 17:06:47 +02:00
Junichi Satoh a077c3a59d Updated japanese help for cascade protection. 2017-05-17 14:59:41 +09: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
Arturo Gonzalez ad065e2464 Changed cron help message 2017-04-20 12:56:22 +02:00
Arturo Gonzalez a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
m-lopez-f af7af852b7 Fixed tet in a help pop-up. 2017-03-30 12:33:23 +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