Skip to content

Commit 1dedb85

Browse files
committed
merge master
1 parent e8e15ee commit 1dedb85

File tree

11 files changed

+89
-1218
lines changed

11 files changed

+89
-1218
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ lib-cov
77
*.pid
88
*.gz
99
*.swp
10-
*.swo
1110
.DS_Store
12-
*~
1311

1412
pids
1513
logs

app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,14 @@ app.post('/learnpath/new', routes.postNewLearnpath);
127127

128128

129129
app.get('/login', routes.login);
130+
app.post('/login', routes.postLogin);
131+
130132
app.get('/users/:uid/profile', routes.profile);
131133
app.get('/learnpath/:lid', routes.learnpath);
132134
app.get('/tutorial/:tid', routes.tutorial);
133135
app.get('/profile/:uid', user.profile);
134136
app.get('/search', search.list);
135-
app.get('/topic_hint', routes.topic_hint);
137+
136138

137139

138140
app.post('/tutorial/:tid/comment',routes.postTutorialComment);

0 commit comments

Comments
 (0)