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

8869 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
Alejandro Gallardo Escobar adbb1a6f12 Added a new command to disable the double authentication for the specified user 2014-12-15 14:59:22 +01:00
Alejandro Gallardo Escobar 220466fa1f Added the double auth functionality to the mobile version 2014-12-15 13:47:33 +01:00
artica 151f2a5b59 Auto-updated build strings. 2014-12-13 00:01:12 +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 d78461a92c Working in the improvements. Incident#1574 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
mdtrooper 8c3a5cedb7 Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 8633186b0e Working in the improvements. Incident#1574 2014-12-12 15:00:21 +01:00
Ramon Novoa 61aee8d419 Added two new OS icons. 2014-12-12 13:52:47 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
Alejandro Gallardo Escobar c15df44434 Fixed the 2 step login 2014-12-12 12:38:08 +01:00
artica e0a80add4b Auto-updated build strings. 2014-12-12 00:01:10 +01:00
Alejandro Gallardo Escobar 5e80428ed9 Revert "Fixed some paths" 
This reverts commit 7d1894e2ca.
 2014-12-11 18:49:04 +01:00
Alejandro Gallardo Escobar 123fdaee1a Minor fixes 2014-12-11 18:43:30 +01:00
Alejandro Gallardo Escobar 716a52e94d Fixed some paths 2014-12-11 18:43:16 +01:00
Alejandro Gallardo Escobar 9512216ed6 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 0d54510462 Modifications on the login process to include the 2 step verification 2014-12-11 16:18:26 +01:00
Alejandro Gallardo Escobar 96511fe25a Now the user can enable and configure the 2 step auth 2014-12-11 16:17:35 +01:00
Alejandro Gallardo Escobar 7caf016e4d Added some new rules 2014-12-11 16:16:36 +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
Alejandro Gallardo Escobar d399ccbd1f Added a new table called 'tuser_double_auth' 2014-12-11 16:11:21 +01:00
Alejandro Gallardo Escobar 3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
Alejandro Gallardo Escobar b71082ccdb Added a class to perform google autenticator checks 2014-12-11 16:09:17 +01:00
mdtrooper 9019b9c78f Fixed the bar charts with all values equal to 0. 2014-12-11 13:48:51 +01:00
artica 523d9dba7e Auto-updated build strings. 2014-12-11 00:01:07 +01:00
artica 7430c87ea0 Auto-updated build strings. 2014-12-10 00:01:10 +01:00
mdtrooper 704b3932a4 Working in the massive action for the tags in policies. Ticket: #1576 2014-12-09 15:57:35 +01:00
artica 95e57c41fe Auto-updated build strings. 2014-12-09 00:01:08 +01:00
artica 6b845912f2 Auto-updated build strings. 2014-12-08 00:01:09 +01:00
artica 8dc47efb5d Auto-updated build strings. 2014-12-07 00:01:08 +01:00
artica 153c666a1b Auto-updated build strings. 2014-12-06 00:01:09 +01:00
Ramon Novoa 26c9184f85 Fixed a string (needs translations too). 2014-12-05 15:29:12 +01:00
mdtrooper 875a3735eb 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 e5fcafa631 Added support for fping. 2014-12-05 11:07:30 +01:00
Alejandro Gallardo Escobar 6f9b87fae0 Merge branch 'feature/ticket#1412-AgentLogViewer' into develop 2014-12-05 10:50:23 +01:00
Alejandro Gallardo Escobar 4792299b5a Added a new tab to the agent view 2014-12-05 10:49:50 +01:00
artica 2a293139ec Auto-updated build strings. 2014-12-05 00:01:09 +01:00
Alejandro Gallardo Escobar 9ed9009596 Now the tree view tabs keep the 'pure' status 2014-12-04 17:48:02 +01:00
Alejandro Gallardo Escobar fb795d2a20 Merge branch 'feature/ticket#1612-GisAgentBubble' into develop 2014-12-04 16:40:16 +01:00
Alejandro Gallardo Escobar a706dfa917 Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:39:29 +01:00
mdtrooper d20c945af8 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 1bd2166d7e Cleaned source code style. (only for test git) 2014-12-04 14:39:35 +01:00
mdtrooper 03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper 3a3db3f0f7 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:37 +01:00
Alejandro Gallardo Escobar 10bf2819d6 Now many network maps can be deleted at once 2014-12-04 12:19:52 +01:00
artica bc27d934de Auto-updated build strings. 2014-12-04 00:01:10 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00