tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,865 Commits 34 Branches 30 Tags
Commit Graph

8865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mdtrooper
21750c4ee5 Working in the agent icon 2014-12-19 13:16:31 +01:00
mdtrooper
3adce577fd Fixed the return icon when is unknown 2014-12-19 13:16:31 +01:00
Alejandro Gallardo Escobar
2f90ad85a4 Improved the tree controller 2014-12-19 13:02:30 +01:00
mdtrooper
968256f6e2 Uploaded lost changes from the last day 2014-12-19 11:58:06 +01:00
mdtrooper
432d966a23 Uploaded lost changes from the last day 2014-12-19 11:40:59 +01:00
mdtrooper
149a5100d3 Added status of group nodes 2014-12-18 18:52:35 +01:00
Alejandro Gallardo Escobar
000e393f4e Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 
Conflicts resolved:
	pandora_console/include/class/Tree.class.php
 2014-12-18 18:16:25 +01:00
Alejandro Gallardo Escobar
a2d36a65f6 Added new info to the tree 2014-12-18 18:13:22 +01:00
Alejandro Gallardo Escobar
06912124db Now the groups has their icon 2014-12-18 18:11:57 +01:00
Alejandro Gallardo Escobar
36e6bd36f2 Improved tree styles 2014-12-18 18:10:44 +01:00
mdtrooper
5c37283fd6 Added the agents 2014-12-18 17:51:02 +01:00
Alejandro Gallardo Escobar
99317c79e6 Changes and fixes 2014-12-18 17:10:30 +01:00
Alejandro Gallardo Escobar
5bdb1046ca Moved code 2014-12-18 16:23:39 +01:00
Alejandro Gallardo Escobar
16f4dc4b70 Cleaning the tree element detail functions 2014-12-18 16:22:38 +01:00
Alejandro Gallardo Escobar
e76b678c23 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
f5d9903745 Minor fixes 2014-12-18 14:43:45 +01:00
Alejandro Gallardo Escobar
fef8e1f737 Removed the test code of the new tree view 2014-12-18 14:42:00 +01:00
Alejandro Gallardo Escobar
1bfd0b6d04 Improved the stability 2014-12-18 14:41:21 +01:00
Alejandro Gallardo Escobar
e6ee3ce59f Preparing the element detail output for the tree view 2014-12-18 14:40:29 +01:00
mdtrooper
df28fc326b 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
c8765c8f5b Improved the visual styles of the tree view 2014-12-18 12:38:19 +01:00
Alejandro Gallardo Escobar
7cf6c02a3f 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
b29783f6fe Now the tree dissapear when a new search is done 2014-12-18 11:50:11 +01:00
Alejandro Gallardo Escobar
bb1a0ecd23 Now the leaf icons has the pointer cursor 2014-12-18 11:49:21 +01:00
mdtrooper
0cccdbadcf Remove the double slash in the urls of ajax 2014-12-18 11:46:41 +01:00
mdtrooper
3da9f09741 Hide the old tree when loading a new filtered tree 2014-12-18 11:43:06 +01:00
Alejandro Gallardo Escobar
3f6e18c8b5 Now the children are shown again 2014-12-18 11:20:21 +01:00
Alejandro Gallardo Escobar
ece0296972 Fix 2014-12-18 11:09:46 +01:00
Alejandro Gallardo Escobar
2b28d813f8 Fixes 2014-12-18 11:04:41 +01:00
Alejandro Gallardo Escobar
cbd9621770 Minor changes 2014-12-18 09:55:54 +01:00
Alejandro Gallardo Escobar
2828c76ffa More fixes 2014-12-17 20:12:21 +01:00
mdtrooper
8b43643fa1 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
Alejandro Gallardo Escobar
a098b2f659 Fixes 2014-12-17 19:46:33 +01:00
Alejandro Gallardo Escobar
a9b096131d Fixes 2014-12-17 19:45:09 +01:00
Alejandro Gallardo Escobar
d0f226920c 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
a97074a3b7 Too lazy to explain 2014-12-17 19:11:07 +01:00
mdtrooper
42c08f152b Working in the new code of treeview 2014-12-17 19:00:48 +01:00
Alejandro Gallardo Escobar
99756ea236 Added new parameters and an icon to the tree root 2014-12-17 13:48:17 +01:00
Alejandro Gallardo Escobar
d3e9e98e30 Improved the visual style 2014-12-17 13:47:40 +01:00
Alejandro Gallardo Escobar
9d29ad63e4 Added test code 2014-12-17 12:26:41 +01:00
Alejandro Gallardo Escobar
9857fa477b Updated the tree style 2014-12-16 19:57:48 +01:00
Alejandro Gallardo Escobar
4b24052df4 Added a new controller to process and show the tree data 2014-12-16 18:32:01 +01:00
Alejandro Gallardo Escobar
b308647144 Added new style rules to the new tree view 2014-12-16 18:31:18 +01:00
mdtrooper
3e6fde548b Working in the new code of treeview 2014-12-16 16:39:00 +01:00
mdtrooper
42fdf3bebb First commit of new treeview 2014-12-16 13:08:02 +01:00
Alejandro Gallardo Escobar
fff2782f9c 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
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