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

249 Commits

Author SHA1 Message Date
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Jose Gonzalez 01148749a6 Added secondarygroups macro and updated spanish, english and japanses wiki 2019-10-14 17:10:48 +02:00
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
Alejandro Campos 6e90172b59 Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop' 
fixed english and spanish version of plugin-in macros help dialog

See merge request artica/pandorafms!1895

Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
 2019-01-08 15:38:07 +01:00
alejandro-campos ad652c82fa fixed english and spanish version of plugin-in macros help dialog 2018-10-25 13:56:17 +02:00
vgilc 330bdbbce0 Merge branch '2637-Help-en-Event-Viewer' into 'develop' 
Changed Actions column with the right icons - #2637

See merge request artica/pandorafms!1746
 2018-10-25 12:32:37 +02:00
vgilc 50d30e782f Merge branch '2769-Bug-en-la-ayuda-de-Custom-Macros-en-la-creacion-de-un-modulo' into 'develop' 
Fixed bug in custom macros help

See merge request artica/pandorafms!1779
 2018-10-25 11:54:12 +02:00
vgilc 92381141b9 Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop' 
Added help_log_viewer

See merge request artica/pandorafms!1805
 2018-09-25 08:31:02 +02:00
danielmaya 97a5f5ba97 Added help_log_viewer 2018-09-24 17:58:23 +02:00
manuel.montes e22d9e6d9b Fixed bug in custom macros help 2018-09-18 14:31:01 +02:00
Alejandro Gallardo Escobar 1ac837a1b2 Improved the linked visual console status help 2018-09-14 11:40:28 +02:00
Alejandro Gallardo Escobar 7930f22dd0 WIP: Improved the linked visual console status help 2018-09-12 16:54:18 +02:00
tatiana.llorente@artica.es 31c153ec27 Changed Actions column with the right icons - #2637 2018-09-11 11:01:37 +02:00
alejandro-campos 3b7b54cb68 fixed text errors in visual console macros' help text 2018-08-28 10:31:24 +02:00
alejandro-campos 5f593df22a minor fix in visual maps macros help text 2018-08-24 09:19:48 +02:00
alejandro-campos a9ac4462a5 added help dialog in visual console editor 2018-08-24 09:15:10 +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 ce946c1093 [Rebranding] en help 2018-05-18 12:54:00 +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
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
fermin831 5b3408bae5 Added some lost help macros 2017-12-21 13:11:45 +01: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 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 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
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