tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-19 08:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
20,014 Commits 34 Branches 30 Tags
Commit Graph

659 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
c755d7a326 Minor fix 2015-01-29 21:08:44 +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
Alejandro Gallardo Escobar
2a36e4b864 Merge branch 'develop' into feature/NewTreeView 2015-01-28 18:58:26 +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
Alejandro Gallardo Escobar
c765f6c957 Merge branch 'develop' into feature/NewTreeView 2015-01-26 17:51:39 +01:00
Alejandro Gallardo Escobar
e812c55264 Added the modules filter 2015-01-22 16:55:31 +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
Alejandro Gallardo Escobar
b99cef8c1a Fixed an error related with the id retrieving 2015-01-19 14:56:42 +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
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
Alejandro Gallardo Escobar
eac739d362 Revert "Strict ACLs" 
This reverts commit 3d251fd035d765db648b52cebf821fa89e20a908.
 2015-01-15 15:11:26 +01:00
Alejandro Gallardo Escobar
b67c74661f Minor fixes 2015-01-14 17:52:05 +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
Vanessa Gil
3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
Alejandro Gallardo Escobar
6b38a7072d Fixed js errors 2015-01-08 11:43:45 +01:00
Alejandro Gallardo Escobar
ed2781f46b Added the TreeEnterprise hooks 2015-01-05 13:23:11 +01:00
mdtrooper
1e47df9ab2 Starting the OS type treeview. 2014-12-19 18:39:18 +01:00
mdtrooper
fa475c38f4 Uploaded lost changes from the last day 2014-12-19 11:40:59 +01:00
mdtrooper
e94b685231 Added status of group nodes 2014-12-18 18:52:35 +01:00
Alejandro Gallardo Escobar
278ceefb32 Added new info to the tree 2014-12-18 18:13:22 +01:00
Alejandro Gallardo Escobar
606d2128ce Moved code 2014-12-18 16:23:39 +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
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
a045faeb6d Minor changes 2014-12-18 09:55:54 +01:00
mdtrooper
3556621cf0 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
mdtrooper
9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +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
mdtrooper
5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +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
3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
mdtrooper
03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +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
mdtrooper
303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper
6ba6290830 Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 16:37:07 +01:00
mdtrooper
a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
mdtrooper
e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper
631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
mdtrooper
7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
mdtrooper
9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper
22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
mdtrooper
afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper
e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper
97278f60d2 Erased the deprecated field 'no_link_color' in table 'tlayout_data' 2014-11-19 16:30:00 +01:00