pandorafms/pandora_console/godmode
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
..
agentes Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
alerts Fixed the english message of my last commit. Thanks Sancho. 2014-09-10 18:04:59 +02:00
category
db Removed a pair of dispensable graphs 2014-10-14 13:17:40 +02:00
events
gis_maps
groups Fixed the group count for to show delete icon in the list 2014-09-16 15:35:28 +02:00
massive Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
modules Fixed the header checkbox for to select all. Ticket #1465 2014-10-17 12:57:09 +02:00
netflow
reporting Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
servers Added info dialog with the modules and components that lock a server plugin 2014-12-12 15:01:50 +01:00
setup Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
snmpconsole Ask for confirmation before deleting an alert. Ticket #1153. 2014-09-02 09:02:44 +02:00
tag Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
update_manager 2014-08-14 Miguel de Dios <miguel.dedios@artica.es> 2014-08-14 16:01:59 +00:00
users Implemented a form filter in the list of users. Ticket #1418 2014-10-08 17:12:13 +02:00
admin_access_logs.php 2014-07-14 Vanessa Gil <vanessa.gil@artica.es> 2014-07-14 06:18:11 +00:00
audit_log_csv.php 2014-07-14 Vanessa Gil <vanessa.gil@artica.es> 2014-07-14 06:18:11 +00:00
extensions.php
menu.php The database sanity section has been destroyed 2014-10-14 11:03:07 +02:00