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

360 Commits

Author SHA1 Message Date
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
fermin831 0538621ace Added report_limit token and functionality TICKETS #3577 2016-04-25 12:20:12 +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
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
fermin831 775a3e4a9c Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:47:41 +01: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
Arturo Gonzalez Diaz ba492135ca Added a new option to visual setup that configure the interface unit graphs. Ticket#2620 2015-10-23 12:54:58 +02:00
m-lopez-f df9748712d change input type of text a password. Tiquet: #2860 2015-10-19 16:12:56 +02:00
Ramon Novoa 786cf45344 Updated update manager URLs. 2015-09-22 12:55:38 +02:00
Ramon Novoa 67bbd20fef Renamed 'DHPM' to 'Satellite'. 2015-09-22 12:55:38 +02:00
Ramon Novoa b4beb466a4 Added support for the new license format. 2015-09-22 12:55:38 +02:00
m-lopez-f f8d508b9e1 Change visual option of custom report front to url dinamic, Tiquet: #2660 2015-09-01 12:50:09 +02:00
Alejandro Gallardo Escobar 1dc46f6d67 Fixes to improve the compatibility with oracle 2015-08-31 17:51:59 +02:00
mdtrooper 7da9cd812a Starting to fix the themes. TICKET: #435 2015-08-19 14:44:25 +02:00
Alejandro Gallardo Escobar 5dbb268250 Error fix 2015-08-13 14:33:21 +02:00
Alejandro Gallardo Escobar 57d66bf073 Fixed some errors, improved the code and prepared for compatibility w/ the metaconsole 2015-08-13 10:59:38 +02:00
m-lopez-f dfcfc85303 Add new funcionality of remote login with Active Directory 2015-07-28 16:10:45 +02:00
m-lopez-f a316419afa Add new options when render proc is active. Tiquet: #2503 2015-07-22 11:49:00 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
m-lopez-f f6e9cf37b0 Fixed error styles 2015-07-07 16:05:23 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f 2754bfeeb0 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:30:57 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
mdtrooper 9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
mdtrooper a364542454 Sort and structure the code and result form with a huge fields of visual pandora setup. 2015-06-11 19:08:57 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Vanessa Gil a7f748b7be Ticket #1354. 2015-04-13 11:27:23 +02:00
m-lopez-f e0e531bf05 Add field to custom line widht to custom graph tiquet: #1875 2015-03-17 15:36:24 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 7b08fb47c1 Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845 2015-02-26 12:27:18 +01:00