Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit f229b28

Browse files
committed
Merge branch 'aaronroberson-master' into dev
Conflicts: package.json
2 parents 2d176c4 + e7b2295 commit f229b28

File tree

2 files changed

+47
-2
lines changed

2 files changed

+47
-2
lines changed

index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
require('./dist/angular-datatables');
2+
require('./dist/plugins/bootstrap/angular-datatables.bootstrap');
3+
require('./dist/plugins/bootstrap/datatables.bootstrap.css');
4+
require('./dist/plugins/colreorder/angular-datatables.colreorder');
5+
require('./dist/plugins/columnfilter/angular-datatables.columnfilter');
6+
require('./dist/plugins/colvis/angular-datatables.colvis');
7+
require('./dist/plugins/fixedcolumns/angular-datatables.fixedcolumns');
8+
require('./dist/plugins/fixedheader/angular-datatables.fixedheader');
9+
require('./dist/plugins/scroller/angular-datatables.scroller');
10+
require('./dist/plugins/tabletools/angular-datatables.tabletools');
11+
module.exports = 'datatables';

package.json

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,42 @@
11
{
22
"name": "angular-datatables",
33
"version": "0.5.0",
4-
"dependencies": {},
5-
"author": "l-lin",
4+
"author": "l-lin",
5+
"main": "index.js",
6+
"ignore": [
7+
".bowerrc",
8+
".editorconfig",
9+
".git*",
10+
".jshintrc",
11+
".esformatter",
12+
"Gruntfile.js",
13+
"test",
14+
"src",
15+
".travis.yml",
16+
"vendor",
17+
"data.json",
18+
"data1.json",
19+
"demo",
20+
"favicon.png",
21+
"index.html",
22+
"README.md",
23+
"CONTRIBUTING.md",
24+
"server.js",
25+
"styles",
26+
"_config.yml",
27+
"grunt",
28+
"images",
29+
"bower.json",
30+
"archives",
31+
"archives.json",
32+
"dtOptions.json",
33+
"dtColumns.json"
34+
],
35+
"dependencies": {
36+
"angular": ">=1.3.0",
37+
"jquery": ">=1.11.0",
38+
"datatables": ">=1.10.0"
39+
},
640
"devDependencies": {
741
"grunt": "~0.4.1",
842
"grunt-express": "1.4.1",

0 commit comments

Comments
 (0)