Commit Graph

967 Commits

Author SHA1 Message Date
Arturo Gonzalez 50a8cc98e4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-12-19 13:06:22 +01:00
Arturo Gonzalez d9c64e2066 Fixed agents/modules report. Ticket #4183 2016-12-19 13:06:07 +01:00
m-lopez-f 94191afe7d Remove debug trace 2016-12-19 12:44:07 +01:00
daniel 9efccf33e8 fixed minor error SLA dinamic
(cherry picked from commit 0200fa8263)
2016-12-19 09:41:30 +01:00
Arturo Gonzalez 4e81c4c21b Added some things to agents/modules report. 2016-12-16 14:08:55 +01:00
daniel b28fe4cef4 Merge branch 'develop' into feature/report_SLA_new 2016-12-14 15:42:18 +01:00
daniel 2b0820d70e add new reports sla_hourly , weekly and availability graph 2016-12-12 16:48:25 +01:00
m-lopez-f 031ff4233a Feature: Add new filter in aget/group events report. Ticket: #4243 2016-12-01 16:18:37 +01:00
daniel ec848acc18 create new report sla weekly 2016-12-01 15:36:14 +01:00
enriquecd d203bee751 Visual console improvements - Edit Signes for builder, main creator / Main help modal window #110 2016-11-18 17:19:33 +01:00
enriquecd a89eb4ecf9 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-11-16 19:03:42 +01:00
enriquecd 76c1f7cd82 Visual console improvements - Add: font style/size setting - map size setting - back color map - graph function a type graph line/area - Improve wizard - Back graph color... #110 2016-11-16 18:58:27 +01:00
Arturo Gonzalez 60c0ae7ada Added two new fields to agent/module report item. Ticket #4183 2016-11-14 16:29:09 +01:00
Arturo Gonzalez 3269473eee New item to reports (Log)... (Added help tip to log item in reports) 2016-11-10 11:59:23 +01:00
Arturo Gonzalez 47443f7af3 New item to reports (Log)... (Added some things to the new item) 2016-11-08 11:33:08 +01:00
Arturo Gonzalez 530a1e7a93 New item to reports (Log)... (Init the feature) 2016-11-07 16:54:18 +01:00
enriquecd 2fbd094e11 "Unsuccesful action" has not enough information - #4119 2016-10-31 15:09:51 +01:00
enriquecd 21ddb758ba Fix Dark background and comments for Enterprise popup community version - #65 2016-10-28 18:11:53 +02:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
m-lopez-f c98a4be8fa Add percentil 95 a simple graph in reports. 2016-10-06 08:58:53 +02:00
daniel 2555f00b96 add name templates wizard and sample mode with macros ticket: 3937 2016-10-04 11:31:42 +02:00
Daniel Maya 370f7ff373 Changed agent name 2016-10-03 12:24:15 +02:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
enriquecd e5c82954f3 repair visual bugs
(cherry picked from commit 7928125092)
2016-09-28 18:20:42 +02:00
daniel 33e7e40856 ticket Integria: 4070 fixed visual console add custom graph #4070 2016-09-27 12:16:14 +02:00
Daniel Maya be2bbb262a Changed agent name in custom graphs. 2016-09-26 13:36:53 +02:00
m-lopez-f 0c53d76604 Fixed styles of simple value in visual console
(cherry picked from commit 9b9a25cea3)
2016-09-22 15:25:06 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Daniel Maya bb26f4b82d Added new check to equalize maximum thresholds. Ticket #3732. 2016-08-23 08:50:23 +02:00
m-lopez-f 127eebc0ed Fixed problems with html-labels and html editor in visual console. Tiquets: #3918 and #3985
(cherry picked from commit ec08ccd7c1)
2016-08-16 14:04:37 +02:00
m-lopez-f 54e1343687 Revert "Fixed problems qith html editor in textareas in visual console"
Cause: https://www.tinymce.com/docs/plugins/bbcode/ and problems with labels in visual console.
This reverts commit 96d7aca5bf.
2016-08-16 13:52:15 +02:00
Arturo Gonzalez 2f462370e8 Added new checkbox to hide agents that its first data time is less than report final time. Ticket 2 Gitlab 2016-07-21 14:57:06 +02:00
m-lopez-f 96d7aca5bf Fixed problems qith html editor in textareas in visual console
(cherry picked from commit 06e37132a8)
2016-07-21 14:49:46 +02:00
Daniel Maya 00b17f5eda Added pagination in custom graphics. Ticket #3886. 2016-06-30 08:46:52 +02:00
Alejandro Gallardo Escobar 8c88492a66 The service default image is not previewed now. Ticket #3753
(cherry picked from commit e8d48a60129755a1e20d7a0bc1eb1299c256f363)
2016-06-13 15:43:54 +02:00
Daniel Maya a15955a9e0 fixed tab main data. Ticket #3641. 2016-06-07 09:00:57 +02:00
fermin831 ea313336ab Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:11:47 +02:00
Arturo Gonzalez 2ce399dd0d Fixed last value checkbox in reports. Ticket#3685 2016-05-30 08:58:24 +02:00
Alejandro Gallardo Escobar c4c37c1e15 Fixed the error which caused the simple value elements disappear from the visual console after enable the grid
(cherry picked from commit ce150336a9)
2016-05-18 12:34:41 +02:00
m-lopez-f 67f1765248 Fixed problems with menus and acl enterprise 2016-05-18 11:40:20 +02:00
fermin831 8a4d627ca6 Added custom graph selection in item list Tickets #3664 2016-05-17 13:58:52 +02:00
fermin831 e97aff1cc4 Added report_limit token and functionality TICKETS #3577 2016-04-25 12:27:30 +02:00
m-lopez-f d989ac8442 Re-fixed problems with visual console. Tiquet: #3492
(cherry picked from commit 951856d837)
2016-03-23 15:14:47 +01:00
fermin831 2d310a7163 Changed Time to in working time to 00:00:00 TICKETS #3480 2016-03-17 15:52:35 +01:00
m-lopez-f a33c69d5cf Fixed problems with custom graphs. Ticket: #3413 2016-03-03 10:18:20 +01:00
fermin831 d3260a8c2b Solved open ACL reports problems 2016-03-01 10:17:21 +01:00
fermin831 eaaff12c9e Fixed Custom Graphs deletion TICKETS #3356 2016-02-11 15:20:02 +01:00
Arturo Gonzalez b9c9bb08d2 Now if user can't write in groups delete button desapears. Ticket#3352 2016-02-05 10:24:20 +01:00
m-lopez-f 868c5eec31 fixed problems with period in reports type avilibality. Tiquet: #3343 2016-02-03 16:28:42 +01:00
m-lopez-f 1c374acc3f Change refr in visual console. Tiquet: #3277 2016-01-28 11:57:32 +01:00
mdtrooper 51c5b6214a Cleaned duplicated order values in the reports. TICKET: #3156 2016-01-13 13:02:35 +01:00
mdtrooper bc5b4dcfe3 Change some code for the CSV reports. 2015-12-29 16:46:15 +01:00
Arturo Gonzalez de7d011c2a Fixed error when changes the background in visual console. Ticket#3076 2015-12-24 09:14:28 +01:00
m-lopez-f 3b5b7f5313 Fixed problems with period in visual console. Tiquet: #2672 2015-12-22 12:57:09 +01:00
m-lopez-f 994c99c1a8 Fixed creation objects when select 'Any' module of agents. Tqiuet: #3062 2015-12-14 14:59:50 +01:00
Arturo Gonzalez e1e1a04be1 Added a text in lines creation (advanced options). Ticket#3043 2015-12-09 12:02:43 +01:00
m-lopez-f 76be952702 Fixed other bug of simple value. Tiquet: #2952
(cherry picked from commit a136629929)
2015-11-05 13:48:50 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs.
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
2015-11-04 17:42:45 +01:00
m-lopez-f cb6a8c023a Add feature of upload background to visual consoles. Tiquet: #2945 2015-11-04 13:34:42 +01:00
m-lopez-f 0826844290 Fixed problems with simple value in visual console. Tiquet: #2952 2015-11-04 10:11:33 +01:00
Arturo Gonzalez Diaz 800f2b749a Fixed js lines between fathers and sons. Ticket#2746 2015-10-19 18:15:45 +02:00
m-lopez-f 9ed6fc2237 Fixed visual 2015-10-08 10:42:43 +02:00
Junichi Satoh 5d822f275a Fixed that blank group is selectable when group access restricted users
create custom report.

(cherry picked from commit eb8d2c786d)
2015-10-06 15:50:28 +09:00
Arturo Gonzalez Diaz a1bf9b4c69 Fixed js problem in set new parent (visual console). Ticket2765 2015-10-02 10:44:48 +02:00
Arturo Gonzalez Diaz 29174e6368 Fixed module graphs in visual console. 2015-10-01 13:42:37 +02:00
Arturo Gonzalez Diaz f432535f07 Fixed services in visual console. Ticket#2745 2015-10-01 09:11:12 +02:00
Arturo Gonzalez Diaz 0dd0ae4b4c Fixed module graph problems in visual console. Ticket#2825 2015-09-30 10:52:12 +02:00
Arturo Gonzalez Diaz a63a878f13 Fixed percentile bubble in visual console. Ticket #2817 2015-09-28 10:08:01 +02:00
Arturo Gonzalez Diaz 8201643998 Fixed error with module graph update in visual console. Ticket #2825 (In progress) 2015-09-28 09:22:59 +02:00
Arturo Gonzalez Diaz 47c3780f42 Fixed z index problem with lines in visual console. Ticket #2741 2015-09-28 09:00:18 +02:00
m-lopez-f 9bf9101de5 Fixed problems with wizard visual console. Tiquet: #2756 2015-09-24 12:29:47 +02:00
Arturo Gonzalez Diaz d2e7a0f94b Fixed lines in visual console. Ticket #2741 2015-09-23 13:04:30 +02:00
Arturo Gonzalez Diaz 609c0791b7 Fixd lines in visual console (view section). Ticket#2741 2015-09-21 13:42:21 +02:00
m-lopez-f bab32a5c85 Fixed creation element of custom/simple grahp in visual console. Tiquet: #2672 2015-09-08 11:37:31 +02:00
m-lopez-f 0ca9868cff changed form of pagination in reports. 2015-09-01 17:21:08 +02:00
mdtrooper 6507d09792 Fixed the percentile bar. TICKET: #2537 2015-08-26 12:06:44 +02:00
Arturo Gonzalez Diaz 5bb4158ca8 Error fixed in call function that returned empty the sla services list. Ticket #2546 2015-08-19 17:03:42 +02:00
m-lopez-f 4e090e20a6 Change label to filter by text and add toltip help. Tiquet: #2589 2015-08-18 16:55:59 +02:00
mdtrooper e3628acb01 Fixed the lost id in the creation of 'static graph' in the visualmap. TICKET: #2536 2015-08-18 12:27:12 +02:00
mdtrooper d7a8453139 Added times and days in the availability report item. TICKET: #2474
(cherry picked from commit 8f409cb5df)
2015-08-17 18:07:15 +02:00
mdtrooper c062bd6a6f Fixed in the report item of sql query in metaconsole. TICKET: #2319 2015-08-17 14:54:48 +02:00
mdtrooper 6658104e84 Fixed some networks components (about mysql plugin) in the installation SQL. TICKET: #2485 2015-08-17 13:39:06 +02:00
Arturo Gonzalez Diaz e394eab3ce Changed visual errors in wizard (visual console). Ticket #2537 2015-08-17 11:28:21 +02:00
mdtrooper 0a0d9fad25 Merge branch 'develop' into feature/ticket#2491-features-dashboard 2015-08-12 13:03:50 +02:00
m-lopez-f ce614178ad Fixed problems with icos in visual console 2015-08-06 11:09:48 +02:00
m-lopez-f 9ca0307742 Add preview of image of services in visual console. Tiquet: #2544 2015-08-06 09:42:36 +02:00
m-lopez-f dc035cc591 Fixed problems with add icon in visual console. Tiquet: #2528 2015-08-06 09:24:44 +02:00
mdtrooper e81b050e81 Added new report item 'historical data' for to get a raw data of module' (manual merge from pandora_5.1) 2015-08-05 14:58:00 +02:00
m-lopez-f 13b7bfca6e Fixed error with create line in visul console. Tiquet: #2483 2015-08-05 11:52:54 +02:00
Alejandro Gallardo Escobar 8fb71f8413 Fixes and improvements in the use of agents and monitors multiselects 2015-08-05 10:39:16 +02:00
mdtrooper c003bf344a Working in the center labels into the items in a visualmap. (not finished) 2015-07-27 16:24:04 +02:00
mdtrooper c4fc8586fd First commit with the changes. 2015-07-24 14:32:26 +02:00
m-lopez-f f547985cd6 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-21 08:39:18 +02:00
m-lopez-f e8d99351e6 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-20 17:03:26 +02:00
mdtrooper 75873b02d4 Some fixes in the visualmap. 2015-07-16 15:12:47 +02:00
Alejandro Gallardo Escobar a097aabf80 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property.
The 'attr' function is going to be deprecated an may cause errors in Firefox.
2015-07-14 11:11:22 +02:00
Alejandro Gallardo Escobar b3e977a40a Fixed an error related with the creation of a report after an invalid creation
Ticket #2397.
2015-07-13 12:45:36 +02:00
Alejandro Gallardo Escobar dd21d82046 Now the name input field has validation for the required property 2015-07-13 12:45:36 +02:00
mdtrooper b3a619d0ea Re-added the checkbox for multiple deletion of items in a visualmap into a metaconsole. TICKET: #2135 2015-07-08 17:01:20 +02:00
mdtrooper 3d46327f55 Rewrote the ajax call 'get_agent_modules_json_for_multiple_agents' for to run with the agents cache in new metaconsole in 6 version. 2015-07-08 16:40:12 +02:00
m-lopez-f 606e29684b Add pagination in custom reports and visual console. Tiquet: #2398 2015-07-08 16:09:00 +02:00
m-lopez-f 1fa83a35dc Solver problems with columns in list view reports. Tiquet: #2401 2015-07-08 10:35:52 +02:00
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 d053f5515a Fixed styles in metaconsole 2015-07-06 17:10:51 +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 1ee4df2d3a Delete nav in create reports, is useless 2015-07-02 11:44:59 +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
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 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +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 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +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
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 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 8cf8a65bd3 Fixes for the Oracl€. 2015-06-12 14:39:18 +02:00
Alejandro Gallardo Escobar 5963f47432 Removed some jQuery.ajax() timeouts 2015-06-11 18:39:02 +02:00
Alejandro Gallardo Escobar e2281d6bc8 Debug trace removed 2015-06-11 12:07:27 +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
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
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
mdtrooper f2539395c3 Fixes for the Oracl€. 2015-06-01 17:04:02 +02:00
mdtrooper 0297e38361 Fixes for the Oracl€. 2015-05-29 16:48:40 +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 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
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
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +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
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +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
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
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
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
Alejandro Gallardo Escobar 10c94d51d9 Error fixes 2015-04-10 12:34:42 +02:00
Alejandro Gallardo Escobar 488c4976b0 ACL fixes 2015-04-10 12:34:19 +02:00
mdtrooper f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +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 790c81a250 Add order in parent select in static graph in visual console, Tiquet: #2067 2015-04-06 10:25:03 +02:00
m-lopez-f ee17fad784 Add message when search in custom report and not found data, tiquet: #2030 2015-03-25 10:01:11 +01:00
m-lopez-f 581d5e9c5f Fixed list of data in report when user have strict_acl, tiquet: #2014 2015-03-23 14:48:27 +01:00
m-lopez-f f43698bfe7 Fixed visual metaconsole tiquet: 2013 2015-03-23 12:02:48 +01:00
Alejandro Gallardo Escobar f0dc044d37 Removed the the event checkboxes
(cherry picked from commit aad9e08700)
2015-03-17 14:22:32 +01:00
Vanessa Gil b1ebd56a1c Fixed search by group. 2015-03-13 12:56:28 +01:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
Vanessa Gil 041e9c00bc Fixed bug #1913. 2015-03-10 17:09:31 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper dba729a272 Fixed the lines in visualmaps with service items. TICKET: #1896
(cherry picked from commit 80bd7b0db2)

Conflicts:
	pandora_console/operation/visual_console/public_console.php
	pandora_console/operation/visual_console/render_view.php
2015-03-09 13:16:53 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper 0952b96b49 Added the option 'last value' for the items 'general' and 'exception' in reports. TICKET: #1819 2015-02-23 13:43:26 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper e4d26b0bd6 Added a checkboxes in the list of elements for to make more easy the deletion of item in visual map. TICKET: #1687 2015-01-29 16:53:52 +01:00
m-lopez-f fbf5ffcd0f Fixed error creating the url in, en Reporting>>Visual Console>>Show link to public Visual Console 2015-01-16 13:11:52 +01:00
mdtrooper 673d0bd34f Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
mdtrooper b0ee3ed266 Added the lost fields for item group in the element list. 2014-12-02 11:40:27 +01:00
mdtrooper 352c63087c The last work for the new elements into the visualmap. Ticket #1478 2014-11-26 16:03:40 +01:00
mdtrooper 61ecef9ef9 Working in the new elements for the visualmap. Ticket #1478 2014-11-26 15:33:07 +01:00
mdtrooper 0bc0fb1d7b Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:59:05 +01:00
mdtrooper 35739261fb Working in the new elements for the visualmap. Ticket #1478 2014-11-25 18:55:45 +01:00
mdtrooper 931aa455e0 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 16:30:40 +01:00
mdtrooper 320d85b3b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 15:37:58 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 018c5136c5 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 11:52:04 +01:00
mdtrooper 828d2aa8d8 Working in the new elements for the visualmap. Ticket #1478 2014-11-24 18:14:39 +01:00
mdtrooper c7514cd29c Working in the new elements for the visualmap. Ticket #1478 2014-11-24 17:52:28 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
mdtrooper 93c1089cff Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:37:07 +01:00
mdtrooper 9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
mdtrooper afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper 2401c68b26 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper a9498399df Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
Alejandro Gallardo Escobar a12153dd6e Now the only average value of the simple graphs can be deactivated 2014-11-13 20:04:08 +01:00
mdtrooper 065e6bb6ec Fixed the check items of visualmap as module items when the are a visualmap linked items 2014-10-06 18:35:09 +02:00
Alejandro Gallardo Escobar 5d07f8e0a4 Fixes on the reports permissions 2014-10-02 15:27:51 +02:00
Alejandro Gallardo Escobar c73d901873 Added a new report item which shows network interfaces information by agents of the selected group
* pandora_console/godmode/reporting/reporting_builder.item_editor.php: Added the item
	'network_interfaces_report'.

* pandora_console/include/functions_agents.php: Added the function
	"agents_get_network_interfaces" to get a list of network interfaces
	information by agent.

* pandora_console/include/functions_custom_graphs.php: Added the 'ttl' parameter
	to the function "custom_graphs_print".

* pandora_console/include/functions_reporting.php: Added the item
	'network_interfaces_report' to the function
	"reporting_render_report_html_item". Added the function
	"reporting_network_interfaces_table".

* pandora_console/include/functions_reports.php: Added the item
	'network_interfaces_report' to the function
	"reports_get_report_types".
2014-09-30 15:56:24 +02:00
mdtrooper 537df06e5e Fixed the slow visualmaps (and maybe in other places) with a item group 2014-09-25 13:52:11 +02:00
mdtrooper 2fe078da2f Fixed the visualconsole editor in metaconsole 2014-09-24 14:36:18 +02:00
mdtrooper 91f3938744 Fixed the PHP warning 2014-09-23 13:10:49 +02:00
mdtrooper 761b9d786b Added font styles for 4 and 6pt for the labels 2014-09-11 17:50:42 +02:00
Alejandro Gallardo Escobar 6412dc7e17 Added hooks to the enterprise services SLA reports
* include/ajax/reporting.ajax.php
  godmode/reporting/reporting_builder.item_editor.php:
	Added hooks to the enterprise services SLA reports.
2014-09-05 12:53:09 +02:00
Alejandro Gallardo Escobar 5edbda24c6 Added hooks to the service SLA wizard for reports
* godmode/reporting/reporting_builder.item_editor.php,
  godmode/reporting/reporting_builder.php,
  include/functions_reporting.php,
  include/functions_reports.php: Added hooks to the
	enterprise services SLA wizard.
2014-09-03 19:46:29 +02:00
vgilc d19eab7a24 Fixed parents on visual console
pandora_console/godmode/reporting/visual_console_builder.editor.js
2014-09-01 12:02:47 +02:00
alexhigh ebf958afc1 2014-08-27 Alejandro Gallardo <alejandro.gallardo@artica.es>
* operation/visual_console/render_view.php,
	  godmode/reporting/visual_console_builder.php: Added hooks
	to the enterprise wizard of services.

	* include/constants.php: Added constants for the services modes.

	* operation/events/events.php,
	  operation/events/events.build_query.php: Now is possible to
	filter the events by module id programmatically.

	* images/wand_services.png: Added image.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 17:09:07 +00:00
vgilc d246eed49f 2014-08-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/reporting_builder.php: Owner of a report can be delete it.
	Ticket #1199.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 14:58:24 +00:00
mdtrooper a6197fccb2 2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
vgilc 26f765dee6 2014-06-18 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/visual_console_builder.php: Changed
	default size of the module graphs.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10234 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-18 14:30:30 +00:00
alexhigh 775f327652 2014-06-18 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/reporting/visual_console_builder.editor.php:
	Added some buttons, like a control to edit the html code
	of the tinymce's textarea.

	* godmode/reporting/visual_console_builder.editor.js:
	Modified the funtion "hiddenFields" to enable the tinymce's
	code control only if the item is a label.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-18 10:33:13 +00:00
alexhigh e4251a348d 2014-06-17 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/reporting/visual_console_builder.editor.js:
	Modified the function "loadFieldsFromDB" to fix the graph
	type selection.

	* include/functions_visual_map_editor.php: Visual changes
	on the form created by the function
	"visual_map_editor_print_item_palette".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-17 17:04:59 +00:00
zarzuelo 7e84d8346f 2014-06-13 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.editor.js
	include/graphs/fgraph.php
	include/graphs/functions_pchart.php
	include/graphs/pChart/pImage.class.php
	include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	include/functions_visual_map_editor.php
	include/functions_custom_graphs.php
	include/functions_graph.php: Added option to cusomize the
	background of the graphs in visual consoles for ticket: #886



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10181 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-13 07:53:50 +00:00
mdtrooper ab110f04ad 2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_template.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/agentes/planned_downtime.editor.php, godmode/setup/news.php,
	include/ajax/module.php, include/functions.php,
	include/functions_ui.php, extensions/insert_data.php,
	operation/netflow/nf_live_view.php,
	operation/reporting/reporting_viewer.php,
	operation/reporting/graph_viewer.php, operation/tree.php,
	operation/agentes/datos_agente.php,
	operation/agentes/estado_monitores.php: fixed the i18n of the
	timepicker.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 15:57:36 +00:00
mdtrooper d520a9effe 2014-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the
	default height for the visualmap editor.
	
	Incident: #823
	
	* godmode/servers/manage_recontask_form.php: fixed PHP warning.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10075 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 14:24:10 +00:00
mdtrooper 26c25c8ae8 2014-05-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js,
	include/functions_visual_map_editor.php: fixed the palette tool for
	item group.
	
	Incident: #838




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10050 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 11:57:37 +00:00
mdtrooper c5ec3ebb55 2014-05-27 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/graph_builder.main.php,
	include/functions_graph.php, include/functions_visual_map.php,
	include/functions_custom_graphs.php, include/constants.php,
	operation/reporting/graph_viewer.php: killing unicorns and magic
	numbers for the kind of custom graphs.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10021 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-27 14:31:53 +00:00
mdtrooper 8af4331c4f 2014-05-27 Miguel de Dios <miguel.dedios@artica.es>
* extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	godmode/reporting/visual_console_builder.editor.js,
	include/functions_custom_graphs.php,
	include/ajax/visual_console_builder.ajax.php,
	include/functions_graph.php, include/functions_visual_map.php,
	include/functions_visual_map_editor.php, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	operation/reporting/graph_viewer.php, pandoradb_data.sql: added the
	custom graphs into the visualmaps.
	
	Incident: #367




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10018 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-27 12:59:56 +00:00
zarzuelo 4a7d2dbea4 2014-05-12 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/reporting_builder.php
	godmode/reporting/reporting_builder.item_editor.php
	include/functions_reporting.php
	include/functions_reports.php: Added SLA Monthly reports. Its
	an enterprise feature, so here is only the code to hook it and
	some forms logic

	* include/functions_html.php: Add support to header styles in
	html_print_table function. Used in SLA monthly reports



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9919 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-12 15:56:02 +00:00
juanmanuelr 0609943dac 2014-05-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
          include/functions_config.php
          extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
          extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
          extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
          pandoradb.data.postgreSQL.sql
          pandoradb.data.oracle.sql
          godmode/setup/setup_visuals.php       
          godmode/reporting/reporting_builder.php: New feature for
        reports and report templates, user can customize report
        front page in setup.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9880 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 16:42:12 +00:00
alexhigh 5f7feb75aa 2014-05-07 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/agentes/planned_downtime.editor.php,
	  godmode/alerts/configure_alert_template.php,
	  godmode/reporting/reporting_builder.item_editor.php,
	  operation/netflow/nf_live_view.php: Changed the maximum
	character length of the time inputs from 7 to 8.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 14:14:23 +00:00
alexhigh 40c3a501b9 2014-04-10 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb.sql,
	  pandoradb.oracle.sql,
	  pandoradb.postgreSQL.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
	Added the column "name"to the table "treport_content".

	* godmode/reporting/reporting_builder.item_editor.php,
	  godmode/reporting/reporting_builder.php: Now is posible
	to add a name to the report items.

	* godmode/reporting/reporting_builder.list_items.php: Now
	the list shows the name of the item or the description if
	the name is empty.

	* operation/reporting/reporting_xml.php,
	  include/functions_reporting.php: Now the XML and common
	reports show the item name if exists.

	* extensions/files_repo/files_repo_list.php: Improved
	the description.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9751 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-10 10:19:02 +00:00
vgilc e57566cc99 2014-04-07 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.sql
	  extras/pandoradb_migrate_5.0_to_5.1.mysql.sql
	  extras/pandoradb_migrate_5.0_to_5.1.oracle.sql
	  extras/pandoradb_migrate_5.0_to_5.1.postgreSQL.sql
	  godmode/reporting/reporting_builder.main.php
	  godmode/reporting/reporting_builder.php: Add scheduled
	reports.

	* images/csv_disabled.png
	  images/html_disabled.png
	  images/pdf_disabled.png
	  images/xml_disabled.png
	  images/schedule_report.png: Added images.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-07 10:34:16 +00:00
juanmanuelr 52c881d92a 2014-03-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/map_builder.php
        godmode/netflow/nf_edit_form.php
        include/ajax/visual_console_builder.ajax.php    
        operation/menu.php: Fix ACLs in these views.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-28 16:33:26 +00:00
mdtrooper d940f8bb52 2014-03-21 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php, include/constants.php,
	include/functions_visual_map.php: added the feature to set the
	parent of items from the wizard.
	
	Incident: #670




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9628 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-21 14:12:47 +00:00
mdtrooper b4305d7b9a 2014-03-20 Miguel de Dios <miguel.dedios@artica.es>
* images/group_green.disabled.png, images/group_green.png,
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/agentes/configurar_agente.php, include/styles/pandora.css,
	include/functions_networkmap.php, include/functions_agents.php,
	include/functions_visual_map_editor.php,
	include/functions_modules.php, include/functions_groups.php,
	include/constants.php, include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the feature to
	show the item for groups in visualmap.
	
	Incident: #671




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-20 16:43:42 +00:00
vgilc 100966e460 2014-03-14 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  pandoradb.sql
	  pandoradb_data.sql
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
	  godmode/reporting/graph_builder.graph_editor.php
	  godmode/setup/setup_visuals.php
	  include/functions_config.php
	  include/functions_graph.php: Changed weight and colors in
	combine graphs.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-14 08:33:13 +00:00
mdtrooper 84bc0b03ed 2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.main.php,
	godmode/reporting/reporting_builder.php,
	include/functions_users.php: fixed the access to the report with the
	user profile "RW" and "RM".
	
	Incident: #655




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9575 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-13 10:22:34 +00:00
zarzuelo 6d33b6fe83 2014-02-06 Sergio Martin <sergio.martin@artica.es>
* mobile/index.php
	mobile/operation/visualmap.php
	mobile/operation/visualmaps.php
	mobile/operation/networkmap.php
	mobile/operation/home.php
	mobile/operation/agent.php
	mobile/include/style/main.css
	mobile/include/user.class.php: Added visual
	consoles in mobile console. Improve the apparience with
	new icons (pandora ones), better layout, etc.

	* godmode/reporting/map_builder.php: Fix type
	in gettext function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-06 17:39:39 +00:00