GitHub PushEvent at 2014-12-16 06:05:49
Repository: wakeup
Actor: hardik-panchal
Payload: {"shas":[["aaaed35a65609f762ce0d37c160736a3032b95c0","1771f6771c8319aec0850338aacddd50fdcefc84@gmail.com","Maint files","Hardik Panchal",true],["3d395433e63e2060273645b2b4c1910cfefca52e","1771f6771c8319aec0850338aacddd50fdcefc84@gmail.com","Merge branch 'master' of https://github.com/hardik-panchal/wakeup\n\nConflicts:\n\tinstance/front/controller/driver_gratuitie_report.inc.php\n\tinstance/front/controller/driver_gratuitie_report_PDF.inc.php\n\tinstance/front/tpl/404.php\n\tinstance/front/tpl/CTA_click_info_column.php\n\tinstance/front/tpl/DOT_BRILNT11.php\n\tinstance/front/tpl/DOT_BRILNT20.php\n\tinstance/front/tpl/DOT_BRILNT21.php\n\tinstance/front/tpl/DriverPunchMailContent.php\n\tinstance/front/tpl/Odometer_dashboard.php\n\tinstance/front/tpl/ScheduleDriverScoreIndividual_content.php\n\tinstance/front/tpl/a.php\n\tinstance/front/tpl/asana_config.js.php\n\tinstance/front/tpl/asana_config.php\n\tinstance/front/tpl/asana_config_add.php\n\tinstance/front/tpl/asana_config_list.php\n\tinstance/front/tpl/average_gallon_price.php\n\tinstance/front/tpl/bk_mail_weekly_price_quote_status_content.php\n\tinstance/front/tpl/breadcrumb.php\n\tinstance/front/tpl/brilliant_university.js.php\n\tinstance/front/tpl/brilliant_university.php\n\tinstance/front/tpl/brilliant_university_add.php\n\tinstance/front/tpl/brilliant_university_data.php\n\tinstance/front/tpl/brilliant_university_data_category.php\n\tinstance/front/tpl/brilliant_universtiy_upload.php\n\tinstance/front/tpl/car_photo_mail_template.php\n\tinstance/front/tpl/car_photos_list.php\n\tinstance/front/tpl/car_schedule.js.php\n\tinstance/front/tpl/car_schedule.php\n\tinstance/front/tpl/car_schedule_add.php\n\tinstance/front/tpl/car_schedule_list.php\n\tinstance/front/tpl/car_schedule_list_data.php\n\tinstance/front/tpl/cartype.php\n\tinstance/front/tpl/cartype_add.php\n\tinstance/front/tpl/cartype_images.js.php\n\tinstance/front/tpl/cartype_images.php\n\tinstance/front/tpl/cartype_list.php\n\tinstance/front/tpl/chartHomePartners.php\n\tinstance/front/tpl/chart_area_basic.php\n\tinstance/front/tpl/chart_combo.php\n\tinstance/front/tpl/chart_funnel.php\n\tinstance/front/tpl/chart_pie.php\n\tinstance/front/tpl/chart_waterfall.php\n\tinstance/front/tpl/chat_window.php\n\tinstance/front/tpl/chat_window_design.php\n\tinstance/front/tpl/city.js.php\n\tinstance/front/tpl/city.php\n\tinstance/front/tpl/city_add.php\n\tinstance/front/tpl/city_list.php\n\tinstance/front/tpl/commonpagging.php\n\tinstance/front/tpl/component.js.php\n\tinstance/front/tpl/component.php\n\tinstance/front/tpl/component_add.php\n\tinstance/front/tpl/component_alerts.js.php\n\tinstance/front/tpl/component_alerts.php\n\tinstance/front/tpl/component_alerts_add.js.php\n\tinstance/front/tpl/component_alerts_add.php\n\tinstance/front/tpl/component_alerts_list_data.php\n\tinstance/front/tpl/component_list.php\n\tinstance/front/tpl/component_list_data.php\n\tinstance/front/tpl/cta_dash.js.php\n\tinstance/front/tpl/cta_dash.php\n\tinstance/front/tpl/cta_pie_chart_popup.php\n\tinstance/front/tpl/cta_stats.js.php\n\tinstance/front/tpl/cta_stats.php\n\tinstance/front/tpl/cta_summary.js.php\n\tinstance/front/tpl/cta_summary.php\n\tinstance/front/tpl/custom_reports.js.php\n\tinstance/front/tpl/custom_reports.php\n\tinstance/front/tpl/customerQoutePopup.php\n\tinstance/front/tpl/dash.php\n\tinstance/front/tpl/dateReturn.php\n\tinstance/front/tpl/dbTable.php\n\tinstance/front/tpl/demo.php\n\tinstance/front/tpl/detailers.js.php\n\tinstance/front/tpl/detailers.php\n\tinstance/front/tpl/detailers_add.php\n\tinstance/front/tpl/detailers_data.php\n\tinstance/front/tpl/detailers_gallonIntake.js.php\n\tinstance/front/tpl/detailers_gallonIntake.php\n\tinstance/front/tpl/detailers_gallonIntake_edit.js.php\n\tinstance/front/tpl/detailers_gallonIntake_edit.php\n\tinstance/front/tpl/detailers_list.php\n\tinstance/front/tpl/detailershome.php\n\tinstance/front/tpl/detailershome_vehicles.php\n\tinstance/front/tpl/detailershome_vehicles_list.php\n\tinstance/front/tpl/dispatch-status.php\n\tinstance/front/tpl/dispatch-status_data.php\n\tinstance/front/tpl/dispatch.js.php\n\tinstance/front/tpl/dispatch_center.js.php\n\tinstance/front/tpl/dispatch_center.php\n\tinstance/front/tpl/dispatch_center_data.php\n\tinstance/front/tpl/dispatch_center_detail.php\n\tinstance/front/tpl/dispatch_center_trip.php\n\tinstance/front/tpl/dispatch_text.js.php\n\tinstance/front/tpl/dispatch_text.php\n\tinstance/front/tpl/dispatch_text_data.php\n\tinstance/front/tpl/dispatcher_home.js.php\n\tinstance/front/tpl/dispatcher_home.php\n\tinstance/front/tpl/dispatcher_home_dent.php\n\tinstance/front/tpl/dispatcher_home_filter.php\n\tinstance/front/tpl/dispatcher_home_list_data.php\n\tinstance/front/tpl/dispatchers.js.php\n\tinstance/front/tpl/dispatchers.php\n\tinstance/front/tpl/dispatchers_add.php\n\tinstance/front/tpl/dispatchers_duty.js.php\n\tinstance/front/tpl/dispatchers_duty.php\n\tinstance/front/tpl/dispatchers_list.php\n\tinstance/front/tpl/dispatchers_notification.js.php\n\tinstance/front/tpl/dispatchers_notification.php\n\tinstance/front/tpl/dot_logs_admin.js.php\n\tinstance/front/tpl/dot_logs_admin.php\n\tinstance/front/tpl/dot_logs_admin_list_data.php\n\tinstance/front/tpl/driver_bulk_message.js.php\n\tinstance/front/tpl/driver_bulk_message.php\n\tinstance/front/tpl/driver_bulk_message_data.php\n\tinstance/front/tpl/driver_chart.js.php\n\tinstance/front/tpl/driver_chart.php\n\tinstance/front/tpl/driver_dashboard.js.php\n\tinstance/front/tpl/driver_dashboard.php\n\tinstance/front/tpl/driver_dashboard_filter.php\n\tinstance/front/tpl/driver_dashboard_list_data.php\n\tinstance/front/tpl/driver_dashboard_stats.js.php\n\tinstance/front/tpl/driver_dashboard_stats.php\n\tinstance/front/tpl/driver_dashboard_stats_list_data.php\n\tinstance/front/tpl/driver_gratuitie_report_PDF.php\n\tinstance/front/tpl/driver_score_daily_report_content.php\n\tinstance/front/tpl/driver_score_modal.php\n\tinstance/front/tpl/driver_score_weekly_report_content.php\n\tinstance/front/tpl/driver_scores.js.php\n\tinstance/front/tpl/driver_scores.php\n\tinstance/front/tpl/driver_scores_weekly.js.php\n\tinstance/front/tpl/driver_scores_weekly.php\n\tinstance/front/tpl/driver_sent_msg_list.php\n\tinstance/front/tpl/driverhome.php\n\tinstance/front/tpl/drivers.js.php\n\tinstance/front/tpl/drivers.php\n\tinstance/front/tpl/drivers_add.php\n\tinstance/front/tpl/drivers_filter.php\n\tinstance/front/tpl/drivers_list.php\n\tinstance/front/tpl/drivers_list_data.php\n\tinstance/front/tpl/driverscores_log.js.php\n\tinstance/front/tpl/driverscores_log.php\n\tinstance/front/tpl/drivertrip_list.php\n\tinstance/front/tpl/edit_account.php\n\tinstance/front/tpl/email_recipient.js.php\n\tinstance/front/tpl/email_recipient.php\n\tinstance/front/tpl/js/adapters/mootools-adapter.js\n\tinstance/front/tpl/js/adapters/mootools-adapter.src.js\n\tinstance/front/tpl/js/adapters/prototype-adapter.js\n\tinstance/front/tpl/js/adapters/prototype-adapter.src.js\n\tinstance/front/tpl/js/adapters/standalone-framework.js\n\tinstance/front/tpl/js/adapters/standalone-framework.src.js\n\tinstance/front/tpl/js/highcharts-all.js\n\tinstance/front/tpl/js/highcharts-more.js\n\tinstance/front/tpl/js/highcharts-more.src.js\n\tinstance/front/tpl/js/highcharts.js\n\tinstance/front/tpl/js/highcharts.src.js\n\tinstance/front/tpl/js/jquery.min.js\n\tinstance/front/tpl/js/modules/annotations.js\n\tinstance/front/tpl/js/modules/annotations.src.js\n\tinstance/front/tpl/js/modules/canvas-tools.js\n\tinstance/front/tpl/js/modules/canvas-tools.src.js\n\tinstance/front/tpl/js/modules/data.js\n\tinstance/front/tpl/js/modules/data.src.js\n\tinstance/front/tpl/js/modules/drilldown.js\n\tinstance/front/tpl/js/modules/drilldown.src.js\n\tinstance/front/tpl/js/modules/exporting.js\n\tinstance/front/tpl/js/modules/exporting.src.js\n\tinstance/front/tpl/js/modules/funnel.js\n\tinstance/front/tpl/js/modules/funnel.src.js\n\tinstance/front/tpl/js/modules/heatmap.js\n\tinstance/front/tpl/js/modules/heatmap.src.js\n\tinstance/front/tpl/js/modules/map.js\n\tinstance/front/tpl/js/modules/map.src.js\n\tinstance/front/tpl/js/modules/no-data-to-display.js\n\tinstance/front/tpl/js/modules/no-data-to-display.src.js\n\tinstance/front/tpl/js/themes/dark-blue.js\n\tinstance/front/tpl/js/themes/dark-green.js\n\tinstance/front/tpl/js/themes/gray.js\n\tinstance/front/tpl/js/themes/grid.js\n\tinstance/front/tpl/js/themes/skies.js\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_1.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_2.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_3.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_4.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_5.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_CALL_FAILED.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_CONFIRMED.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_FIRST_CALL_UNREACHABLE.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_ON_DISPATCHER.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_SECOND_CALL_UNREACHABLE.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_WORST_CASE.php\n\tinstance/front/tpl/wakeup_log_render/wakeup_log_day_prior_fail.php\n\tlib/apiHubSpot.class.php","Hardik Panchal",true]],"size":2,"ref":"refs/heads/master","head":"3d395433e63e2060273645b2b4c1910cfefca52e"}