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

2795 Commits

Author SHA1 Message Date
m-lopez-f 8dc302d313 Add if use ssl cert and path of this cert. #5 
(cherry picked from commit be3a520488)
 2016-08-26 12:42:20 +02:00
daniel fe5ceb3272 ticket integria: 3996 fixed minor error in maxlenght #30 
(cherry picked from commit 4375feab72)
 2016-08-25 11:50:25 +02:00
Daniel Maya bed4f8e3d8 Fixed token fontpath in windows. Ticket #3316. 
(cherry picked from commit 2dffe9b1b8)
 2016-08-23 12:01:15 +02:00
Daniel Maya b52223a7ea Added new check to equalize maximum thresholds. Ticket #3732. 
(cherry picked from commit bb26f4b82d)

Conflicts:
	pandora_console/include/functions_graph.php
 2016-08-23 09:01:41 +02:00
daniel b51cb79178 ticket integria: 3897 add number agent disabled/enabled in license #27 
(cherry picked from commit d1794b8385)
 2016-08-18 11:18:40 +02:00
m-lopez-f fa64072cfc Fixed problems with form in recon task. GitHub #59 
(cherry picked from commit 0367f88f56)
 2016-08-17 15:12:20 +02:00
m-lopez-f 6c27a6e16a Delete html tag. Tiquet: #3246 
(cherry picked from commit 8e7f2cdd90)
 2016-08-17 12:03:51 +02:00
m-lopez-f bc4011694a Fixed problems with search form in Policies form. Tiquet: #3246 
(cherry picked from commit f3478168a7)
 2016-08-17 11:59:45 +02:00
daniel 3bf5801d13 ticket integria: 3980 fixed error link recon_task IPAM #25 
(cherry picked from commit d855f72f59)
 2016-08-17 11:54:08 +02:00
m-lopez-f e0c3e04e03 Fixed problem with charge agents when select 'Agents firts in module bulk actions'. Tiquet: #3568 
(cherry picked from commit 77758f993a)
 2016-08-17 10:31:09 +02:00
m-lopez-f ec08ccd7c1 Fixed problems with html-labels and html editor in visual console. Tiquets: #3918 and #3985 2016-08-16 14:04:01 +02:00
m-lopez-f 25fedd8e84 Revert "Fixed problems qith html editor in textareas in visual console" 
Cause: https://www.tinymce.com/docs/plugins/bbcode/ and problems with labels in visual console.
This reverts commit 06e37132a8.
 2016-08-16 13:54:13 +02:00
Daniel Maya b49ccc5982 Added audit log. Tciket #3714. 
(cherry picked from commit 6a5538346a)

Conflicts:
	pandora_console/godmode/setup/setup_general.php
	pandora_console/include/functions_config.php
 2016-08-12 08:52:21 +02:00
fbsanchez 9865bf7aff Ticket 3462: Provided snmp help/std help based on referer 2016-07-29 15:44:07 +02:00
Arturo Gonzalez 910857d57f Added new checkbox to hide agents that its first data time is less than report final time. Ticket 2 Gitlab 
(cherry picked from commit 2f462370e8)
 2016-07-21 14:59:02 +02:00
m-lopez-f 06e37132a8 Fixed problems qith html editor in textareas in visual console 2016-07-21 14:48:56 +02:00
Daniel Maya ba9c3c5d84 Fixed CSV export in system audit log. Ticket #3902. 
(cherry picked from commit 4262956711)
 2016-07-19 16:14:22 +02:00
Daniel Maya a770d51c73 Added pagination in custom graphics. Ticket #3886. 
(cherry picked from commit 00b17f5eda)
 2016-06-30 08:50:04 +02:00
Daniel Maya 6bb5b93a7f show unknown and not init modules. Ticket #3844. 
(cherry picked from commit e4cdef363e)
 2016-06-29 10:44:00 +02:00
m-lopez-f a8b4f7f535 Fixed help of action alerts. Tiquet: #3889 
(cherry picked from commit 04c1304a5d)
 2016-06-27 13:10:07 +02:00
Daniel Maya c565fa42f6 Fixed allow create planned downtimes in the past. Ticket #3454. 
(cherry picked from commit c24b118398)
 2016-06-22 09:52:20 +02:00
Alejandro Gallardo Escobar ddb082a6a2 Now the eHorusID custom field is created automatically when the feature is enabled 
(cherry picked from commit 16454c30a1)
 2016-06-21 18:32:26 +02:00
Alejandro Gallardo Escobar 8fdfd8891e Added a menu entry for the eHorus setup 
(cherry picked from commit 8bb9a31a28)
 2016-06-21 18:32:03 +02:00
Alejandro Gallardo Escobar 5548e838e0 Minor text fix 
(cherry picked from commit 9e9c45d031)
 2016-06-21 18:31:57 +02:00
Alejandro Gallardo Escobar 8943ffd7b2 Changed the temporal images of the menus for eHous with their definitive version 
(cherry picked from commit 853ef78168)
 2016-06-21 18:31:51 +02:00
Alejandro Gallardo Escobar 5ba9cba911 Added a connection test with the eHorus API and custom fields management 
(cherry picked from commit 142d544ef1)
 2016-06-21 18:30:22 +02:00
Alejandro Gallardo Escobar 5191f8658a Added a setup section for ehorus 
(cherry picked from commit e3cfca24ed)
 2016-06-21 18:29:56 +02:00
fermin831 8c4a41d504 Solved problems with single quotes when download UM messages 2016-06-17 12:35:33 +02:00
fermin831 82a9ebfb7e Now UM notification ball dynamically is updated dynamically 2016-06-17 10:08:06 +02:00
fermin831 b57efa690e Changed display way on um messages view and other changes 2016-06-17 09:29:08 +02:00
fermin831 4547cd105d Hide new update manager menu to all users except PM 2016-06-15 17:56:53 +02:00
Daniel Maya c007e5f14c Fixed help alert command. Ticket #3415. 
(cherry picked from commit b40f0848e0)
 2016-06-15 15:54:27 +02:00
fermin831 e4314cbe8b Definitive messages to update manager and solved some issues. 2016-06-14 18:33:39 +02:00
Daniel Maya 98d266e2f9 fixed update manager. Ticket #3551. 
(cherry picked from commit 04fcccd578)

Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-14 16:46:46 +02:00
fermin831 27cebafd02 Merge branch 'feature/identification_wizard' into pandora_6.0 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-13 18:36:35 +02:00
fermin831 a93a6befee Removed some unwanted traces 2016-06-13 17:31:17 +02:00
fermin831 e14e4090d2 Added Mark as read button to update manager messages 2016-06-13 16:47:38 +02:00
fermin831 c9e3fdaa61 Updated menu to put update manager in main menu 2016-06-13 16:30:54 +02:00
Alejandro Gallardo Escobar fb17378abc The service default image is not previewed now. Ticket #3753 2016-06-13 15:43:40 +02:00
fermin831 e578c8ff64 Added some definitive images and fixed several design issues 2016-06-13 13:06:10 +02:00
Daniel Maya 260c27f44a fixed aupdate manager. Ticket #3551. 
(cherry picked from commit 3d1f30ec12)
 2016-06-10 10:51:09 +02:00
fermin831 9fbeab4975 Added notification messages on menu 2016-06-09 18:54:59 +02:00
Alejandro Gallardo Escobar ac5c29b190 Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections. Ticket #3783 2016-06-08 19:15:50 +02:00
fermin831 bdbb74e6db Added connection with update manager and some design changes 2016-06-08 13:51:34 +02:00
Daniel Maya 84865f61ae fixed tab main data. Ticket #3641. 
(cherry picked from commit a15955a9e0)
 2016-06-07 09:05:44 +02:00
m-lopez-f f5304aac0b Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490 
(cherry picked from commit 7ca577ce51)
 2016-06-06 13:05:57 +02:00
fermin831 747e87b87f Solved problems (deletion, edition, creation) on GIS maps Tickets #3762 2016-06-06 12:13:01 +02:00
Daniel Maya 380cafffde New development. Display lateral menus whit left click. 
(cherry picked from commit 0acf4f41eb)
 2016-06-06 11:41:00 +02:00
m-lopez-f 4f9ea2a456 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-02 12:57:46 +02:00
m-lopez-f b549ab6a35 Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549 
(cherry picked from commit db8c7cb4f5)
 2016-06-02 12:57:36 +02:00