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

245 Commits

Author SHA1 Message Date
mdtrooper 9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +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 527d5079b3 Add option to changed image of service in visualconsole:builder. tiquet:#2175 
(cherry picked from commit ca1641a4e0)
 2015-05-26 16:01:57 +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 a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +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
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
Alejandro Gallardo Escobar 1ae9ee0810 Added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:14:24 +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 dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
m-lopez-f 05c47bcafe Merge branch 'develop' into feature/NewView 2015-04-21 17:13:58 +02:00
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
m-lopez-f dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
m-lopez-f 32582e5017 add title in dialog in tree view and change image in header 2015-04-20 12:31:04 +02:00
m-lopez-f 28522a1918 Add new images 2015-04-20 10:42:27 +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 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
Alejandro Gallardo Escobar d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
m-lopez-f f8c481a3ee Change views and styles in Console 2015-04-01 13:47:45 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
Alejandro Gallardo Escobar 9920fa9a3f Fixed a missing tooltip 2015-03-30 12:03:34 +02:00
Alejandro Gallardo Escobar fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
m-lopez-f 93a2d15b2c display data changed depending if compare dates or show date directly in the tree view #1976 2015-03-16 11:47:12 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
mdtrooper 8d214486e6 Fixed the situations when the period is not init. 2015-02-23 12:11:13 +01:00
mdtrooper c11a81dbef Fixed the ajax calls with timepicker in other languages instead english. 
(cherry picked from commit 15c93c3bd9)

Conflicts:
	pandora_console/include/ajax/module.php
 2015-02-19 18:37:12 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
m-lopez-f e15e458aec Fixed problem in view of 'Tree view' with large data length. Reopen T#1748 
(cherry picked from commit ded628da3e)
 2015-02-04 13:11:45 +01:00
m-lopez-f d4de8b3856 Add width in table view data in tree view 2015-02-02 10:24:29 +01:00
m-lopez-f 38be10c94f Fixed align in view table data in tree view 
(cherry picked from commit 18939f4249)
 2015-02-02 10:20:40 +01:00
Alejandro Gallardo Escobar 1127737f83 Error fixes related with the data retrieving for the tree views on the metaconsole 2015-01-30 15:32:39 +01:00
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 3d251fd035.
 2015-01-15 15:11:26 +01:00