Commit Graph

7514 Commits

Author SHA1 Message Date
m-lopez-f b6c49949e4 Revert "Fixed generate data and visual of visual console when user used wizard, tiquet: #2196"
Problems with funcionality of visualconsole

This reverts commit 43bd6e0109.
2015-05-12 12:09:07 +02:00
m-lopez-f 43bd6e0109 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 11:08:43 +02:00
artica d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
Alejandro Gallardo Escobar a106111186 Refactored the procedure 'insert_id' to make it safe for insertions without sequences in oracle 2015-05-11 20:55:58 +02:00
Alejandro Gallardo Escobar e3ccfb95fe Refactored to fix some errors and improve the scalability 2015-05-11 20:54:23 +02:00
Alejandro Gallardo Escobar 4ce7de723a Now the db schema of this extension is created by processing a sql file 2015-05-11 14:18:18 +02:00
Alejandro Gallardo Escobar f0fe255f48 Added functions to process sql scripts to add data to the pandora database 2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar e47af5993f Minor fix 2015-05-11 14:16:44 +02:00
Alejandro Gallardo Escobar 9c7cfad44f Fixed some schema errors 2015-05-11 14:15:47 +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
artica 1cc02b9013 Auto-updated build strings. 2015-05-11 00:01:11 +02:00
artica a815e04f07 Auto-updated build strings. 2015-05-10 00:01:12 +02:00
artica 7c6934ff39 Auto-updated build strings. 2015-05-09 00:01:11 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
m-lopez-f 9921304417 Fixed problems withs path in windows, tiquets: #2153,#2114 2015-05-08 09:51:53 +02:00
artica 3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
Alejandro Gallardo Escobar f93e861369 Improved the output of the automatic config file 2015-05-07 18:36:25 +02:00
mdtrooper def5a597a2 Fixed the image for the 'simple_graph' in the enterprise pdf reports. 2015-05-07 17:05:50 +02:00
m-lopez-f 8b84b82a09 Add commands to execute in windows server for real time graphs. Tiquet:#2191
(cherry picked from commit cc7fcf71b3)
2015-05-07 16:02:38 +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
artica 4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper 0ec32cc826 Fixed the PHP Warnings about the re-start the session.
(cherry picked from commit 1a035873dc)
2015-05-06 18:43:10 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
mdtrooper c46bdc5087 Fixed the lost value for the config max_file_size.
(cherry picked from commit d2e57f2ec8)
2015-05-06 18:29:20 +02:00
mdtrooper d2e57f2ec8 Fixed the lost value for the config max_file_size. 2015-05-06 18:28:46 +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
mdtrooper c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
mdtrooper 94313bb249 Fixed the lost default parameter in the function. 2015-05-06 16:28:57 +02:00
mdtrooper 249e2e730d Working in the refactoring the code of reports (SLA_services). 2015-05-06 13:24:29 +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
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
artica 6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
Ramon Novoa 0dd42fd1e0 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-05-05 15:36:06 +02:00
Alejandro Gallardo Escobar 7bbd94843f Changed a type 2015-05-05 16:57:39 +02:00
Ramon Novoa c5f70a468c Changed some default values in pandoradb.oracle.sql. 2015-05-05 15:35:47 +02:00
Alejandro Gallardo Escobar 2396ba4d9d Added a missing serial and trigger 2015-05-05 14:05:04 +02:00
mdtrooper c2fdcbb1d8 Working in the refactoring the code of reports (SLA_monthly). 2015-05-05 13:15:10 +02:00
artica 5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +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 7ae97fa48b Added a new function to sort an associative array by key 2015-05-04 20:10:13 +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 758e11b5b0 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:40:30 +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 c2ce4fddf4 fixed distance to show box data to graph in agent view, tiquet: #2161 2015-05-04 16:34:25 +02:00
m-lopez-f c3026d70a4 Fixed error en menu, not show option 2015-05-04 15:59:31 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 0b59266a61 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-04 15:45:17 +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 3cd0dd60a3 Disabled a search filter when using an oracle database 2015-05-04 14:51:06 +02:00
Alejandro Gallardo Escobar 57a9d4615c Renamed a table due to the character limitation in oracle 2015-05-04 14:41:40 +02:00
Ramon Novoa cf6a26a0b5 Fixed a call to enterprise_include_once (was called before
ENTERPRISE_DIR was set).
2015-05-04 14:15:35 +02:00
m-lopez-f a12114048b add new lines to include new file in instalation agent in windows. tiquet: #2127 2015-05-04 13:45:49 +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
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
artica b9ace11dda Auto-updated build strings. 2015-05-04 00:01:09 +02:00
artica 8c2851cf7f Auto-updated build strings. 2015-05-03 00:01:08 +02:00
artica 88bb073bca Auto-updated build strings. 2015-05-02 00:01:10 +02:00
artica 2ef016b06e Auto-updated build strings. 2015-05-01 00:01:12 +02:00
Alejandro Gallardo Escobar 7c96bb7ce0 Added some missing columns 2015-04-30 20:12:05 +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 70bca63bd6 Fixed error when read file in windows, when path containt space, tiquet: #2166 and #2114 2015-04-30 13:44:16 +02:00
Alejandro Gallardo Escobar 64466e4557 Error fix 2015-04-30 12:46:43 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
m-lopez-f 40a9958905 Delete option, in home screen, only in insterprise servers. Tiquet: #2128
(cherry picked from commit c3b60812e0)
2015-04-30 08:49:41 +02:00
artica 0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
mdtrooper 3a74ee9f15 Working in the refactoring the code of reports (SLA). 2015-04-29 19:05:06 +02:00
mdtrooper 5c2b0c0549 Working in the refactoring the code of reports (top_n). 2015-04-29 16:14:39 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
Alejandro Gallardo Escobar 0b7b32f526 Changed the type of the group name column to improve the consistency with mysql 2015-04-29 15:31:01 +02:00
m-lopez-f 47bc043a4e Fixed error to generate url for view help, tiquet: #2158
(cherry picked from commit 1423c27c0e)
2015-04-29 09:53:40 +02:00
m-lopez-f 899759a3ca Change visual 2015-04-29 08:30:02 +02:00
artica fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
Alejandro Gallardo Escobar bf23be9e6f Fixes 2015-04-28 19:10:29 +02:00
Ramon Novoa 3d96e8fbf2 More fixes to SQL files. 2015-04-28 15:54:50 +02:00
m-lopez-f c50bbb7eea Change login and styles 2015-04-28 15:29:15 +02:00
Ramon Novoa e6657441d3 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-28 15:00:19 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
Alejandro Gallardo Escobar fc4f66f53f Added 'attachment/collection' to the gitignore 2015-04-28 14:37:25 +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
m-lopez-f e093853691 Merge branch 'develop' into feature/NewView 2015-04-28 11:37:27 +02:00
artica 3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +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
Ramon Novoa bd1e212644 Fixed SQL files for Oracle. 2015-04-27 12:26:01 +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
artica 9ef920de5f Auto-updated build strings. 2015-04-27 00:01:09 +02:00
artica 5e6c70b9d0 Auto-updated build strings. 2015-04-26 00:01:08 +02:00
artica 576aed5356 Auto-updated build strings. 2015-04-25 00:01:14 +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
Alejandro Gallardo Escobar 33fac67ed9 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-24 18:11:31 +02:00
Alejandro Gallardo Escobar b0f5724248 Removed the information about the defined alerts for the metaconsole 2015-04-24 18:10:50 +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
mdtrooper 55dc1a278e Working in the refactoring the code of reports (event_report_module). 2015-04-24 14:24:17 +02:00
m-lopez-f 63354c0188 Add new images to login and changed login 2015-04-24 13:45:13 +02:00
mdtrooper 24e0c6430b Working in the refactoring the code of reports (inventory_changes). 2015-04-24 13:07:50 +02:00
mdtrooper 78267bcda4 Working in the refactoring the code of reports (inventory). 2015-04-24 11:51:46 +02:00
artica 7dbf60d4ef Auto-updated build strings. 2015-04-24 00:01:13 +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
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 a4431d63a7 Improved the code maintenance and added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:12:24 +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 6544269429 Add forgotten options in menu 2015-04-23 11:02:24 +02:00
m-lopez-f a21d14e162 Fixed width to menu 2015-04-23 08:49:57 +02:00
m-lopez-f 8e6e49bc70 Fixed visual ot this view 2015-04-23 08:44:49 +02:00
m-lopez-f 645875a3a1 Fixed menu add sections that it isnt in menu 2015-04-23 08:44:04 +02:00
artica 13b7d4a414 Auto-updated build strings. 2015-04-23 00:01:12 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
mdtrooper 201e4dcd8a Working in the refactoring the code of reports (agent_module). 2015-04-22 16:32:24 +02:00
mdtrooper 38ae50eb90 Working in the refactoring the code of reports (exception). 2015-04-22 13:00:08 +02:00
m-lopez-f a7117fca61 Changed visual and changed images 2015-04-22 09:51:34 +02:00
m-lopez-f b39d21b034 Merge branch 'develop' into feature/NewView 2015-04-22 09:48:45 +02:00
m-lopez-f 0b9a4c1348 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-22 09:41:54 +02:00
m-lopez-f 46e74f1ddd Fixed error in pagination to extension Agents/Modules 2015-04-22 09:41:42 +02:00
artica 7812f2a965 Auto-updated build strings. 2015-04-22 00:01:28 +02:00
m-lopez-f 50282ad121 Change image in print warning and add new images and chenge images 2015-04-21 18:03:08 +02:00
m-lopez-f 514ab2556b Change visual of agents detail and admin agent 2015-04-21 17:41:33 +02:00
mdtrooper 1a41cc4973 Working in the refactoring the code of reports (group_report). 2015-04-21 17:27:21 +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
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
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
Alejandro Gallardo Escobar 90d5d3cae3 Changed an ajax call from synchronous to asynchronous 2015-04-21 13:58:28 +02:00
mdtrooper 6b13110b5b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 13:18:56 +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 7645ec0b48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 11:08:52 +02:00
m-lopez-f 26f33a5169 Fixed visual of metaconsole 2015-04-21 11:08:42 +02:00
Vanessa Gil 0bdf9c4404 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 10:48:48 +02:00
Vanessa Gil 291704ea66 Update translations. 2015-04-21 10:48:25 +02:00
m-lopez-f 896e6329c8 Fixed problems with title when open graph in tree view in meta and nodo, tiquet: #2077 2015-04-21 10:44:50 +02:00
m-lopez-f 6c26961534 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 09:06:15 +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
artica d6e7abe8c6 Auto-updated build strings. 2015-04-21 00:01:16 +02:00
m-lopez-f 122f75054a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-20 17:44:39 +02:00
m-lopez-f f52caebda3 Fixed error to replace character in tree view to data dialog 2015-04-20 17:44:21 +02:00
mdtrooper cd0d2c68e5 Fixed the function mysql_db_get_all_rows_in_table for several fields to order as array
(cherry picked from commit 36c5349cf4)
2015-04-20 16:26:05 +02:00
Vanessa Gil 5f60c5d5cc Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-20 15:48:39 +02:00
m-lopez-f dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
Vanessa Gil f392f309d1 Added translation. 2015-04-20 15:48:06 +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 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 744f082841 Delete order in field Data in monitor detail, tiquet: #2060 2015-04-20 08:44:06 +02:00
artica 4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
Junichi Satoh 129e9d0dfa Added php json extension check. 2015-04-19 23:26:17 +09:00
Junichi Satoh b4dbefaf66 Updated help. 2015-04-19 17:06:05 +09:00
Junichi Satoh ece9cdb4b3 Updated help. 2015-04-19 13:48:46 +09:00
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00
artica d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
mdtrooper 1993dae682 Working in the refactoring the code of reports (database_serialized). 2015-04-17 19:24:07 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
artica 332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
mdtrooper 8182edb9fa Fixed the SLA with a period have a setted a time slots.
(MANUAL cherry picked from commit c5b5d60d4c)
2015-04-16 19:23:55 +02:00
mdtrooper ec39e664fa Fixed the SLA with a period have a setted a time slots.
(cherry picked from commit c5b5d60d4c)
2015-04-16 19:21:13 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper 3dbd433285 Fixed the history data in boolean and string charts.
(cherry picked from commit f24919fe4b)
2015-04-16 15:38:59 +02:00
m-lopez-f 036538baa9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 15:18:28 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
Alejandro Gallardo Escobar e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar 08dd1832ac Found and removed the async ajax calls (finally!). That was a very bad practice.
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
2015-04-16 13:29:23 +02:00
Alejandro Gallardo Escobar a70d751c38 Removed the text of the agent search.
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
2015-04-16 13:16:50 +02:00
Vanessa Gil e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00
Vanessa Gil a0750e2b96 Fixed bug loading ajax. 2015-04-16 12:37:42 +02:00
Ramon Novoa 4f94d5bb50 Do not displayed advanced filters if custom filters are disabled. Small
fixes.
2015-04-16 11:35:20 +02:00
m-lopez-f db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
mdtrooper 713988d674 Working in the refactoring the code of reports (group_configuration). 2015-04-15 21:00:17 +02:00
mdtrooper 1d0bab4b64 Working in the refactoring the code of reports (network_interfaces_report). 2015-04-15 19:05:52 +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 0899805c11 Update translations. 2015-04-15 15:34:54 +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
Vanessa Gil 7225b61530 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 13:14:33 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
m-lopez-f 2813fac10b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 12:40:05 +02:00
m-lopez-f 80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +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 012393d164 Changed javascript code to jquery code and fixed style 2015-04-15 12:13:47 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +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
mdtrooper befd3bedbf Working in the refactoring the code of reports (alert_report_group). 2015-04-15 11:26:08 +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
m-lopez-f aab9628cbd Merge branch 'develop' into feature/NewView 2015-04-15 09:38:00 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
mdtrooper 906d6c5fe3 Working in the refactoring the code of reports (alert_report_agent). 2015-04-14 20:10:20 +02:00
mdtrooper a3f602d114 Working in the refactoring the code of reports (alert_report_module). 2015-04-14 19:13:31 +02:00