Commit Graph

2639 Commits

Author SHA1 Message Date
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
mdtrooper 3e2fd15302 Fixed, now the first task for visualmap does not show in metaconsole. 2015-07-06 18:18:52 +02:00
m-lopez-f 6b5df1983b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-06 17:11:11 +02:00
m-lopez-f d053f5515a Fixed styles in metaconsole 2015-07-06 17:10:51 +02:00
Alejandro Gallardo Escobar 8e8de1f706 Some fixes and improvements 2015-07-06 11:49:48 +02:00
m-lopez-f 4f789f268d Fixed error when filter fot SLA Monthly and dont show this items in report list items. Tiquet: #2240 2015-07-06 10:06:33 +02:00
m-lopez-f 942333530c Not show navigation menu in others view. Restore nav 2015-07-03 16:02:43 +02:00
m-lopez-f 98d51e7548 Change visual of nodo 2015-07-03 11:13:10 +02:00
m-lopez-f d6f5d52a65 Fixed problems with extension in new menu. Tiquet: #2364 2015-07-03 11:12:35 +02:00
m-lopez-f f3dd19a06d Change visual of nodo 2015-07-02 15:31:53 +02:00
m-lopez-f 8c3056eb79 Add legal text in files and change data 2015-07-02 15:24:39 +02:00
m-lopez-f 224f95466c Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-07-02 12:41:29 +02:00
m-lopez-f e16540a7e8 Restore column remote config 2015-07-02 12:38:45 +02:00
m-lopez-f 1ee4df2d3a Delete nav in create reports, is useless 2015-07-02 11:44:59 +02:00
m-lopez-f d7bd4773db Change visual of metaconsole 2015-07-02 08:54:21 +02:00
m-lopez-f 03b617908b Change visual of metaconsole 2015-07-01 17:05:53 +02:00
m-lopez-f 78e60249a7 Change visual of metaconsole and console 2015-07-01 14:50:00 +02:00
m-lopez-f 6f89828c76 Fixed problems to show groups fathers-childs in custom reports. Tiquet: #2351 2015-06-30 15:47:58 +02:00
Alejandro Gallardo Escobar ff55ac9d25 Error fix 2015-06-30 13:37:53 +02:00
Alejandro Gallardo Escobar 0549196ee5 Improved the styles of the offline update manager control to make it more pandora like 2015-06-30 13:20:20 +02:00
Alejandro Gallardo Escobar a719100855 Improvements to add better compatibility with the metaconsole 2015-06-30 12:59:23 +02:00
Alejandro Gallardo Escobar f68ff57490 New feature: bulk operations with plugins. Ticket #2301. 2015-06-29 18:46:22 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
m-lopez-f f88c2b4ce1 Only charge firts task when is console and not metaconsole 2015-06-29 10:43:03 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view
(cherry picked from commit 15fb6f20a4)
2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
mdtrooper d0a0b11440 Fixed call a oracle function.
(cherry picked from commit 66f982d22f)
2015-06-23 15:30:10 +02:00
mdtrooper 8b518ae9b2 Fixed the masive operations for modules when the name has white spaces. TICKET: #2328
(cherry picked from commit 737e085a81)
2015-06-23 12:16:07 +02:00
Alejandro Gallardo Escobar 4f9f8d2449 Fixed the title of the locked button dialog 2015-06-23 12:07:18 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
m-lopez-f 2754bfeeb0 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:30:57 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper d8e9a2406d Some fixes in the visual console. 2015-06-17 19:14:25 +02:00
mdtrooper 062817ca09 Some fixes in the visual console. 2015-06-17 17:37:23 +02:00
mdtrooper f1185c6db9 Some fixes in the visual console. 2015-06-17 17:36:41 +02:00
mdtrooper b2e31d9ca2 Some fixes in the visual console. 2015-06-17 17:04:14 +02:00
mdtrooper 6faa522187 Some fixes in the visual console. 2015-06-17 17:03:05 +02:00
mdtrooper bf0e89be3a Some fixes in the visual console. 2015-06-17 16:45:21 +02:00
mdtrooper ab032aa17a Some fixes in the visual console. 2015-06-17 15:55:16 +02:00
mdtrooper 43e8edc049 Some fixes in the visual console. 2015-06-17 12:42:52 +02:00
mdtrooper b7c6998fda Some fixes in the visual console. 2015-06-17 12:18:52 +02:00
mdtrooper ff1a35cb92 Some fixes in the javascript visualmap. 2015-06-16 18:02:58 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +02:00
mdtrooper 72ee6158fa Fixes for the Oracl€. 2015-06-16 14:42:17 +02:00
mdtrooper fad6a1e52d Fixes for the Oracl€. 2015-06-15 17:43:02 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f 2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar 05f27a4bdc Fixed an error retrieving data with oracle 2015-06-12 14:25:43 +01:00
mdtrooper 8cf8a65bd3 Fixes for the Oracl€. 2015-06-12 14:39:18 +02:00
mdtrooper 9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
mdtrooper a364542454 Sort and structure the code and result form with a huge fields of visual pandora setup. 2015-06-11 19:08:57 +02:00
Alejandro Gallardo Escobar 5963f47432 Removed some jQuery.ajax() timeouts 2015-06-11 18:39:02 +02:00
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 e2281d6bc8 Debug trace removed 2015-06-11 12:07:27 +02:00
Alejandro Gallardo Escobar bcfd0237bb Improvements on the oracle compatibitily 2015-06-10 17:44:20 +02:00
Alejandro Gallardo Escobar b02d381205 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-10 15:41:27 +02:00
Alejandro Gallardo Escobar 25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00
mdtrooper dbc6893747 Fixed the list of items in the report editor. 2015-06-10 15:20:48 +02:00
mdtrooper f9b6290413 Fixed the list of items in the report editor. 2015-06-10 15:14:48 +02:00
Alejandro Gallardo Escobar c8806ef1dc Fixes to improve the oracle compatibility 2015-06-09 18:52:11 +02:00
Alejandro Gallardo Escobar 7864e993d4 Error fixes 2015-06-09 12:43:12 +02:00
mdtrooper 0eafdac3ff Fixed the javascript to check a numeric field when it is empty. TICKET: #2176
(cherry picked from commit 905d768322)
2015-06-09 11:49:03 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +02:00
Alejandro Gallardo Escobar ce75ea467a Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-03 15:57:09 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
mdtrooper 3ca9a23d0a Fixes for the Oracl€. 2015-06-03 15:53:52 +02:00
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
mdtrooper f2539395c3 Fixes for the Oracl€. 2015-06-01 17:04:02 +02:00
m-lopez-f 589f054928 Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261 2015-06-01 13:41:31 +02:00
m-lopez-f 84fb973c6f Change privilege in call function to return groups of view this user. Tiquet: #2259
(cherry picked from commit 73ae001a3f)
2015-06-01 10:13:42 +02:00
mdtrooper 0297e38361 Fixes for the Oracl€. 2015-05-29 16:48:40 +02:00
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
m-lopez-f 2d646ce620 Fixed problems with list of interfaces in snmp walk wizard of interfaces. Tiquet: #2288
(cherry picked from commit cc861fd3a1)
2015-05-29 10:18:38 +02:00
m-lopez-f b8d10749b0 Changed name of labels menu and options in bulk operations 2015-05-28 13:42:34 +02:00
Alejandro Gallardo Escobar 185a101132 Removed a require of a deleted file 2015-05-27 16:02:22 +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
Alejandro Gallardo Escobar 760bc4a308 Many fixes, most of it related with the oracle support 2015-05-25 19:54:11 +02:00
mdtrooper 2f23441516 Fixed the 'inventory' and 'inventory_changes' items in metaconsole reports. TICKET: #2249 2015-05-25 16:01:33 +02:00
mdtrooper 22ce2d8902 Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249 2015-05-25 13:39:27 +02:00
mdtrooper d943fa5b78 Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249 2015-05-25 12:46:32 +02:00
mdtrooper 3a213df637 Fixed PHP Warnings 2015-05-22 17:28:44 +02:00
Alejandro Gallardo Escobar 7555963297 Now the user can delete filters with an empty name 2015-05-22 14:12:01 +02:00
m-lopez-f 50044050e1 Fixed problems with not variable initialized, tiquet: #2238 2015-05-22 12:13:22 +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 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
mdtrooper 34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
Junichi Satoh 8a63bc171d Fixed module configuration error with open version (without enterprise). 2015-05-13 21:56:43 +09:00
Alejandro Gallardo Escobar 11fb9fb6e2 Many fixes and improvements in the management of the recontasks 2015-05-12 18:20:00 +02:00
Alejandro Gallardo Escobar 4cb968782c Now the time to is different than the time from in the oncle time task 2015-05-11 14:14:30 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
mdtrooper 174726e253 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-06 16:39:37 +02:00
m-lopez-f 50e6fd2bab Fixed error when load data in action alert in manage alerts, tiquet: #2088 2015-05-06 13:09:45 +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
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
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +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 19abac33c1 Add option to change image when is service and fixed error when updated data. Tiquet: #2175 2015-05-04 12:44:46 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
mdtrooper 5545e4e616 Fixed the SLA form editor for to set graphs. TICKET: #2172
(cherry picked from commit e1e64b1a54)
2015-04-30 16:49:17 +02:00
m-lopez-f 899759a3ca Change visual 2015-04-29 08:30:02 +02:00
m-lopez-f 0ed625f42e Merge branch 'develop' into feature/NewView 2015-04-28 14:02:17 +02:00
m-lopez-f 885db84bd5 Delete column and change for other in list of servers. Tqiuet: #2144 2015-04-28 14:01:48 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
mdtrooper d947d62b51 Fixed show the widget 'show resume' in the 'availability' item in report. TICKET: #2149
(cherry picked from commit 0f72fa8bbd)
2015-04-24 19:05:45 +02:00
mdtrooper 184e705b8d Fixed the returning to item editor when it is availability item. TICKET: #2149
(cherry picked from commit 29f4c1d7e7)
2015-04-24 17:18:57 +02:00
mdtrooper d1bff5de92 Fixed the lost period in availability item. TICKET: #2149
(cherry picked from commit 61aa789033)
2015-04-24 17:10:29 +02:00
Alejandro Gallardo Escobar afc54630a8 Improved the code readability and added support to retrieve the agents from the new table of the metaconsole 2015-04-23 21:15:13 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
m-lopez-f 514ab2556b Change visual of agents detail and admin agent 2015-04-21 17:41:33 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
mdtrooper 3578687aad Fixed the lost checkbox to show graphs in the event items in the report (Merge from the commit 5572b88574). 2015-04-21 16:08:29 +02:00
Alejandro Gallardo Escobar 18a58243a4 Error fixes and performance improvements 2015-04-21 14:51:27 +02:00
mdtrooper 5572b88574 Fixed the lost checkbox to show graphs in the event items in the report 2015-04-21 13:18:29 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
m-lopez-f 89fa37578a Changed rowspan size 2015-04-15 12:14:55 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
Vanessa Gil 2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
Vanessa Gil 4392958648 Ticket #2044. 2015-04-13 16:58:05 +02:00