Julian Lam
|
8be3b8c05e
|
accidentally developed on a merge commit... *fingers crossed*
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
public/templates/login.tpl
|
12 years ago |
|
Julian Lam
|
32d9b5349e
|
beginning google integration
|
12 years ago |
psychobunny
|
c73feeea2a
|
hide alternate login strategies if config is not set
|
12 years ago |
|
Julian Lam
|
417e722ae7
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
60c1e937a1
|
tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
|
12 years ago |
Baris Soner Usakli
|
06d013e6de
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
Baris Soner Usakli
|
a47491225a
|
clear topic and content after post
|
12 years ago |
|
Julian Lam
|
5708076137
|
enabling twitter login
|
12 years ago |
|
Julian Lam
|
8e5714cab4
|
skeleton for twitter integration via passport
|
12 years ago |
|
Julian Lam
|
69bafcf19c
|
refactoring register to use form post instead of socket (for passport integration)
|
12 years ago |
|
Julian Lam
|
4c80e4f37d
|
minor style changes to header
|
12 years ago |
|
Julian Lam
|
09fb79d3a2
|
integrated LESS middleware to static served CSS/less files
|
12 years ago |
|
Julian Lam
|
c7fb07e2e5
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
public/templates/header.tpl
src/webserver.js
|
12 years ago |
|
Julian Lam
|
3ca880d81e
|
interim commit
|
12 years ago |
Julian Lam
|
3ef6cf6cb2
|
updaring config template
|
12 years ago |
|
psychobunny
|
279a0053f1
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
f68d9c6635
|
forgot to update config, derp
|
12 years ago |
|
Julian Lam
|
829dae05c5
|
updating header to show user label when logged in, and register/login when
not
|
12 years ago |
|
Julian Lam
|
a537c4d805
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
d712f57141
|
refactored user authentication (passport-local, instead of my own
half-baked implementation)
|
12 years ago |
|
psychobunny
|
9119a9d104
|
small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now
|
12 years ago |
|
psychobunny
|
1bec9fc5aa
|
breadcrumbs, and changed home in nav to 'forum'
|
12 years ago |
|
psychobunny
|
b2bc967e9b
|
got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
|
12 years ago |
|
psychobunny
|
e658531a67
|
replies are up
|
12 years ago |
|
psychobunny
|
a7f4c16140
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
924618fc29
|
removed account_settings template
|
12 years ago |
|
psychobunny
|
1f97fefac0
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
0f3f2bb859
|
post replies, unfinished
|
12 years ago |
|
Julian Lam
|
62779ef0dd
|
relative time on topics and posts
|
12 years ago |
|
psychobunny
|
f8345a1223
|
added timestamp to record users
|
12 years ago |
|
psychobunny
|
ab456e07af
|
fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up)
|
12 years ago |
|
psychobunny
|
a655ebb290
|
most users ever online block
|
12 years ago |
|
psychobunny
|
bb8d5098e4
|
fixed bottom border on last topicrow
|
12 years ago |
|
psychobunny
|
93d7f8d52c
|
hide latest user block if doesn't exist
|
12 years ago |
|
Baris Soner Usakli
|
20aa5d439e
|
log server errors in browser
added uid to posts
|
12 years ago |
|
Julian Lam
|
a6cbed94fc
|
changing some niggling CSS to turn on bootstrap-responsive
|
12 years ago |
|
Julian Lam
|
cb9a110a5d
|
RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
|
12 years ago |
|
psychobunny
|
303452ef8c
|
fixed conflicts
|
12 years ago |
|
psychobunny
|
126f817f7d
|
updates to posts
|
12 years ago |
|
Julian Lam
|
f4b14df195
|
some more fixes to the session handling to ignore the /api folder, and
refactoring how the public directory is set up in webserver.js.
THIS COMMIT ALTERS NODEBB'S DEPENDENCIES!
Please run npm install after pulling.
|
12 years ago |
|
Julian Lam
|
19cd9e05ed
|
fixing login and logout sessions
|
12 years ago |
|
psychobunny
|
7f4ea6e19b
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
98ca14e31c
|
started working on threadss, implemented slug url, fixed crashing bug during post creation
|
12 years ago |
|
Julian Lam
|
2a9c33b9f8
|
user activity counter (bug present where all users register as same session? this isn't good....)
|
12 years ago |
|
psychobunny
|
e5a6d1bf8b
|
added a way to track socket listners added to the page to prevent memory leaks and duplicated definitions of events
|
12 years ago |
|
psychobunny
|
faa3924734
|
prevent scripts in tpls from being executed more than once
|
12 years ago |
|
psychobunny
|
880d6832be
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
|
12 years ago |
|
psychobunny
|
5173498180
|
client side templates in, fixed home page to parse templates on ajaxify, added footer to the page transition animation for smoothness
|
12 years ago |
|
Julian Lam
|
81364580ed
|
new 403 page
|
12 years ago |
|
psychobunny
|
7e637a93bb
|
added login message + ajaxify.go to homepage (should add redirect code to originating page later)
|
12 years ago |