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

2747 Commits

Author SHA1 Message Date
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 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
Arturo Gonzalez dd30466665 Revert "New login method (saml). Ticket#3393" 
This reverts commit d373d3b3aa.
 2016-02-18 12:54:24 +01:00
Arturo Gonzalez 45d8ac18a8 Revert "Some changes in saml login system." 
This reverts commit 2c1e80d913.
 2016-02-18 12:53:39 +01:00
Arturo Gonzalez 2c1e80d913 Some changes in saml login system. 2016-02-18 12:27:48 +01:00
Arturo Gonzalez d373d3b3aa New login method (saml). Ticket#3393 2016-02-17 13:08:26 +01:00
fermin831 ffb86023cf Password field in SNMP wizard v3 TICKETS #3385 2016-02-16 12:58:21 +01:00
fermin831 176c973d2f Modified ACL bit from AW to AD in scheduled downtimes TICKETS #3280 2016-02-12 14:34:10 +01:00
fermin831 e16f3b85cb Fixed Custom Graphs deletion TICKETS #3356 2016-02-11 15:22:09 +01:00
Arturo Gonzalez 46dc03dcac Now if user can't write in groups delete button desapears. Ticket#3352 2016-02-05 10:22:14 +01:00
fermin831 b9875e8013 Fixed cron updating problem TICKETS #3329 
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
 2016-02-05 09:53:45 +01:00
m-lopez-f 48c56ca843 fixed problems with period in reports type avilibality. Tiquet: #3343 
(cherry picked from commit 868c5eec31)
 2016-02-03 16:29:48 +01:00
m-lopez-f a637e06147 Change refr in visual console. Tiquet: #3277 
(cherry picked from commit 1c374acc3f)
 2016-01-28 11:58:26 +01:00
m-lopez-f aac2460c85 Fixed bulk deleted action alerts. Tiquet: #3268 2016-01-28 09:45:33 +01:00
mdtrooper 06a77b009b Fixed the massive operations in plugins. TICKET: #3221 
(cherry picked from commit 992eacee38)
 2016-01-22 12:25:42 +01:00
m-lopez-f 64b2ad8f6b Fixed view and call funtions, dont work in Oracle's DB. Tiquet: #3231 2016-01-22 09:29:07 +01:00
mdtrooper ea11282439 Cleaned duplicated order values in the reports. TICKET: #3156 
(cherry picked from commit 51c5b6214a)
 2016-01-13 13:03:01 +01:00
mdtrooper 7681bb1f2a Readded the extension admin page. TICKET: #3149 
(cherry picked from commit 703b27027f)
 2016-01-12 14:08:59 +01:00
Arturo Gonzalez 582b15b9fa Fixed some things in delete massive modules (oracle) 2016-01-05 10:03:09 +01:00
Arturo Gonzalez 86b8831982 Increased time shows the snmp menu in manage agent. Ticket#2862 2016-01-04 15:32:55 +01:00