Commit Graph

4138 Commits

Author SHA1 Message Date
mdtrooper 7628ddb5c6 Set a data limit in the forms of massive operations. TICKET: #1700 2015-02-04 11:19:11 +01:00
Alejandro Gallardo Escobar 4bb008b4eb Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-02-04 12:48:02 +01:00
Alejandro Gallardo Escobar c1ea771de0 Reduced the distance between the toggle and the content 2015-02-04 12:42:40 +01:00
artica 93ce434915 Auto-updated build strings. 2015-02-04 00:01:10 +01:00
m-lopez-f 84821a3729 Add help clippy in creation menus or views
Add clippy in:
Interval agent if this interval is < 300
Network maps>topology group
Create a new data server module in field 'Data Configuration'
In servers list, in column T/Q, when Q>200
2015-02-03 16:08:41 +01:00
m-lopez-f 38fa5ac67a Changed page no access 2015-02-03 13:37:56 +01:00
mdtrooper 9ff4ba1958 Fixed the graph for string module data. TICKET: #1749 2015-02-03 12:43:15 +01:00
m-lopez-f 0509d950ae Change text in help clippy for all servers down 2015-02-03 09:49:35 +01:00
m-lopez-f adf2bc3f6d Add clippy help for all servers down 2015-02-03 09:47:17 +01:00
artica b8307eba4a Auto-updated build strings. 2015-02-03 00:01:10 +01:00
mdtrooper 45d036acdb Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2015-02-02 14:18:32 +01:00
mdtrooper 9bed03aefd Fixed PHP warnings. 2015-02-02 14:18:05 +01:00
Alejandro Gallardo Escobar f59ba6f860 Added a network interfaces table to the agent detail table 2015-02-02 13:27:32 +01:00
Alejandro Gallardo Escobar 84b617e7a7 Fixed the forced title 2015-02-02 13:26:47 +01:00
Alejandro Gallardo Escobar a74dafdb49 Fixed an error with the ip retrieving on the function "agents_get_network_interfaces" 2015-02-02 13:16:31 +01:00
m-lopez-f d4de8b3856 Add width in table view data in tree view 2015-02-02 10:24:29 +01:00
m-lopez-f 38be10c94f Fixed align in view table data in tree view
(cherry picked from commit 18939f4249)
2015-02-02 10:20:40 +01:00
artica 50c150d492 Auto-updated build strings. 2015-02-02 00:01:07 +01:00
artica c867c556e5 Auto-updated build strings. 2015-02-01 00:01:08 +01:00
artica 62aa56ec1e Auto-updated build strings. 2015-01-31 00:01:42 +01:00
Alejandro Gallardo Escobar 4cf9accbd7 Merge branch 'feature/NewTreeView' into develop 2015-01-30 20:10:16 +01:00
Alejandro Gallardo Escobar 9880b60257 Fixed errors and added more information about the module alerts into the module nodes 2015-01-30 20:06:49 +01:00
Alejandro Gallardo Escobar ae829d042b Visual improvements 2015-01-30 20:05:42 +01:00
Alejandro Gallardo Escobar d7831dbb19 Improved the visual style of the output of the functions that print the agent, module and alert detail views 2015-01-30 20:04:56 +01:00
Vanessa Gil 9c99b99ac4 Fixed bug when checking acls to delete event. Ticket #1737. 2015-01-30 15:54:36 +01:00
Alejandro Gallardo Escobar 1127737f83 Error fixes related with the data retrieving for the tree views on the metaconsole 2015-01-30 15:32:39 +01:00
m-lopez-f 626a3b5527 Fixed problems with export audit log to csv when no data to show 2015-01-30 11:41:52 +01:00
artica 4ad250b464 Auto-updated build strings. 2015-01-30 00:01:09 +01:00
Alejandro Gallardo Escobar c755d7a326 Minor fix 2015-01-29 21:08:44 +01:00
Alejandro Gallardo Escobar 58b5813eab Mayor improvements and fixes 2015-01-29 21:00:30 +01:00
Alejandro Gallardo Escobar 5c8956193d Improved the tree view styles 2015-01-29 20:58:33 +01:00
Alejandro Gallardo Escobar 3b449f3789 Now the the items detail is returned correctly 2015-01-29 20:53:00 +01:00
Alejandro Gallardo Escobar 42b8b97f82 Fixed an error that made impossible the connection with the metaconsole nodes 2015-01-29 20:26:46 +01:00
mdtrooper 6d25709d3c Uploaded the width size of dialog of licence enterprise 2015-01-29 16:43:07 +01:00
m-lopez-f f9e378d1d6 Fixed problem with call function and not send all variables 2015-01-29 16:41:28 +01:00
m-lopez-f c0a2b0385d Change style en view graph of tree view
(cherry picked from commit 7e13fbc388)
2015-01-29 09:41:43 +01:00
artica f09576a13b Auto-updated build strings. 2015-01-29 00:01:11 +01:00
Alejandro Gallardo Escobar 2a36e4b864 Merge branch 'develop' into feature/NewTreeView 2015-01-28 18:58:26 +01:00
Alejandro Gallardo Escobar bb358dd4dd Lot of improvements on all the trees of the tree view 2015-01-28 18:57:33 +01:00
m-lopez-f d2238434f0 Fixed problem in tree view to metaconsola, not open popup
(cherry picked from commit 33bf0a4e7b)
2015-01-28 11:29:51 +01:00
m-lopez-f f38f5f052d Fixed problem with previous commit 2015-01-28 10:34:41 +01:00
m-lopez-f 25573e1c23 Show version server in 'Tactical server information' instead of data
(cherry picked from commit 278de27852)
2015-01-28 10:16:10 +01:00
artica 070d03b86a Auto-updated build strings. 2015-01-28 00:01:08 +01:00
m-lopez-f 47b11b97c1 Delete line of error with cherry-pick and recovery timestamp filter 2015-01-27 15:34:47 +01:00
m-lopez-f f4e1cee998 Fixed problems with view of data when click in binary image in tree view, monitor detail and list of monitors 2015-01-27 15:25:18 +01:00
Vanessa Gil dc4a6188a6 Fixed bug #1679. 2015-01-27 11:44:26 +01:00
artica f0091e2dc1 Auto-updated build strings. 2015-01-27 00:01:10 +01:00
Alejandro Gallardo Escobar 059afa931c Error fixes 2015-01-26 19:51:21 +01:00
Alejandro Gallardo Escobar b5371e3d7c Error fixes 2015-01-26 19:50:20 +01:00
Alejandro Gallardo Escobar e32b90b5c7 Error fixes 2015-01-26 19:35:56 +01:00
Alejandro Gallardo Escobar 43840408d6 Error fixes 2015-01-26 19:31:53 +01:00
Alejandro Gallardo Escobar 4c016548c6 Error fixes 2015-01-26 19:04:29 +01:00
Alejandro Gallardo Escobar 3dfbd4512b Error fixes 2015-01-26 18:18:34 +01:00
Alejandro Gallardo Escobar 7ecbb01903 Error fixes 2015-01-26 18:15:23 +01:00
Alejandro Gallardo Escobar c765f6c957 Merge branch 'develop' into feature/NewTreeView 2015-01-26 17:51:39 +01:00
Alejandro Gallardo Escobar 91ffbcc99f Improved the data retrieving of the tree views when the user has the strict acl enabled 2015-01-26 17:51:06 +01:00
Vanessa Gil 2908f09b01 Added strict ACL to agent detail view. 2015-01-26 13:50:58 +01:00
artica 0e70a8899a Auto-updated build strings. 2015-01-26 00:01:08 +01:00
artica 78553ae902 Auto-updated build strings. 2015-01-25 00:01:08 +01:00
artica 7fd3da065f Auto-updated build strings. 2015-01-24 00:01:09 +01:00
Vanessa Gil a387cb0683 Added Strict ACL mode to networkmaps.
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-01-23 09:00:39 +01:00
Vanessa Gil 9aff58ed33 Added Strict ACL mode to networmaps. 2015-01-23 08:59:42 +01:00
artica ac99cc4910 Auto-updated build strings. 2015-01-23 00:01:09 +01:00
Alejandro Gallardo Escobar 8decb5a8ee Error fixes 2015-01-22 19:13:30 +01:00
Alejandro Gallardo Escobar abb711e323 Error fixes 2015-01-22 18:19:38 +01:00
Alejandro Gallardo Escobar 20237195f2 Improved the data retrieving of the tree views 2015-01-22 18:07:17 +01:00
Alejandro Gallardo Escobar fe67eec2e0 Great improvements on the data retrieving 2015-01-22 16:56:44 +01:00
Alejandro Gallardo Escobar e812c55264 Added the modules filter 2015-01-22 16:55:31 +01:00
m-lopez-f a240b71fb4 fixed error in mysql to login user without AR permisions 2015-01-22 15:35:40 +01:00
mdtrooper 23f14f4c02 Finish the feature of massive operations with tags. TICKET: #1632 2015-01-21 18:58:17 +01:00
mdtrooper 531a7750bb First commit with the new feature for massive operations intags. Ticket: #1632 2015-01-21 18:58:17 +01:00
Alejandro Gallardo Escobar d6c51fb559 Rewrited all the data retrieving functionality of the different tree views 2015-01-21 17:37:51 +01:00
m-lopez-f db7680eb46 Add filter group module in general view of agents 2015-01-21 15:26:49 +01:00
mdtrooper 2d3f239789 Changes imprecise names and concepts in SNMP. Ticket: #1688 2015-01-21 14:47:54 +01:00
artica f4b66cee1a Auto-updated build strings. 2015-01-21 00:01:07 +01:00
m-lopez-f e2130fe482 Fixed problem with preview command in 'Configure alert action' 2015-01-20 12:11:01 +01:00
artica 863739eb7b Auto-updated build strings. 2015-01-20 00:01:37 +01:00
Alejandro Gallardo Escobar 702922c831 Error fixes 2015-01-19 18:11:10 +01:00
Alejandro Gallardo Escobar 8730eb0751 Error fixes 2015-01-19 18:05:46 +01:00
Alejandro Gallardo Escobar 91a6a1aeee Error fixes 2015-01-19 18:03:35 +01:00
Alejandro Gallardo Escobar a75f20e808 Error fixes 2015-01-19 17:47:22 +01:00
Alejandro Gallardo Escobar f03e854110 Error fixes 2015-01-19 17:45:13 +01:00
Alejandro Gallardo Escobar 931cb86842 Error fixes 2015-01-19 17:44:10 +01:00
Alejandro Gallardo Escobar 796d594edd Error fixes 2015-01-19 17:35:46 +01:00
Alejandro Gallardo Escobar 5f1c426fe9 Error fixes 2015-01-19 17:33:23 +01:00
Alejandro Gallardo Escobar 32952e1714 Error fixes 2015-01-19 17:09:31 +01:00
Alejandro Gallardo Escobar 09bf3a6e34 Error fixes 2015-01-19 17:07:07 +01:00
Alejandro Gallardo Escobar 9fa010c8ac Fixed errors 2015-01-19 16:52:32 +01:00
Alejandro Gallardo Escobar eb0a093525 Fixed some errors on the data retrieving 2015-01-19 15:32:02 +01:00
Alejandro Gallardo Escobar 9395e98452 Fixed the agents retrieving on the metaconsole 2015-01-19 15:08:45 +01:00
Alejandro Gallardo Escobar b99cef8c1a Fixed an error related with the id retrieving 2015-01-19 14:56:42 +01:00
Alejandro Gallardo Escobar 6074001552 Fixed the agents retrieving on the metaconsole 2015-01-19 14:47:00 +01:00
mdtrooper 99786a5a16 Fixed the custom config values for user in the first login. 2015-01-19 14:35:56 +01:00
Alejandro Gallardo Escobar 2ecff85928 Now the tree styles are imported from another file 2015-01-19 13:32:11 +01:00
Alejandro Gallardo Escobar b94e41dd40 Fixes for the metaconsole 2015-01-19 13:31:28 +01:00
m-lopez-f e2fac6ccb2 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-19 13:25:15 +01:00
m-lopez-f 0956132e39 changed the way of returning the data in the all_agents api function. 2015-01-19 13:24:51 +01:00
Alejandro Gallardo Escobar 601cf56007 Fixes for the metaconsole 2015-01-19 13:12:27 +01:00
Alejandro Gallardo Escobar c195e60e08 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-19 11:52:04 +01:00
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
artica 28585a2e39 Auto-updated build strings. 2015-01-19 00:01:06 +01:00
artica 3d8e45f918 Auto-updated build strings. 2015-01-18 00:01:07 +01:00
artica d7d2bc8439 Auto-updated build strings. 2015-01-17 00:01:08 +01:00
mdtrooper d083b78526 Change the position of tooltip in networkmap open. And updated the jquery.cluetip.js to 0.9.9 and human readble version. TICKET: #1625 2015-01-16 18:03:11 +01:00
Alejandro Gallardo Escobar a8d8bb5ec9 Now the tree view has compatibility with the metaconsole 2015-01-16 17:16:24 +01:00
Alejandro Gallardo Escobar 4d64cddcc1 Fixed some php notices 2015-01-16 17:14:49 +01:00
KIKUCHI Koichiro a9f80dd01b Fixed the bug that tree view in meta console does not work properly. 2015-01-16 19:12:45 +09:00
KIKUCHI Koichiro e5e417fb09 Fixed typo 2015-01-16 18:40:24 +09:00
KIKUCHI Koichiro 9a236c3df8 Small cleanup to prepare for the next changes. 2015-01-16 18:38:17 +09:00
artica f9a8bd5004 Auto-updated build strings. 2015-01-16 00:01:11 +01:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
mdtrooper f6509da99c Fixed the get data of module data list view with historic data base set on. TICKET: #1668 2015-01-15 16:39:05 +01:00
mdtrooper 774afe902c Removed old debug trace 2015-01-15 16:36:52 +01:00
m-lopez-f 5ca2a7ea3a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-15 15:45:29 +01:00
m-lopez-f 34c5ece58e Changed ACL's permission in Networkmaps
visualization: RR (Report Read)
Edition: RW (Report Write)
Deletion: RW (only yours networkmaps), RM(any of its group, although he did not create it.)
2015-01-15 15:45:00 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs"
This reverts commit 3d251fd035.
2015-01-15 15:11:26 +01:00
Alejandro Gallardo Escobar 047ccfac3c Fixed some function calls 2015-01-15 13:23:08 +01:00
artica dddd986e63 Auto-updated build strings. 2015-01-15 00:01:10 +01:00
Alejandro Gallardo Escobar fc65b60ead Working in the trees 2015-01-14 17:56:42 +01:00
Alejandro Gallardo Escobar 84b6f70df4 Fixed an error on the function "group_get_data" 2015-01-14 17:53:33 +01:00
Alejandro Gallardo Escobar b67c74661f Minor fixes 2015-01-14 17:52:05 +01:00
artica bbc15b6db9 Auto-updated build strings. 2015-01-14 00:01:09 +01:00
mdtrooper 8b961cffba Fixed the item group in visual consoles that links other visualmap. TICKET: #1647 2015-01-13 12:50:13 +01:00
mdtrooper a3210c6335 Fixed typo bug in the function 'visual_map_get_layout_status' 2015-01-13 12:40:46 +01:00
mdtrooper b7a75ea501 Added support for policies tags into the function 'tags_get_module_tags'. INCIDENT: #1644 2015-01-13 12:03:34 +01:00
m-lopez-f 925013f283 Fixed small error in translation. 2015-01-13 11:34:12 +01:00
artica 77d54785c8 Auto-updated build strings. 2015-01-13 00:01:10 +01:00
mdtrooper f0abdc0dc6 Fixed the topology networkmaps, sometimes the relationships of agents showed bad 2015-01-12 15:40:02 +01:00
mdtrooper 59bc138be4 Added the fixed of commit 'Fixed calculation of group items in visual maps on linked maps.' 2015-01-12 13:19:14 +01:00
Alejandro Gallardo Escobar 6984395716 Improved the data management 2015-01-12 12:47:54 +01:00
Alejandro Gallardo Escobar 2bc29cd6fe Now the tree shows more data of the items 2015-01-12 11:08:05 +01:00
Alejandro Gallardo Escobar 6a4a72afad Improvements in the data retrieving and management 2015-01-12 11:07:16 +01:00
Alejandro Gallardo Escobar 8f4afd4d0f Minor visual changes 2015-01-12 11:03:36 +01:00
Alejandro Gallardo Escobar bfe87ff73f Added new constants and functions to get the status images in their 'ball' type 2015-01-12 11:02:20 +01:00
artica 23503831cd Auto-updated build strings. 2015-01-12 00:01:09 +01:00
artica 2068beed5c Auto-updated build strings. 2015-01-11 00:01:08 +01:00
artica e3562c2c34 Auto-updated build strings. 2015-01-10 00:01:11 +01:00
Sancho Lerena 82abedb021 Solved a problem with autorefresh URL. This fixes problem on refreshing the same URL for a long time (p.e: 4 hours). Problem was the filename was not passed, and this, in someway, makes the whole system to add parameters to the right until it too long and breaks it.
To avoid other problems, I've added a safe check to see if coming URL contains "index.php" before adding it. Tested on several subcomponents and works.
2015-01-09 16:10:14 +01:00
Alejandro Gallardo Escobar e1b34840b1 Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/functions_groups.php
2015-01-09 11:41:07 +01:00
artica d71e225b8c Auto-updated build strings. 2015-01-09 00:01:12 +01:00
Alejandro Gallardo Escobar b21d4d6f5a Fixed some errors on the tree node detail controller 2015-01-08 18:23:01 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
Alejandro Gallardo Escobar 32b5415a07 Fixed an acl error 2015-01-08 16:39:35 +01:00
Alejandro Gallardo Escobar 2048e9408e Fixed an error on the groups tree view 2015-01-08 15:07:01 +01:00
Alejandro Gallardo Escobar 360bc80cc3 Fixed an error on the module groups tree view 2015-01-08 13:41:47 +01:00
Alejandro Gallardo Escobar ecd6b626ea Improved the tree view styles 2015-01-08 13:41:20 +01:00
Alejandro Gallardo Escobar b5c507a44b Modified the tree view styles 2015-01-08 13:19:01 +01:00
Alejandro Gallardo Escobar 302c0786af Added the server type image to the modules in the tree view 2015-01-08 13:18:27 +01:00
Alejandro Gallardo Escobar 7aa4851c5b Changed the 'forced_title' feature of the function "html_print_image" 2015-01-08 13:16:57 +01:00
Alejandro Gallardo Escobar ed9cd8f999 Improved the search filter and added new info icons to the modules in the tree view 2015-01-08 11:45:31 +01:00
Alejandro Gallardo Escobar 6b38a7072d Fixed js errors 2015-01-08 11:43:45 +01:00
artica 39a35e1f79 Auto-updated build strings. 2015-01-08 00:01:09 +01:00
artica ea9a01e2ae Auto-updated build strings. 2015-01-07 00:01:08 +01:00
artica 74b62dfa10 Auto-updated build strings. 2015-01-06 00:01:11 +01:00
Alejandro Gallardo Escobar 2d6d40bdba Changed the visibility of some functions 2015-01-05 20:05:19 +01:00
Alejandro Gallardo Escobar 70f84e2933 Improvements on the groups acl 2015-01-05 17:08:33 +01:00
Alejandro Gallardo Escobar d5c582f0a4 Improvements on the tag tree 2015-01-05 16:55:31 +01:00
Alejandro Gallardo Escobar f5d1e60ec3 Finished the tag tree view 2015-01-05 16:48:11 +01:00
Alejandro Gallardo Escobar 3229d7c5a3 Removed debug code 2015-01-05 13:27:32 +01:00
Alejandro Gallardo Escobar 3a03a9192f Improved the functionalities and prepared to be extended with another classes 2015-01-05 13:25:41 +01:00
Alejandro Gallardo Escobar bc6394dfad Modifed the tree view node height 2015-01-05 13:23:44 +01:00
Alejandro Gallardo Escobar ed2781f46b Added the TreeEnterprise hooks 2015-01-05 13:23:11 +01:00
artica 489b5ed490 Auto-updated build strings. 2015-01-05 00:01:09 +01:00
artica 1b00ebf065 Auto-updated build strings. 2015-01-04 00:01:09 +01:00
artica 7d40e724bd Auto-updated build strings. 2015-01-03 00:01:10 +01:00
Alejandro Gallardo Escobar 13ce624339 Added the os icons to the os tree 2015-01-02 12:37:19 +01:00
Alejandro Gallardo Escobar 5da9fd8210 Modified the style of the icons of the tree items 2015-01-02 12:36:36 +01:00
Alejandro Gallardo Escobar aa2ac75a32 Added the os tree 2015-01-02 12:11:41 +01:00
Alejandro Gallardo Escobar eb23864128 Fixed an error on the module group tree counters 2015-01-02 09:55:30 +01:00
Alejandro Gallardo Escobar 13e27b07d4 Added the module group tree 2015-01-02 09:45:53 +01:00
Alejandro Gallardo Escobar 49891a2248 Added the modules tree and working on other tree types 2015-01-02 09:11:00 +01:00
Alejandro Gallardo Escobar 2210164d12 Fixed performance problems 2015-01-02 09:09:56 +01:00
Alejandro Gallardo Escobar a47c791453 Added style rules to the tree view 2015-01-02 09:08:31 +01:00
artica 7970807cdc Auto-updated build strings. 2015-01-02 00:01:09 +01:00
artica 8e1adf056e Auto-updated build strings. 2015-01-01 00:01:09 +01:00
artica d43069f83e Auto-updated build strings. 2014-12-31 00:01:11 +01:00
Alejandro Gallardo Escobar 2e9b861d7c Lot of work on the data retrieving and processing 2014-12-30 16:24:23 +01:00
Alejandro Gallardo Escobar 39486ea9fc Error fixes 2014-12-30 16:23:31 +01:00
Alejandro Gallardo Escobar 0940008c8a Now the tree items show its counters properly 2014-12-30 12:43:18 +01:00
Alejandro Gallardo Escobar c86eaff51f Added a class to rotate elements and some style rules 2014-12-30 12:39:28 +01:00
Alejandro Gallardo Escobar 31b41f395f Improved the function "forced_title_callback" to use the element title in a special case 2014-12-30 12:36:19 +01:00
artica dfaa83d7ae Auto-updated build strings. 2014-12-30 00:01:09 +01:00
artica 38aa48d0f6 Auto-updated build strings. 2014-12-29 00:01:08 +01:00
artica 49714efb4d Auto-updated build strings. 2014-12-28 00:01:08 +01:00
artica f36ed28710 Auto-updated build strings. 2014-12-27 00:01:09 +01:00
artica 084e6f3ba0 Auto-updated build strings. 2014-12-26 00:01:08 +01:00
artica ef53d67667 Auto-updated build strings. 2014-12-25 00:01:08 +01:00
artica 56f1207dd3 Auto-updated build strings. 2014-12-24 00:01:12 +01:00
artica 7601599a21 Auto-updated build strings. 2014-12-23 00:01:09 +01:00
artica 874ec431f4 Auto-updated build strings. 2014-12-22 00:01:09 +01:00
artica 8191bc0aca Auto-updated build strings. 2014-12-21 00:01:09 +01:00
artica dd4b1e0b4a Auto-updated build strings. 2014-12-20 00:01:09 +01:00
mdtrooper 1e47df9ab2 Starting the OS type treeview. 2014-12-19 18:39:18 +01:00
mdtrooper 019bf4c926 Added the alerts fired count in the agents 2014-12-19 18:26:50 +01:00
mdtrooper 45a4880ec6 Added modules in the treeview 2014-12-19 18:13:47 +01:00
mdtrooper 42e56f51e4 Working in the agent icon 2014-12-19 13:16:31 +01:00
mdtrooper ce7ca44e8a Fixed the return icon when is unknown 2014-12-19 13:16:31 +01:00
Alejandro Gallardo Escobar 0d29de9f5a Improved the tree controller 2014-12-19 13:02:30 +01:00
mdtrooper 41ed17cfe2 Uploaded lost changes from the last day 2014-12-19 11:58:06 +01:00
mdtrooper fa475c38f4 Uploaded lost changes from the last day 2014-12-19 11:40:59 +01:00
artica 3cda932b04 Auto-updated build strings. 2014-12-19 00:01:11 +01:00
mdtrooper e94b685231 Added status of group nodes 2014-12-18 18:52:35 +01:00
Alejandro Gallardo Escobar 5c5a6a8ab1 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 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
mdtrooper 51c51e4fb2 Added the agents 2014-12-18 17:51:02 +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 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 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
artica edce8f5558 Auto-updated build strings. 2014-12-18 00:01:11 +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
artica d868c8bb82 Auto-updated build strings. 2014-12-17 00:01:08 +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
artica ed324c7a65 Auto-updated build strings. 2014-12-16 00:01:07 +01:00
mdtrooper 95873d9356 Added api for metaconsole. Ticket: #1474 2014-12-15 19:39:05 +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