Commit Graph

9016 Commits

Author SHA1 Message Date
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
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
Alejandro Gallardo Escobar 601cf56007 Fixes for the metaconsole 2015-01-19 13:12:27 +01:00
Alejandro Gallardo Escobar 388c8f2b1b Fixed an URL 2015-01-19 12:28:25 +01:00
Alejandro Gallardo Escobar b55bb55ac5 Fixed some URLs 2015-01-19 12:20:37 +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
m-lopez-f dde19b79d9 Added erased when a plugin is also deleted in the policies. 2015-01-19 10:52:25 +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
m-lopez-f cd589658f7 Fixed problem with create agent and not asigned ip address
create record in taddress and ip is ''
2015-01-16 14:08:49 +01:00
m-lopez-f fbf5ffcd0f Fixed error creating the url in, en Reporting>>Visual Console>>Show link to public Visual Console 2015-01-16 13:11:52 +01:00
mdtrooper 70e68e776f Fixed the PHP warning with undefined var. TICKET: #1552 2015-01-16 13:01:09 +01:00
m-lopez-f 0a440312d2 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-01-16 12:12:59 +01:00
m-lopez-f 3950c08587 Change help hint in Create user in field 'Global Profile'
(cherry picked from commit 9e14c5fb20)
2015-01-16 12:11:13 +01:00
mdtrooper e750aa7c91 Fixed the first page user for Dashboard. TICKET: #1588 2015-01-16 12:03:03 +01:00
m-lopez-f eb2de223aa changed description to use script 2015-01-16 11:50:52 +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 b9f0bf17f5 Fixed ha Perl Warning that maybe gave problems with parse the output 2015-01-15 16:36:52 +01:00
mdtrooper 774afe902c Removed old debug trace 2015-01-15 16:36:52 +01:00
m-lopez-f 41bdb11c18 fixed little problem 2015-01-15 16:30:50 +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
m-lopez-f c6b15f440f Fixed permissions error when validating alerts. 2015-01-15 10:34:55 +01:00
artica dddd986e63 Auto-updated build strings. 2015-01-15 00:01:10 +01:00