Skip to content

Commit 4c820aa

Browse files
authored
Merge branch 'master' into dkamburov/fix-268
2 parents 40fb10f + 2eaf850 commit 4c820aa

File tree

64 files changed

+69
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+69
-70
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ deploy:
2222
skip_cleanup: true
2323
2424
api_key:
25-
secure: Zu/eJ0WMio4dVw5NyF1VE7OjkOYhUW+2m5SDfmlJ226Ra7QoTJaj69DEOH13JR3161z1RKHqguLgkTfaXwT9NCaf1zAOn6Qhk0bf0GR52OvfypTaeaXdHnMvTaL3Y/O7xHNLlcnPfS/iq+6/D0TbDmsDwdXG8tKPRXFcEsouV+YXwGZuXWvkYFM8MJ2o0W5w3Z/T4JZ6adKER0tU0IhbkDeep1GNUXH3c+GLtIovQdb2Brz8y++4C7WTsy206XQDLFP3tFqCIaKOs8sVXdL5/SjOeQdEr1KkrVuVy25edAHryODm6L2BS0AUGXBYO5n+Ozb8ekJ9NtusDQVfuNZoFDoMUbSMupXcTutKHN51+FI/8SecLzRn3aL6/1Zk/gnI04sp/bdPH2Luc7tOhcsm9edsN1ojsTA9Lbbfa0iIlsKkulHLp35rpzfTLSlI2CYoT9a4mvj9idknKxXMCKJiC/ZK6P4PMiMKLaQAk1Mbg+6TLfA1SpFnhH+HNeLAmGMwWPnsCQmOQbKWeh0/8v0R58bFfTlswPrzPFsghnh/+K4fLQCOe1TwOwtwJyc3WK7csGAbNFg7AjlxvSia8MpJQ5p1IDLRDtHHt3qcoxJqwcIpwxSFayPW6L9mjwUCfnUxEl37Qnz4gbelijZtw99+FgUmDJ+xjXnHC9JMqfxMWrQ=
25+
secure: hGvEnVxB5T9XEea22TbvcaxlzYgPuBnzh6pfPnKxt6xrRzp3HCI3sDlH2VhcTCmszeUa0HxRzmbIvCZS8MOa1h7Y7rLLNanv4/VYu45uLsupUyXQ7YvKZEElOvYHrWdvgJbfHhbneH2xNSPr8zXMfmNgeLCKGJeHPy4d3OzuIJhNvctAsywjQImjn77drwFffRTSu9wCp4W/bAVUPe9AVR+8dpQs25haKBgdVRYIAYC7sCGanuFLlnVC5dFOlbZNdcpGQ7YU8ge1uli0yNqFcS0h7/ULD16/IcaJ55iNLcH0l0HJUQc+kIdXuwzUBaqyS+vB/5isxCc1gNnjn724w1Sar2VOxyYSNRxZZ8+5LL2c/sGlu+1MRaWehD+IIjtzgOmMVAd7fSMSwACvA3HnkRkFboZMWdmxkvNWHVtScXn6etXrS1pO+aMLEj388TWf4fMz4o3yQae0ax/RBu46UG1SFvo3jiftgBoygZoMqeItDzWcIp38XMx1CnNTb6s8ty4lMkiT7Gxa6tddQmkZhmK58IXxES/bnkFDkebxVxDHSWuUhM8qBy0FBVabDYrtzMskCa6ullTNi7eaT0oXlfZ0nAgQtR/WfXkMPFBb/0ryyh1glAc4XzjsSowDMGEkdn+Z1NHcRtGEoQ9KK7MgwQGdgllzjYEZhFQImyzxqTg=
2626
on:
2727
tags: true
2828
repo: IgniteUI/igniteui-angular-wrappers

CHANGELOG.md

Lines changed: 2 additions & 2 deletions

README.md

Lines changed: 4 additions & 4 deletions

app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { AppComponent } from './samples';
4-
import { IgGridComponent } from "../src/igniteui.angular2";
4+
import { IgGridComponent } from "../src/main";
55

66
@NgModule({
77
imports: [ BrowserModule ],

dist/npm/README.md

Lines changed: 4 additions & 4 deletions

dist/npm/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "5.0.3",
44
"description" : "A packaged version of Ignite UI wrappers for Angular",
55
"license": "MIT",
6-
"types": "igniteui.angular2.d.ts",
76
"main": "bundles/igniteui-angular-wrappers.umd.js",
87
"repository": {
98
"type": "git",

rollup.config.umd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import commonjs from 'rollup-plugin-commonjs';
33
import angular from 'rollup-plugin-angular';
44
import typescript from 'rollup-plugin-typescript';
55
export default {
6-
entry: 'src/igniteui.angular2.ts',
6+
entry: 'src/main.ts',
77
format: 'umd',
88
moduleName: 'igniteui-angular-wrappers',
99
sourceMap:true,

samples/aot/samples/igGrid-AoT/app.module.ngsummary.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

samples/aot/src/igniteui.angular2.ngsummary.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

samples/igCombo/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, NgModule } from '@angular/core';
2-
import { IgComboComponent } from "../../src/igniteui.angular2";
2+
import { IgComboComponent } from "../../src/main";
33
import { Northwind } from "./../data/northwind";
44
import { BrowserModule } from '@angular/platform-browser';
55
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

0 commit comments

Comments
 (0)