Skip to content

Commit 47f3742

Browse files
author
geo
committed
Merge branch 'major-tree-refactoring-plus-additional-features' into develop
# Conflicts: # package.json
2 parents bf31a0a + 7dab019 commit 47f3742

50 files changed

Lines changed: 10364 additions & 601 deletions

Some content is hidden

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

.editorconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
root = true
2-
31
[*]
42
end_of_line = lf
53
insert_final_newline = true

.gitignore

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,14 @@
1-
node_modules/
2-
.idea/
3-
build/
4-
.vscode/
5-
npm-debug.log
6-
typings/
7-
.publish/
8-
yarn.lock
9-
.DS_Store
10-
11-
**/*.js.map
12-
13-
demo/**/*.js
14-
demo/**/*.d.ts
15-
demo/**/*.css
16-
17-
src/**/*.js
18-
src/**/*.d.ts
19-
20-
*.js
21-
*.d.ts
22-
23-
!.config/*.js
24-
1+
.idea
2+
.vscode
3+
.publish
4+
dist
5+
demo-dist
6+
build
7+
coverage
258
bundles
26-
27-
demo-build
28-
299
factories
30-
*.ngfactory.ts
31-
*.shim.ts
10+
node_modules
3211

33-
yarn.lock
12+
.DS_Store
13+
npm-debug.log
3414
yarn-error.log
35-
36-
*.metadata.json

.npmignore

Lines changed: 0 additions & 22 deletions
This file was deleted.

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
language: node_js
2+
node_js:
3+
- "6"
4+
script: npm test

0 commit comments

Comments
 (0)