Skip to content

Merge into Master #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Feb 2, 2019
Merged

Merge into Master #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5626dc7
Bump @types/express from 4.11.1 to 4.16.1
dependabot-support Jan 22, 2019
4a42e96
Bump mongoose from 5.4.5 to 5.4.6
dependabot-support Jan 22, 2019
2f5c1fc
Bump @types/mongoose from 5.3.8 to 5.3.9
dependabot-support Jan 22, 2019
9f9012a
Add batch script to update hacker statuses (#308)
pierreTklein Jan 22, 2019
24bf4c5
Add teamId to expansion of query result, and keep team member ids in …
pierreTklein Jan 22, 2019
7096c14
Bump @types/mongoose from 5.3.9 to 5.3.10
dependabot-support Jan 25, 2019
0bd5865
Bump mongoose from 5.4.6 to 5.4.7
dependabot-support Jan 26, 2019
0bf702b
Feature/ticket email (#313)
pierreTklein Jan 28, 2019
aa35f0d
Bump qrcode from 1.3.2 to 1.3.3
dependabot-support Jan 29, 2019
00f8182
Bump jslint from 0.12.0 to 0.12.1
dependabot-support Jan 29, 2019
9c61a97
Add search to sponsor (#317)
YiFeiZhang2 Jan 29, 2019
a2b0679
Bump @google-cloud/storage from 2.3.1 to 2.4.1
dependabot-support Jan 29, 2019
4407946
Update week-of email (#321)
pierreTklein Jan 30, 2019
7abfed5
Bump mongoose from 5.4.7 to 5.4.8
dependabot-support Jan 30, 2019
bff5b1e
Bump @types/mongoose from 5.3.10 to 5.3.11
dependabot-support Jan 31, 2019
1692455
Bump @types/mongoose from 5.3.11 to 5.3.12
dependabot-support Feb 1, 2019
acbe1df
Bump mongoose from 5.4.8 to 5.4.9
dependabot-support Feb 1, 2019
b81d02f
Make token available for 48 hours (#328)
pierreTklein Feb 2, 2019
85972bb
Merge branch 'master' into develop
YiFeiZhang2 Feb 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ app.use(cookieSession({
name: "session",
keys: [process.env.COOKIE_SECRET],
// Cookie Options
maxAge: 60 * 60 * 1000 //Logged in for 1 hour
maxAge: 48 * 60 * 60 * 1000 //Logged in for 48 hours
}));
app.use(passport.initialize());
app.use(passport.session()); //persistent login session
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"handlebars": "^4.0.12",
"jsonwebtoken": "^8.1.0",
"memory-cache": "^0.2.0",
"mongoose": "^5.4.8",
"mongoose": "^5.4.9",
"multer": "^1.3.1",
"passport": "^0.4.0",
"passport-local": "^1.0.0",
Expand All @@ -39,7 +39,7 @@
"@types/express": "^4.16.1",
"@types/google-cloud__storage": "^1.7.2",
"@types/mongodb": "^3.1.19",
"@types/mongoose": "^5.3.10",
"@types/mongoose": "^5.3.12",
"@types/multer": "^1.3.7",
"apidoc": "^0.17.7",
"chai-http": "^4.2.1",
Expand Down