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

20 Commits

Author SHA1 Message Date
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
danielmaya 7783f81f59 Fixed mobile graph 2018-05-17 16:43:31 +02:00
Fermin 9cf7fee2c0 [Rebranding] Open mobile console 2018-05-11 14:24:26 +02:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
Alejandro Gallardo Escobar beb38c70ce Changed the agent name by its alias in the mobile console 2017-02-22 13:50:06 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
m-lopez-f 483c64a888 Add lost updates of files in mobile version #148 2017-02-16 08:37:36 +01:00
m-lopez-f 1fe9ded0fc Add changes of visual mobile version of pandora. Gitlab: #148 2017-02-13 16:06:17 +01:00
Alejandro Gallardo Escobar 3dcb6a14a2 Fixed error and added new ACL checks 2014-10-15 18:12:51 +02:00
zarzuelo be97c59274 2014-02-10 Sergio Martin <sergio.martin@artica.es> 
* mobile/include/style/main.css
	mobile/index.php
	mobile/operation/visualmap.php
	mobile/operation/tactical.php
	mobile/operation/module_graph.php
	mobile/operation/modules.php
	mobile/operation/agent.php: More improvements on
	visual styles in mobile console. Layouts, adaption
	of graphs dinamically to the screen using ajax, etc.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-02-10 17:03:08 +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
darode de077f35ac 2013-12-05 Dario Rodriguez <dario@artica.es> 
* mobile/operation/module_graph.php: Fixed a problem with
        module graph filter regarding to event and period filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9172 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-12-05 14:35:27 +00:00
mdtrooper e278d705e4 2013-07-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_graph.php: fixed include javascript in the
	static image for boolean module graph.
	
	* mobile/operation/module_graph.php,
	mobile/operation/modules.php,
	mobile/include/style/main.css: a lot of fixes in mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-07-04 13:41:47 +00:00
mdtrooper 13c8e650ed 2013-07-03 Miguel de Dios <miguel.dedios@artica.es> 
* mobile/operation/events.php, mobile/operation/module_graph.php,
	mobile/operation/modules.php, mobile/operation/networkmaps.php,
	mobile/operation/groups.php, mobile/operation/agents.php,
	mobile/operation/tactical.php, mobile/operation/networkmap.php,
	mobile/operation/alerts.php, mobile/operation/agent.php,
	mobile/include/ui.class.php: added the back button in the head and
	impoved the source code style to make more easy the merges with
	the last branch.
	
	* include/functions_graph.php: fixed PHP notices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-07-03 13:59:38 +00:00
mdtrooper d449d7d2d9 2013-04-24 Miguel de Dios <miguel.dedios@artica.es> 
* mobile/operation/groups.php, mobile/operation/agents.php,
	mobile/operation/tactical.php, mobile/operation/alerts.php,
	mobile/operation/agent.php, mobile/operation/events.php,
	mobile/operation/module_graph.php, mobile/operation/modules.php,
	mobile/include/style/main.css: some fixes.
	
	* include/functions.php: erased the lost trace.
	
	* include/functions_graph.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8042 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-04-24 12:36:32 +00:00
mdtrooper 185a0a67aa 2013-04-22 Miguel de Dios <miguel.dedios@artica.es> 
* mobile/operation/events.php, mobile/operation/module_graph.php,
	mobile/operation/modules.php, mobile/operation/agent.php,
	mobile/include/ui.class.php: some fixes.
	
	* include/functions_reporting.php, include/functions_groups.php,
	include/functions_graph.php: some fixes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8025 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-04-22 15:51:37 +00:00
mdtrooper b657a0c23a 2013-04-04 Miguel de Dios <miguel.dedios@artica.es> 
* include/graphs/functions_flot.php, operation/agentes/stat_win.php:
	cleaned source code style.
	
	* mobile/include/ui.class.php, mobile/include/style/main.css,
	mobile/index.php, mobile/operation/module_graph.php,
	mobile/operation/modules.php: more changes for the mobile in the
	view of graph module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7931 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-04-04 17:44:07 +00:00