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

2765 Commits

Author SHA1 Message Date
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
fermin831 54cc99140c Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:09:24 +02:00
fermin831 16869aa3a4 Revert "Reformuled users_can_manage_group_all Tickets #3680" 
This reverts commit 417b3faba5.
 2016-06-01 18:02:49 +02:00
fermin831 417b3faba5 Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:00:14 +02:00
fermin831 dd6fa27402 Fixed module selection in scheduled downtimes Tickets #3444 2016-05-30 15:24:18 +02:00
Arturo Gonzalez df2c51c308 Fixed last value checkbox in reports. Ticket#3685 
(cherry picked from commit 2ce399dd0d)
 2016-05-30 08:59:35 +02:00
fermin831 2c197bacec Now messages deleted is not deleted, only mark as deleted to that user 2016-05-27 15:00:21 +02:00
fermin831 5740aa3be7 Added pagination to update manager messages 2016-05-26 16:52:47 +02:00
fermin831 fb9010675f Added first version of update manager messages 2016-05-26 15:03:00 +02:00
fermin831 1a743640b5 Added dummy and undesigned identification wizard 2016-05-25 12:43:49 +02:00
fermin831 2ee301e22b Added password type to update manager proxy Tickets #3552 2016-05-19 11:00:30 +02:00
Alejandro Gallardo Escobar ce150336a9 Fixed the error which caused the simple value elements disappear from the visual console after enable the grid 2016-05-18 12:34:25 +02:00
Arturo Gonzalez b98056b65a Revert "Revert "New login method (saml). Ticket#3393"" 
This reverts commit f59665fe4b.
 2016-05-18 12:04:52 +02:00
Arturo Gonzalez e8b6c8e50a Revert "Revert "Some changes in saml login system."" 
This reverts commit a03815d611.
 2016-05-18 12:04:38 +02:00
m-lopez-f 22edaf6f08 Fixed problems with menus and acl enterprise 
(cherry picked from commit 67f1765248)
 2016-05-18 11:43:25 +02:00
fermin831 a188c96f3f Added custom graph selection in item list Tickets #3664 2016-05-17 13:56:23 +02:00
fermin831 0538621ace Added report_limit token and functionality TICKETS #3577 2016-04-25 12:20:12 +02:00
m-lopez-f 2f9f932171 Fixed several problems of security. Tiquet: #3550 
(cherry picked from commit 36ec5ca8f1)
 2016-04-13 13:51:54 +02:00
Arturo Gonzalez a03815d611 Revert "Some changes in saml login system." 
This reverts commit 502988c812.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/index.php
 2016-03-29 16:40:55 +02:00
Arturo Gonzalez f59665fe4b Revert "New login method (saml). Ticket#3393" 
This reverts commit 08569e64e3.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/include/constants.php
	pandora_console/index.php
 2016-03-29 16:34:41 +02:00
mdtrooper 6215d027be Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170 
(cherry picked from commit f253a16d9b)
 2016-03-29 13:55:30 +02:00
mdtrooper a716b3aaa7 Fixed PHP Warnings. 
(cherry picked from commit 1e0e18a399)
 2016-03-29 13:53:40 +02:00
Arturo Gonzalez 502988c812 Some changes in saml login system. 
(cherry picked from commit e9eb16a848)
 2016-03-29 13:19:58 +02:00
Arturo Gonzalez 08569e64e3 New login method (saml). Ticket#3393 
Conflicts:
	pandora_console/include/auth/mysql.php
 2016-03-29 13:15:37 +02:00
m-lopez-f 951856d837 Re-fixed problems with visual console. Tiquet: #3492 2016-03-23 15:13:31 +01:00
fermin831 4124d198b5 Changed Time to in working time to 00:00:00 TICKETS #3480 2016-03-17 15:47:28 +01:00
fermin831 775a3e4a9c Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:47:41 +01:00
fermin831 0d239bc117 Fixed ACL problems with create scheduled downtimes to AD bit 2016-03-04 12:11:58 +01:00
m-lopez-f 8b1992169c Fixed problems with custom graphs. Ticket: #3413 2016-03-03 10:11:46 +01:00
fermin831 9ce0b14933 Solved open ACL reports problems 2016-03-01 10:15:33 +01:00
Hirofumi Kosaka be677467cf Fixed massive-edit-plugins to show multi-byte string values properly. 2016-02-22 17:51:24 +09:00