Merge branch 'master' of https://github.com/ng2-ui/ng2-datetime-picker

Author: allenhwkim

app/build/app.js

@@ -21,6 +21,7 @@ var templateStr = `
           [max-date]="maxDate"
           [min-hour]="9"
           [max-hour]="17"
+          [show-am-pm]="true"
           [show-close-button]="true"
           [disabled-dates]="disabledDates"
           (closing$)="show = false"

app/build/app.js.map

@@ -21,6 +21,7 @@ var templateStr = `
           [max-date]="date2MaxDate"
           [show-close-layer]="true"
           [show-week-numbers]="true"
+          [is-draggable]="false"
           date-only="true"/>
         date2: {{date2}}
         <button id="set-date" (click)="date2 = date2New">Set 2017-12-31</button>

app/component-test.component.ts

@@ -23,6 +23,7 @@ export declare class NguiDatetimePickerComponent {
     showCloseLayer: boolean;
     showWeekNumbers: boolean;
     showTodayShortcut: boolean;
+    showAmPm: boolean;
     selected$: EventEmitter<any>;
     closing$: EventEmitter<any>;
     hours: ElementRef;
@@ -32,6 +33,7 @@ export declare class NguiDatetimePickerComponent {
     locale: any;
     showYearSelector: boolean;
     private _monthData;
+    private timeSuffix;
     constructor(elementRef: ElementRef, nguiDatetime: NguiDatetime, cdRef: ChangeDetectorRef);
     readonly yearsSelectable: number[];
     year: number;
@@ -57,4 +59,5 @@ export declare class NguiDatetimePickerComponent {
     isDateDisabled(date: Date): boolean;
     close(): void;
     selectToday(): void;
+    private convertHours(hours);
 }