daniel
|
f224ec19de
|
Merge remote-tracking branch 'origin/develop' into ent-2674-Nueva_macro_event_timestamp
Former-commit-id: 3f8a5700ea1555758a56bc47eb219d00cb5df34f
|
2019-03-07 08:16:19 +01:00 |
Tatiana Llorente
|
7be5d3e9e0
|
new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
|
2019-03-05 12:54:11 +01:00 |
|
daniel
|
95b5c4ad01
|
add new macro for alert events
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
|
2019-02-28 12:30:01 +01:00 |
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
Daniel Rodriguez
|
36410a26d1
|
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
|
2019-02-21 14:38:21 +01:00 |
Ramon Novoa
|
7bd5851667
|
Add support for column macros.
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
|
2019-02-19 13:04:57 +01:00 |
Alejandro Gallardo Escobar
|
d554dcc7db
|
Added the _current_user_ macro to the event responses
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
|
2019-02-19 11:37:44 +01:00 |
|
fbsanchez
|
ed63ef47fa
|
Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
|
2019-02-13 14:56:10 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
Junichi Satoh
|
ecf5ca3bb2
|
Updated Japanese help files.
|
2018-10-26 17:28:24 +09:00 |
danielmaya
|
97a5f5ba97
|
Added help_log_viewer
|
2018-09-24 17:58:23 +02:00 |
fermin831
|
4d44fcb512
|
Added secondary groups documentation
|
2018-08-21 08:27:46 +02:00 |
|
fermin831
|
90e3a423c4
|
Added secondary groups and no hierarchy documentation
|
2018-08-17 15:45:59 +02:00 |
|
Ramon Novoa
|
f4847d5347
|
Add the _rca_ macro to the help files.
|
2018-07-12 12:37:42 +02:00 |
|
fermin831
|
bcb3af09ca
|
[Rebranding] Minor fix 2
|
2018-05-24 10:56:24 +02:00 |
|
fermin831
|
653248698d
|
[Rebranding] Remove a obsolete link
|
2018-05-24 10:31:51 +02:00 |
|
fermin831
|
43447bbee4
|
[Rebranding] Minor ended fixed
|
2018-05-23 18:19:24 +02:00 |
|
fermin831
|
52ec66d939
|
[Rebranding] help ja dynamic_threshold
|
2018-05-18 14:47:15 +02:00 |
|
fermin831
|
4a8972a5d5
|
[Rebranding] help ja
|
2018-05-18 14:30:51 +02:00 |
|
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 |