Skip to content

Commit 3e10766

Browse files
author
DSivachinskiy
committed
update addons
1 parent aab8aff commit 3e10766

11 files changed

Lines changed: 186 additions & 51 deletions

File tree

‎.jshintrc‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"predef": [
3+
"document",
4+
"window",
5+
"-Promise"
6+
],
7+
"browser": true,
8+
"boss": true,
9+
"curly": true,
10+
"debug": false,
11+
"devel": true,
12+
"eqeqeq": true,
13+
"evil": true,
14+
"forin": false,
15+
"immed": false,
16+
"laxbreak": false,
17+
"newcap": true,
18+
"noarg": true,
19+
"noempty": false,
20+
"nonew": false,
21+
"nomen": false,
22+
"onevar": false,
23+
"plusplus": false,
24+
"regexp": false,
25+
"undef": true,
26+
"sub": true,
27+
"strict": false,
28+
"white": false,
29+
"eqnull": true,
30+
"esnext": true,
31+
"unused": true
32+
}

‎.npmignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
bower_components/
2+
tests/
3+
tmp/
4+
dist/
5+
6+
.bowerrc
7+
.editorconfig
8+
.ember-cli
9+
.travis.yml
10+
.npmignore
11+
**/.gitkeep
12+
bower.json
13+
Brocfile.js
14+
testem.json

‎.watchmanconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp", "dist"]
3+
}

‎Brocfile.js‎

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

‎LICENSE.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎bower.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
{
22
"name": "ember-cli-admin-auth",
33
"dependencies": {
4+
"handlebars": "2.0.0",
45
"jquery": "^1.11.1",
5-
"ember": "1.11.0",
6-
"ember-data": "1.0.0-beta.16",
6+
"ember": "2.2.0",
7+
"ember-data": "2.2.0",
78
"ember-resolver": "~0.1.12",
8-
"loader.js": "stefanpenner/loader.js#3.2.0",
9+
"loader.js": "ember-cli/loader.js#3.2.1",
910
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
1011
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.1.3",
11-
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
12-
"ember-qunit": "0.2.8",
12+
"ember-load-initializers": "0.1.7",
13+
"ember-qunit": "0.4.7",
1314
"ember-qunit-notifications": "0.0.7",
15+
"ember-resolver": "~0.1.20",
1416
"qunit": "~1.17.1",
1517
"pretender": "0.1.0",
16-
"bootstrap-sass-official": "3.2.0",
17-
"typeahead.js": "twitter/typeahead.js#0.10.5",
18+
"bootstrap-sass-official": "3.3.4",
19+
"typeahead.js": "0.10.5",
1820
"jquery-ui-sortable": "*",
19-
"bootstrap-datepicker": "~1.3.1",
20-
"ember-simple-auth": "0.7.2",
21-
"jquery-ui-touch-punch": "git://github.com/cbier/bower-jquery-ui-touch-punch.git"
21+
"bootstrap-datepicker": "~1.4.0",
22+
"jquery-ui-touch-punch": "furf/jquery-ui-touch-punch"
23+
},
24+
"resolutions": {
25+
"ember": "2.2.0"
2226
}
2327
}

‎config/ember-try.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*jshint node:true*/
2+
module.exports = {
3+
scenarios: [
4+
{
5+
name: 'default',
6+
dependencies: { }
7+
},
8+
{
9+
name: 'ember-release',
10+
dependencies: {
11+
'ember': 'components/ember#release'
12+
},
13+
resolutions: {
14+
'ember': 'release'
15+
}
16+
},
17+
{
18+
name: 'ember-beta',
19+
dependencies: {
20+
'ember': 'components/ember#beta'
21+
},
22+
resolutions: {
23+
'ember': 'beta'
24+
}
25+
},
26+
{
27+
name: 'ember-canary',
28+
dependencies: {
29+
'ember': 'components/ember#canary'
30+
},
31+
resolutions: {
32+
'ember': 'canary'
33+
}
34+
}
35+
]
36+
};

‎ember-cli-build.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*jshint node:true*/
2+
/* global require, module */
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
5+
module.exports = function(defaults) {
6+
var app = new EmberAddon(defaults, {
7+
// Add options here
8+
});
9+
10+
/*
11+
This build file specifes the options for the dummy test app of this
12+
addon, located in `/tests/dummy`
13+
This build file does *not* influence how the addon or the app using it
14+
behave. You most likely want to be modifying `./index.js` or app's build file
15+
*/
16+
17+
return app.toTree();
18+
};

‎package.json‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,37 @@
3333
"author": "Igor Kurinnoy <kurinnoyi@gmail.com>",
3434
"license": "MIT",
3535
"devDependencies": {
36-
"body-parser": "^1.2.0",
37-
"broccoli-asset-rev": "0.3.1",
38-
"broccoli-concat": "0.0.12",
39-
"broccoli-merge-trees": "0.1.4",
40-
"broccoli-static-compiler": "0.1.4",
41-
"connect-restreamer": "^1.0.0",
42-
"ember-cli": "0.2.1",
43-
"ember-cli-admin": "git://github.com/ember-admin/ember-cli-admin.git",
44-
"ember-cli-app-version": "0.3.2",
45-
"ember-cli-babel": "^4.0.0",
46-
"ember-cli-bootstrap-datepicker": "0.3.0",
47-
"ember-cli-htmlbars": "0.7.4",
48-
"ember-cli-ic-ajax": "0.1.1",
49-
"ember-cli-inject-live-reload": "^1.3.0",
50-
"ember-cli-map": "git://github.com/ember-admin/ember-cli-map.git",
51-
"ember-cli-pretender": "^0.3.1",
52-
"ember-cli-qunit": "0.3.9",
53-
"ember-cli-simple-auth": "^0.7.2",
54-
"ember-cli-simple-auth-devise": "^0.7.2",
55-
"ember-cli-simple-auth-testing": "^0.7.2",
56-
"ember-cli-uglify": "1.0.1",
57-
"ember-data": "1.0.0-beta.15",
58-
"ember-export-application-global": "^1.0.2",
59-
"ember-watson": "^0.2.0",
60-
"express": "^4.8.5",
61-
"glob": "^4.0.5"
36+
"active-model-adapter": "2.0.3",
37+
"body-parser": "^1.14.1",
38+
"broccoli-asset-rev": "^2.2.0",
39+
"broccoli-concat": "^2.0.3",
40+
"broccoli-merge-trees": "^1.0.0",
41+
"broccoli-static-compiler": "^0.2.2",
42+
"connect-restreamer": "^1.0.3",
43+
"ember-cli": "1.13.13",
44+
"ember-cli-admin": "0.6.10",
45+
"ember-cli-app-version": "^1.0.0",
46+
"ember-cli-babel": "^5.1.5",
47+
"ember-cli-bootstrap-datepicker": "0.4.0",
48+
"ember-cli-content-security-policy": "0.4.0",
49+
"ember-cli-htmlbars": "^1.0.1",
50+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
51+
"ember-cli-ic-ajax": "0.2.4",
52+
"ember-cli-inject-live-reload": "^1.3.1",
53+
"ember-cli-map": "0.4.2",
54+
"ember-cli-pretender": "^0.5.0",
55+
"ember-cli-qunit": "^1.0.4",
56+
"ember-cli-release": "0.2.8",
57+
"ember-cli-sri": "^1.2.0",
58+
"ember-cli-uglify": "^1.2.0",
59+
"ember-data": "1.13.15",
60+
"ember-disable-prototype-extensions": "^1.0.0",
61+
"ember-disable-proxy-controllers": "^1.0.1",
62+
"ember-export-application-global": "^1.0.4",
63+
"ember-simple-auth": "^1.0.1",
64+
"ember-try": "~0.0.8",
65+
"ember-watson": "^0.7.0",
66+
"express": "^4.13.3",
67+
"glob": "^6.0.1"
6268
}
6369
}

‎tests/helpers/destroy-app.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Ember from 'ember';
2+
3+
export default function destroyApp(application) {
4+
Ember.run(application, 'destroy');
5+
}

0 commit comments

Comments
 (0)