tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,838 Commits 34 Branches 30 Tags
Commit Graph

8838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro Gallardo Escobar
cd560178c0 Fix 2014-12-18 11:09:46 +01:00
Alejandro Gallardo Escobar
c647ae8048 Fixes 2014-12-18 11:04:41 +01:00
Alejandro Gallardo Escobar
a045faeb6d Minor changes 2014-12-18 09:55:54 +01:00
Alejandro Gallardo Escobar
76cc5d8a96 More fixes 2014-12-17 20:12:21 +01:00
mdtrooper
3556621cf0 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
Alejandro Gallardo Escobar
9191b97f07 Fixes 2014-12-17 19:46:33 +01:00
Alejandro Gallardo Escobar
9b8f53691a Fixes 2014-12-17 19:45:09 +01:00
Alejandro Gallardo Escobar
530454ea72 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 
Conflicts resolved:
	pandora_console/include/javascript/tree/TreeController.js
 2014-12-17 19:13:23 +01:00
Alejandro Gallardo Escobar
304b36b13a Too lazy to explain 2014-12-17 19:11:07 +01:00
mdtrooper
9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
Alejandro Gallardo Escobar
283dfb3160 Added new parameters and an icon to the tree root 2014-12-17 13:48:17 +01:00
Alejandro Gallardo Escobar
826dd6026a Improved the visual style 2014-12-17 13:47:40 +01:00
Alejandro Gallardo Escobar
b628faaeac Added test code 2014-12-17 12:26:41 +01:00
Alejandro Gallardo Escobar
daca918ee6 Updated the tree style 2014-12-16 19:57:48 +01:00
Alejandro Gallardo Escobar
a70df3c3e4 Added a new controller to process and show the tree data 2014-12-16 18:32:01 +01:00
Alejandro Gallardo Escobar
cb3283a402 Added new style rules to the new tree view 2014-12-16 18:31:18 +01:00
mdtrooper
48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
mdtrooper
24101c00c1 First commit of new treeview 2014-12-16 13:08:02 +01:00
Alejandro Gallardo Escobar
4b42222719 Now the tree images will be in the images folder. The operation/tree folder will be removed when this feature ends 2014-12-16 12:59:45 +01:00
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 7d1894e2ca985b9fad22c8cbff5373c17f2e6909.
 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