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

1096 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
m-lopez-f c02622bd53 Add order by column Description in Agents detail. Tiquet: #2272 2015-05-27 08:58:50 +02:00
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
 2015-05-26 10:29:38 +02:00
mdtrooper 81a0a217b5 Fixed PHP Warnings 2015-05-25 13:31:10 +02:00
m-lopez-f 86db63f4f9 Fixed problems with name of dynamic's worksmap. tiquet: #2207 2015-05-25 12:55:18 +02:00
m-lopez-f 6dc62eccce Fixed problems with new code, not view unit in graph, tiquet: 2194 
(cherry picked from commit 2df8fab33a)
 2015-05-25 11:58:01 +02:00
mdtrooper 2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00
mdtrooper 1cb3399425 Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
m-lopez-f f5b26f69e6 Add unit to legend left in graph of interface information, tiquet: #2194 
(cherry picked from commit 277eb655a1)
 2015-05-06 13:04:45 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
m-lopez-f 899759a3ca Change visual 2015-04-29 08:30:02 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
m-lopez-f d14359d3b4 change visual of this views 2015-04-27 10:11:56 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
m-lopez-f 079b05b63e Reorganizate filter options and change visual 2015-04-23 13:04:54 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
m-lopez-f a7117fca61 Changed visual and changed images 2015-04-22 09:51:34 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
m-lopez-f 26f33a5169 Fixed visual of metaconsole 2015-04-21 11:08:42 +02:00
m-lopez-f df065fb10d Fixed problems with title when open graph in status monitor in meta and nodo, tiquet: #2077 2015-04-21 09:06:05 +02:00
m-lopez-f eb803c3ff2 Remove debug trace 2015-04-20 15:32:12 +02:00
m-lopez-f a454a16c57 Fixed error when open graph in tree view and monitor view. tiquet: #2126 2015-04-20 15:30:16 +02:00
m-lopez-f ebe95af69e Add title when open visual data in treeview and status monitor, tiquet: #2077 2015-04-20 10:40:42 +02:00
m-lopez-f 744f082841 Delete order in field Data in monitor detail, tiquet: #2060 2015-04-20 08:44:06 +02:00
m-lopez-f a77d962590 Modify styles in tactical view and tables is responsibe with window size 2015-04-15 11:28:07 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f 1a612ff3a8 Changed style in tactical view 2015-04-14 09:56:49 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
Alejandro Gallardo Escobar ddfb4ed2c4 Fixed a visual error 2015-04-10 14:10:12 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
m-lopez-f a6af8ab18d Merge branch 'develop' into feature/NewView 2015-04-09 14:47:06 +02:00
Alejandro Gallardo Escobar ae8789db9e Changes and improvements on the ACL checks 2015-04-09 14:05:23 +02:00
mdtrooper f9936267e0 Fixed the separator (sometimes it is other) in the ajax call get_agent_modules_json_for_multiple_agents. 
(cherry picked from commit 6f71a01b0c)
 2015-04-07 17:20:53 +02:00
m-lopez-f 5be63acffc Fixed html title when click graph in meta and nodo in status monitor, tiquet: #2077 2015-04-07 16:26:57 +02:00
m-lopez-f 0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f 6cec43c5fa Merge branch 'develop' into feature/NewView 2015-03-31 17:23:05 +02:00
Alejandro Gallardo Escobar 521845ee91 ACL improvements 2015-03-31 13:30:16 +02:00
Alejandro Gallardo Escobar 9bb62f1f43 Added the new way to store the maps in groups and ACL improvements 2015-03-31 12:27:12 +02:00
m-lopez-f 92b1be06ab Change visual of Group View 2015-03-31 09:52:27 +02:00