aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/tslint.json2
-rwxr-xr-xscripts/travis.sh2
-rw-r--r--shared/models/activitypub/activitypub-ordered-collection.ts2
-rw-r--r--shared/models/users/user-login.model.ts2
-rw-r--r--tslint.json1
5 files changed, 4 insertions, 5 deletions
diff --git a/client/tslint.json b/client/tslint.json
index c1ca4336e..db852d9f8 100644
--- a/client/tslint.json
+++ b/client/tslint.json
@@ -6,7 +6,7 @@
6 "eofline": true, 6 "eofline": true,
7 "max-line-length": [true, 140], 7 "max-line-length": [true, 140],
8 "no-floating-promises": false, 8 "no-floating-promises": false,
9 "no-unused-variable": false, // Bug, wait TypeScript 2.4 9 "no-unused-variable": false, // Memory issues
10 "member-ordering": [true, 10 "member-ordering": [true,
11 "public-before-private", 11 "public-before-private",
12 "static-before-instance", 12 "static-before-instance",
diff --git a/scripts/travis.sh b/scripts/travis.sh
index a3e065d47..ea0dc8699 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -25,5 +25,5 @@ elif [ "$1" = "lint" ]; then
25 npm run lint || exit -1 25 npm run lint || exit -1
26 26
27 cd .. || exit -1 27 cd .. || exit -1
28 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" || exit -1 28 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" || exit -1
29fi 29fi
diff --git a/shared/models/activitypub/activitypub-ordered-collection.ts b/shared/models/activitypub/activitypub-ordered-collection.ts
index 487d8cee0..dfec0bb76 100644
--- a/shared/models/activitypub/activitypub-ordered-collection.ts
+++ b/shared/models/activitypub/activitypub-ordered-collection.ts
@@ -1,5 +1,3 @@
1import { Activity } from './activity'
2
3export interface ActivityPubOrderedCollection<T> { 1export interface ActivityPubOrderedCollection<T> {
4 '@context': string[] 2 '@context': string[]
5 type: 'OrderedCollection' | 'OrderedCollectionPage' 3 type: 'OrderedCollection' | 'OrderedCollectionPage'
diff --git a/shared/models/users/user-login.model.ts b/shared/models/users/user-login.model.ts
index b0383c695..1e85ab30b 100644
--- a/shared/models/users/user-login.model.ts
+++ b/shared/models/users/user-login.model.ts
@@ -2,4 +2,4 @@ export interface UserLogin {
2 access_token: string 2 access_token: string
3 refresh_token: string 3 refresh_token: string
4 token_type: string 4 token_type: string
5} \ No newline at end of file 5}
diff --git a/tslint.json b/tslint.json
index 9acb24630..92d0bd2b1 100644
--- a/tslint.json
+++ b/tslint.json
@@ -7,6 +7,7 @@
7 "indent": ["spaces"], 7 "indent": ["spaces"],
8 "ter-indent": [true, 2], 8 "ter-indent": [true, 2],
9 "max-line-length": [true, 140], 9 "max-line-length": [true, 140],
10 "no-unused-variable": false, // Memory issues
10 "no-floating-promises": false 11 "no-floating-promises": false
11 } 12 }
12} 13}