tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,227 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
mdtrooper 1e9f086cae Fixes for the management groups in the API. TICKET: #3119 
(cherry picked from commit f9ee9a7032)
 2016-01-05 12:17:46 +01:00
Alejandro Gallardo Escobar e8ce41e77c Fixed an error that occurred under certain circunstances when retrieving the group data 2015-08-05 13:43:18 +02:00
m-lopez-f 7ecbd7cfed Fixed error when user hace strict_user and acl's permisions and tags. Tiquet: #2508 2015-07-21 11:01:01 +02:00
Alejandro Gallardo Escobar e80183baf1 Error fix 2015-07-07 16:47:03 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
Alejandro Gallardo Escobar afada892fe Modified the 'group_get_data' and 'group_get_group_list' to retrieve the data from the metaconsole's new agent cache table 2015-04-15 15:29:07 +02:00
m-lopez-f c287a2064a Changed style to visualice data in 'Group view' tiquet: #1879 2015-03-18 13:11:30 +01:00
Alejandro Gallardo Escobar 24a67be19e Error fixes on the agent counter functions 2015-03-12 17:30:29 +01:00
Alejandro Gallardo Escobar b84bef8547 Fixes on the agent and monitor counter functions 2015-03-12 15:05:54 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
Alejandro Gallardo Escobar de78ae6542 Fixed the agents ok counter for strict acl users 2015-03-10 14:30:27 +01:00
Alejandro Gallardo Escobar 8cb7719e63 Fixed the agents counter functions 2015-02-20 12:43:09 +01:00
Alejandro Gallardo Escobar 2bf3887bd7 A lot of ACL fixes 2015-02-19 19:09:36 +01:00
mdtrooper a265ec3383 Fixed the functions to get agents not normal or not init in cases of agents with normal status and some modules not init. TICKET: #1791 2015-02-10 18:24:00 +01:00
Alejandro Gallardo Escobar c765f6c957 Merge branch 'develop' into feature/NewTreeView 2015-01-26 17:51:39 +01:00
Vanessa Gil 2908f09b01 Added strict ACL to agent detail view. 2015-01-26 13:50:58 +01:00
Vanessa Gil 9aff58ed33 Added Strict ACL mode to networmaps. 2015-01-23 08:59:42 +01:00
Alejandro Gallardo Escobar 9fa010c8ac Fixed errors 2015-01-19 16:52:32 +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
Alejandro Gallardo Escobar 4d64cddcc1 Fixed some php notices 2015-01-16 17:14:49 +01:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs" 
This reverts commit 3d251fd035.
 2015-01-15 15:11:26 +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 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
mdtrooper 41ed17cfe2 Uploaded lost changes from the last day 2014-12-19 11:58:06 +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
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
mdtrooper d20c945af8 Fixed the count of ok agents in the group view into the treeview 
(cherry picked from commit b711dcdd34)

Conflicts:
	pandora_console/include/functions_groups.php
 2014-12-04 16:33:34 +01:00
mdtrooper 1bd2166d7e Cleaned source code style. (only for test git) 2014-12-04 14:39:35 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
mdtrooper 333781b203 Fixed the not init agents in the tree group view. Ticket: #1584 2014-12-01 16:37:40 +01:00
mdtrooper 3c76f41387 Fixed the group view for agents not init. Ticket: #1584 2014-12-01 13:56:40 +01:00
Vanessa Gil af1b7c1f64 Fixed several bugs in events. 2014-11-25 16:58:20 +01:00
Alejandro Gallardo Escobar 0b2c6f5c45 Fixed an error on the function "groups_get_tree" 2014-10-20 16:55:02 +02:00
mdtrooper 7d18c1fdeb Fixed the groups_get_status 2014-09-25 19:37:02 +02:00
mdtrooper 537df06e5e Fixed the slow visualmaps (and maybe in other places) with a item group 2014-09-25 13:52:11 +02:00
Alejandro Gallardo Escobar ef31093b00 Now the parent groups without modules appear on the group view table 
* pandora_console/operation/agentes/group_view.php: Added the parent_id
	to the groups array.

* pandora_console/include/functions_groups.php: Fixed the function
	"groups_get_childrens". Improvements on the function
	"groups_get_group_row".
 2014-09-24 13:09:15 +02:00
mdtrooper 72257865b5 Fixed the group count for to show delete icon in the list 2014-09-16 15:35:28 +02:00
alexhigh 798d099f98 2014-07-30 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* include/functions_graph.php: Finished the function
	"graph_monitor_wheel". This function returns a sunburst
	graph representing all the group>agent>module group>module
	hierarchy.
	
	* include/functions_groups.php: Added the function
	"groups_get_tree". This function returns an array representing
	the group hierarchy of the passed groups array.

	* include/graphs/pandora.d3.js: Improved the function
	"sunburst". Now this graph can show tooltips.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-07-30 15:58:27 +00:00
mdtrooper b4c9a92ecc 2014-07-17 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_groups.php: added parameter to avoid the check
	the propagation in the function "groups_get_childrens".
	
	* include/functions_networkmap.php,
	operation/agentes/networkmap.php,
	operation/agentes/networkmap.topology.php: added feature to show the
	agents in subgroups (or not).
	
	INCIDENT: #1018




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-07-17 14:28:59 +00:00
vgilc f8df96383d 2014-06-03 Vanessa Gil <vanessa.gil@artica.es> 
* include/functions_groups.php: Fixed problem
	with ACLs in group  view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10092 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-03 11:52:46 +00:00
juanmanuelr 95685610b2 2014-05-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 
* pandora_console/include/functions_groups.php
          pandora_console/include/functions_events.php: Fixed bug
        in event viewer. A user could not be assigned himself as
        the owner of the event.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9864 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-05 13:58:08 +00:00
mdtrooper b4305d7b9a 2014-03-20 Miguel de Dios <miguel.dedios@artica.es> 
* images/group_green.disabled.png, images/group_green.png,
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/agentes/configurar_agente.php, include/styles/pandora.css,
	include/functions_networkmap.php, include/functions_agents.php,
	include/functions_visual_map_editor.php,
	include/functions_modules.php, include/functions_groups.php,
	include/constants.php, include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the feature to
	show the item for groups in visualmap.
	
	Incident: #671




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-20 16:43:42 +00:00
zarzuelo 5f431a7789 2014-02-10 Sergio Martin <sergio.martin@artica.es> 
* include/functions_groups.php: Fixed total agents
	count for group All

	* include/functions_graph.php
	mobile/operation/module_graph.php
	mobile/operation/modules.php
	mobile/operation/networkmaps.php
	mobile/operation/agent.php
	mobile/operation/agents.php
	mobile/operation/events.php
	mobile/operation/tactical.php
	mobile/operation/visualmaps.php
	mobile/include/ui.class.php
	mobile/include/style/main.css: A lot of fixes
	and improvements in mobile console



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-10 11:54:39 +00:00
zarzuelo 31d305b7d5 2014-02-04 Sergio Martin <sergio.martin@artica.es> 
* include/functions_groups.php
	mobile/operation/tactical.php
	mobile/operation/groups.php
	mobile/include/style/main.css: Improve mobile
	console. Especially groups view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-04 16:22:12 +00:00
zarzuelo 4ae9038f1b 2014-01-14 Sergio Martin <sergio.martin@artica.es> 
* include/functions_groups.php: Fix group parameter in links
	of groups view on mobile console. Incident #491




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-01-14 16:45:02 +00:00
Ramon Novoa bf88f47af1 2013-11-19 Ramon Novoa <rnovoa@artica.es> 
* godmode/reporting/reporting_builder.php,
	  include/functions_groups.php,
	  include/functions_users.php: Reverted changes for TSOL. Will be merged
	  after the 5.0SP1 release.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9100 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-11-19 16:21:42 +00:00