8857 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
278ceefb32 Added new info to the tree 2014-12-18 18:13:22 +01:00
Alejandro Gallardo Escobar
804b7743fc Now the groups has their icon 2014-12-18 18:11:57 +01:00
Alejandro Gallardo Escobar
90deab0e3b Improved tree styles 2014-12-18 18:10:44 +01:00
Alejandro Gallardo Escobar
a9eb533a9b Changes and fixes 2014-12-18 17:10:30 +01:00
Alejandro Gallardo Escobar
606d2128ce Moved code 2014-12-18 16:23:39 +01:00
Alejandro Gallardo Escobar
68065a5049 Cleaning the tree element detail functions 2014-12-18 16:22:38 +01:00
Alejandro Gallardo Escobar
5fb3e94203 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/tree.ajax.php
2014-12-18 14:48:18 +01:00
Alejandro Gallardo Escobar
4f12ffce8c Minor fixes 2014-12-18 14:43:45 +01:00
Alejandro Gallardo Escobar
678755aa24 Removed the test code of the new tree view 2014-12-18 14:42:00 +01:00
Alejandro Gallardo Escobar
b568156211 Improved the stability 2014-12-18 14:41:21 +01:00
Alejandro Gallardo Escobar
93b248bf14 Preparing the element detail output for the tree view 2014-12-18 14:40:29 +01:00
mdtrooper
c18b0b6066 Added ajax call for the stats. And fixed the function 'groups_agent_ok' in functions_groups.php 2014-12-18 14:25:38 +01:00
Alejandro Gallardo Escobar
13fdccde1f Improved the visual styles of the tree view 2014-12-18 12:38:19 +01:00
Alejandro Gallardo Escobar
4c933c3434 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/operation/tree2.php
2014-12-18 11:54:11 +01:00
Alejandro Gallardo Escobar
677c8cfa0d Now the tree dissapear when a new search is done 2014-12-18 11:50:11 +01:00
Alejandro Gallardo Escobar
36cae31017 Now the leaf icons has the pointer cursor 2014-12-18 11:49:21 +01:00
mdtrooper
56119d0b28 Remove the double slash in the urls of ajax 2014-12-18 11:46:41 +01:00
mdtrooper
82851e146b Hide the old tree when loading a new filtered tree 2014-12-18 11:43:06 +01:00
Alejandro Gallardo Escobar
96f6659b34 Now the children are shown again 2014-12-18 11:20:21 +01:00
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