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

2812 Commits

Author SHA1 Message Date
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
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
Arturo Gonzalez 6f492e7848 Fixed problems with oracle in "bulk module delete". Ticket#2926 2016-01-04 14:15:34 +01:00
mdtrooper 0c05d6d426 Fixed the form to search modules in an agent. TICKET: #3071 
(cherry picked from commit 96f77c7595)
 2015-12-30 11:20:55 +01:00
mdtrooper 9335e42e7d Change some code for the CSV reports. 
(cherry picked from commit bc5b4dcfe3)
 2015-12-29 16:46:49 +01:00
Arturo Gonzalez da77468f9b Fixed error when changes the background in visual console. Ticket#3076 2015-12-24 09:16:48 +01:00
Arturo Gonzalez 537fe245f4 Fixed "agents with templates" box in bulk alert actions add. Ticket#3087 2015-12-23 16:18:22 +01:00
m-lopez-f c58e6b2738 Fixed problems with period in visual console. Tiquet: #2672 
(cherry picked from commit 3b5b7f5313)
 2015-12-22 12:57:42 +01:00
Arturo Gonzalez 24448197bf Fixed checkbox(all) in module management. Ticket#3086 2015-12-21 14:44:47 +01:00
m-lopez-f 979e82cfa3 Fixed problems with form in view. 
(cherry picked from commit d42c7f6df2)
 2015-12-21 09:14:46 +01:00
m-lopez-f a5779e6829 Fixed problems with recursions in manage agents. Tiquet: #3078 2015-12-16 11:47:33 +01:00
m-lopez-f 7e830b363f Fixed problems with show groups in bulk alerts actions. Tiquet: #3078 
(cherry picked from commit 6cafa4dc70)
 2015-12-16 11:41:53 +01:00
m-lopez-f 786d36ef79 Fixed creation objects when select 'Any' module of agents. Tqiuet: #3062 
(cherry picked from commit 994c99c1a8)
 2015-12-14 15:00:29 +01:00
m-lopez-f d1d30d721b Fixed problems with permissions in menu. Tiquet: #3083 2015-12-14 14:21:13 +01:00
m-lopez-f c3e0ccb126 Fixed count total agents when group have propagate acl. Tiquet: #3078 2015-12-14 11:19:14 +01:00
Arturo Gonzalez 62aa7d5729 Added a text in lines creation (advanced options). Ticket#3043 2015-12-09 11:59:10 +01:00
m-lopez-f 58b6373592 Move links submenu and add image and style. tiquet: #2960 
(cherry picked from commit 25a3e09895)
 2015-11-17 12:21:20 +01:00
m-lopez-f f49ab98890 Fixed styles of lateral menu and add link in submenu of tools. Tiquet: #2960 
(cherry picked from commit 4761d4ad8e)
 2015-11-17 11:21:30 +01:00
m-lopez-f ca0ec7364c Fixed problems with bulk actions with modules. Tiquet: #2963 2015-11-16 15:52:11 +01:00
m-lopez-f 44f9b08a85 Add lost option when module not in policy and not linked. Tiquet: #2962 2015-11-11 13:08:29 +01:00
m-lopez-f efabeb887b Add not hidden parts of tactical view when this view have refresh. Tiquet: #2956 2015-11-10 10:06:51 +01:00
m-lopez-f a136629929 Fixed other bug of simple value. Tiquet: #2952 2015-11-05 13:48:01 +01:00
fermin831 ea18dec5ea Added help to SNMP alert position 2015-11-04 18:44:12 +01:00
m-lopez-f 2c4a3a8a59 Add new custom graphs and fixed others graphs. 
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges

(cherry picked from commit c72f024610)
 2015-11-04 17:45:10 +01:00
m-lopez-f 860f941fa8 Add feature of upload background to visual consoles. Tiquet: #2945 
(cherry picked from commit cb6a8c023a)
 2015-11-04 13:35:20 +01:00
m-lopez-f 005da0e3e2 Fixed width of field in alerts template. Tiquet: #2951 2015-11-04 11:12:19 +01:00
m-lopez-f 2e93905785 Fixed problems with simple value in visual console. Tiquet: #2952 
(cherry picked from commit 0826844290)
 2015-11-04 10:13:12 +01:00
Arturo Gonzalez Diaz fdff5ca98b Changed alerts list table 2015-10-26 12:46:26 +01:00
Arturo Gonzalez Diaz 5fb981377d Fixed lost filter in alerts list. Ticket#2919 2015-10-26 12:21:54 +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
Arturo Gonzalez Diaz d3339c95c3 Fixed alert list table 2015-10-22 11:13:06 +02:00
Arturo Gonzalez Diaz 01ac115a29 Fixed alert list table 2015-10-22 10:20:48 +02:00
Arturo Gonzalez Diaz e8cc3ccbf9 Fixed sql problemas in incidents section (oracle). Ticket#2902 2015-10-21 13:57:05 +02:00
Arturo Gonzalez Diaz 7aed427a7a Fixed special days in oracle. Ticket#2904 2015-10-21 13:31:17 +02:00
m-lopez-f 0b1099e4c3 Fixed problems with remplace data when module is part of policy. Tiquet: #2853 2015-10-21 12:24:06 +02:00
Arturo Gonzalez Diaz 2b7c74f1d9 Changed bad help message in alert macros. Ticket#2863 2015-10-21 10:05:56 +02:00
Arturo Gonzalez Diaz 800f2b749a Fixed js lines between fathers and sons. Ticket#2746 2015-10-19 18:15:45 +02:00