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

8819 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 15d5607787 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
Alejandro Gallardo Escobar bd6c39279a Added a new command to disable the double authentication for the specified user 2014-12-15 14:59:22 +01:00
Alejandro Gallardo Escobar cc663a76ab Added the double auth functionality to the mobile version 2014-12-15 13:47:33 +01:00
artica 80bdb3329f Auto-updated build strings. 2014-12-13 00:01:12 +01:00
mdtrooper 9367a8bdc9 Added info dialog with the modules and components that lock a server plugin 2014-12-12 15:01:50 +01:00
mdtrooper f80dc08f97 Working in the improvements. Incident#1574 2014-12-12 15:01:50 +01:00
mdtrooper fa06f32e2b Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper bdc2f4a64c Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 6e22069eee Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper f2c52b0c50 Working in the improvements. Incident#1574 2014-12-12 15:00:21 +01:00
Ramon Novoa c4ff87942f Added two new OS icons. 2014-12-12 13:52:47 +01:00
Ramon Novoa 1c48aaf1d0 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
Alejandro Gallardo Escobar 08bedf65af Fixed the 2 step login 2014-12-12 12:38:08 +01:00
artica d111940864 Auto-updated build strings. 2014-12-12 00:01:10 +01:00
Alejandro Gallardo Escobar cfc0295d6f Revert "Fixed some paths" 
This reverts commit 7d1894e2ca.
 2014-12-11 18:49:04 +01:00
Alejandro Gallardo Escobar 85830e0b79 Minor fixes 2014-12-11 18:43:30 +01:00
Alejandro Gallardo Escobar 7d1894e2ca Fixed some paths 2014-12-11 18:43:16 +01:00
Alejandro Gallardo Escobar e36b740f54 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar 87542c0fac Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 22e1203bc0 Modifications on the login process to include the 2 step verification 2014-12-11 16:18:26 +01:00
Alejandro Gallardo Escobar 2248979f67 Now the user can enable and configure the 2 step auth 2014-12-11 16:17:35 +01:00
Alejandro Gallardo Escobar 319bbbf0c9 Added some new rules 2014-12-11 16:16:36 +01:00
Alejandro Gallardo Escobar 77e824552d Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
Alejandro Gallardo Escobar 8a294c4d68 Added a new table called 'tuser_double_auth' 2014-12-11 16:11:21 +01:00
Alejandro Gallardo Escobar 3c7b099b93 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
Alejandro Gallardo Escobar 764171a142 Added a class to perform google autenticator checks 2014-12-11 16:09:17 +01:00
mdtrooper 1aa58804f0 Fixed the bar charts with all values equal to 0. 2014-12-11 13:48:51 +01:00
artica 2590b732e9 Auto-updated build strings. 2014-12-11 00:01:07 +01:00
artica 07e28a817a Auto-updated build strings. 2014-12-10 00:01:10 +01:00
mdtrooper 2e9fb633a8 Working in the massive action for the tags in policies. Ticket: #1576 2014-12-09 15:57:35 +01:00
artica 895ecde757 Auto-updated build strings. 2014-12-09 00:01:08 +01:00
artica 2b6fff0044 Auto-updated build strings. 2014-12-08 00:01:09 +01:00
artica 2320239370 Auto-updated build strings. 2014-12-07 00:01:08 +01:00
artica a7acd6ad61 Auto-updated build strings. 2014-12-06 00:01:09 +01:00
Ramon Novoa 63a1b0107a Fixed a string (needs translations too). 2014-12-05 15:29:12 +01:00
mdtrooper c7ea10e1f6 Fixed the script to create events with especial characters in the parameters 
(cherry picked from commit f3e98738ed)
 2014-12-05 12:08:42 +01:00
Ramon Novoa 05390e7bd7 Added support for fping. 2014-12-05 11:07:30 +01:00
Alejandro Gallardo Escobar 4012c6f5e6 Merge branch 'feature/ticket#1412-AgentLogViewer' into develop 2014-12-05 10:50:23 +01:00
Alejandro Gallardo Escobar 4e0d7c2a54 Added a new tab to the agent view 2014-12-05 10:49:50 +01:00
artica 7a1682034c Auto-updated build strings. 2014-12-05 00:01:09 +01:00
Alejandro Gallardo Escobar 3dc506e200 Now the tree view tabs keep the 'pure' status 2014-12-04 17:48:02 +01:00
Alejandro Gallardo Escobar acb0746c73 Merge branch 'feature/ticket#1612-GisAgentBubble' into develop 2014-12-04 16:40:16 +01:00
Alejandro Gallardo Escobar f714bba2cb Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +01:00
mdtrooper 7a139c394e Fixed the count of ok agents in the group view into the treeview 
(cherry picked from commit b711dcdd34)

Conflicts:
	pandora_console/include/functions_groups.php
 2014-12-04 16:33:34 +01:00
mdtrooper 03adf3f9d6 Cleaned source code style. (only for test git) 2014-12-04 14:39:35 +01:00
mdtrooper 43d06f96b7 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper 668d029047 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:37 +01:00
Alejandro Gallardo Escobar badafddc3b Now many network maps can be deleted at once 2014-12-04 12:19:52 +01:00
artica 58744d03d8 Auto-updated build strings. 2014-12-04 00:01:10 +01:00
mdtrooper 483ef4321b Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00