Skip to content

Commit bc96062

Browse files
committed
Merge
2 parents 33124e1 + 0d8ac98 commit bc96062

Some content is hidden

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

47 files changed

+34358
-23391
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
*.xlsx binary
33
*.xls binary
4+
yarn.lock binary
45

56
/dist/* binary merge=ours
67
*.min.js binary

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
12
AlaSQL is based on unpaid voluntary work. Thank you for taking the time to make it better.
23

3-
Programming question?
4+
Question about how to ...
45
- Please use http://stackoverflow.com/questions/ask?tags=alasql
56

6-
Something not working as expected?
7+
Something is not working as expected:
78
- Describe the problem
89
- Provide code that replicates the problem
9-
- We suggest to spawn a jsfiddle from http://jsfiddle.net/mtt9r7rx/
10+
- We suggest to spawn a jsfiddle from http://jsfiddle.net/98qL7m0c/
1011

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ node_modules/
44
npm-debug.log
55
site/
66
test/test604.json
7+
test/test251.xlsx
78
.versions
89
.npm/

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ branches:
66

77
language: node_js
88
node_js:
9-
# - "node" # Looks like travis is having problems with the node 10 setup
9+
# - "node"
10+
- "11"
11+
- "10"
1012
- "9"
1113
- "8"
1214
- "7"
1315
- "6"
14-
- "5"
15-
- "4"
16+
1617

1718
script: npm run test:only && npm test
1819

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 Andrey Gershun
3+
Copyright (c) 2014 - present Andrey Gershun
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)