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

3720 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 13fdccde1f Improved the visual styles of the tree view 2014-12-18 12:38:19 +01:00
Alejandro Gallardo Escobar 36cae31017 Now the leaf icons has the pointer cursor 2014-12-18 11:49:21 +01:00
Alejandro Gallardo Escobar 96f6659b34 Now the children are shown again 2014-12-18 11:20:21 +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 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
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
artica 151f2a5b59 Auto-updated build strings. 2014-12-13 00:01:12 +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 8633186b0e Working in the improvements. Incident#1574 2014-12-12 15:00:21 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
artica e0a80add4b Auto-updated build strings. 2014-12-12 00:01:10 +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 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 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
artica 2a293139ec Auto-updated build strings. 2014-12-05 00:01:09 +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
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
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
artica 1587428f57 Auto-updated build strings. 2014-12-03 00:01:09 +01:00