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

2286 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
 2014-12-15 15:06:29 +01:00
mdtrooper 9277ea1b80 Added info dialog with the modules and components that lock a server plugin 2014-12-12 15:01:50 +01:00
mdtrooper b42d643968 Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar 33c6789144 Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
Ramon Novoa 26c9184f85 Fixed a string (needs translations too). 2014-12-05 15:29:12 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 673d0bd34f Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
mdtrooper b0ee3ed266 Added the lost fields for item group in the element list. 2014-12-02 11:40:27 +01:00
mdtrooper 352c63087c The last work for the new elements into the visualmap. Ticket #1478 2014-11-26 16:03:40 +01:00
mdtrooper 61ecef9ef9 Working in the new elements for the visualmap. Ticket #1478 2014-11-26 15:33:07 +01:00
mdtrooper 0bc0fb1d7b Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:59:05 +01:00
mdtrooper 35739261fb Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:55:45 +01:00
mdtrooper 931aa455e0 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 16:30:40 +01:00
mdtrooper 320d85b3b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 15:37:58 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 018c5136c5 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 11:52:04 +01:00
mdtrooper 828d2aa8d8 Working in the new elements for the visualmap. Ticket #1478 2014-11-24 18:14:39 +01:00
mdtrooper c7514cd29c Working in the new elements for the visualmap. Ticket #1478 2014-11-24 17:52:28 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
mdtrooper 93c1089cff Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:37:07 +01:00
mdtrooper 9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
mdtrooper bda09a22e1 Added in setup visual a check for to show the group as text. Ticket: #1501 2014-11-20 15:06:11 +01:00
mdtrooper bb05dfcd58 Fixed PHP warning about the unset 'server_log_dir' 2014-11-20 12:49:13 +01:00
mdtrooper afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper 2401c68b26 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper a9498399df Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
Alejandro Gallardo Escobar a12153dd6e Now the only average value of the simple graphs can be deactivated 2014-11-13 20:04:08 +01:00
mdtrooper 8933eb9153 Fixed PHP Warning of empty array 2014-11-06 15:46:33 +01:00
mdtrooper c66ca5251a Fixed the access (and listing in global search) to module with ACL tags. Ticket #1472 2014-10-20 16:45:47 +02:00
mdtrooper 3c509098cd Moved the global var '' to upside of code 2014-10-20 16:45:47 +02:00
mdtrooper 1cf2af5d54 Fixed the header checkbox for to select all. Ticket #1465 2014-10-17 12:57:09 +02:00
mdtrooper 8f28fa55e6 Fixed the ajax to get agents filtered by group. Ticket #1461 2014-10-16 14:50:55 +02:00
Alejandro Gallardo Escobar 767778e237 Removed a pair of dispensable graphs 2014-10-14 13:17:40 +02:00
Alejandro Gallardo Escobar 1dc8a9ce2d The database sanity section has been destroyed 2014-10-14 11:03:07 +02:00
mdtrooper 078d828411 Fixed the show plugin parameters field into the policy module form. 2014-10-13 16:59:57 +02:00
Alejandro Gallardo Escobar 1e678ba3a3 Merge branch 'feature/planned-downtimes-migrator' into develop 2014-10-09 18:18:43 +02:00
Alejandro Gallardo Escobar e8975bc770 Now the malformed planned downtimes have more visibility 2014-10-09 12:51:38 +02:00
mdtrooper e0b840eb54 Implemented a form filter in the list of users. Ticket #1418 2014-10-08 17:12:13 +02:00
Alejandro Gallardo Escobar 9fbec2bec9 Minor fix 2014-10-08 14:56:28 +02:00
Alejandro Gallardo Escobar ec99bf018e Added a check to know if exist malformed planned downtimes and an option to solve the problem 2014-10-08 14:55:59 +02:00
mdtrooper 5467284494 Fixed the urls in the downtime for to ACL users with AW 2014-10-07 19:58:19 +02:00
mdtrooper 065e6bb6ec Fixed the check items of visualmap as module items when the are a visualmap linked items 2014-10-06 18:35:09 +02:00
mdtrooper 95682d9249 Fixes the cleaned default values in the module plugins. Ticket #1406 2014-10-06 15:55:21 +02:00
Alejandro Gallardo Escobar 48b53fb165 Now the interface wizard adds the interface MAC to the module description 2014-10-02 16:05:31 +02:00
Alejandro Gallardo Escobar 5d07f8e0a4 Fixes on the reports permissions 2014-10-02 15:27:51 +02:00
Alejandro Gallardo Escobar c2925695bf Minor fixes 2014-10-01 12:21:08 +02:00
Alejandro Gallardo Escobar 983f677b00 Merge branch 'feature/ticket#1327-NetworkInterfaceReport' into develop 2014-09-30 16:30:45 +02:00