Commit Graph

82 Commits

Author SHA1 Message Date
Julian Lam
c7fb07e2e5 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/templates/header.tpl
	src/webserver.js
2013-05-02 09:23:11 -04:00
Julian Lam
3ca880d81e interim commit 2013-05-02 09:13:09 -04:00
Julian Lam
3ef6cf6cb2 updaring config template 2013-05-01 22:15:07 -04:00
psychobunny
279a0053f1 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 02:04:35 +00:00
psychobunny
f68d9c6635 forgot to update config, derp 2013-05-02 02:04:28 +00:00
Julian Lam
829dae05c5 updating header to show user label when logged in, and register/login when
not
2013-05-01 22:00:49 -04:00
Julian Lam
a537c4d805 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-01 21:04:05 -04:00
Julian Lam
d712f57141 refactored user authentication (passport-local, instead of my own
half-baked implementation)
2013-05-01 21:03:49 -04:00
psychobunny
9119a9d104 small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now 2013-05-01 22:19:54 +00:00
psychobunny
1bec9fc5aa breadcrumbs, and changed home in nav to 'forum' 2013-05-01 21:52:40 +00:00
psychobunny
b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls 2013-05-01 21:26:47 +00:00
psychobunny
e658531a67 replies are up 2013-05-01 20:58:36 +00:00
psychobunny
a7f4c16140 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 18:30:30 +00:00
Julian Lam
924618fc29 removed account_settings template 2013-05-01 14:29:49 -04:00
psychobunny
1f97fefac0 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 18:25:29 +00:00
psychobunny
0f3f2bb859 post replies, unfinished 2013-05-01 18:25:24 +00:00
Julian Lam
62779ef0dd relative time on topics and posts 2013-05-01 14:23:57 -04:00
psychobunny
f8345a1223 added timestamp to record users 2013-05-01 18:01:02 +00:00
psychobunny
ab456e07af fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up) 2013-05-01 17:01:05 +00:00
psychobunny
a655ebb290 most users ever online block 2013-05-01 16:14:09 +00:00
psychobunny
bb8d5098e4 fixed bottom border on last topicrow 2013-05-01 15:44:54 +00:00
psychobunny
93d7f8d52c hide latest user block if doesn't exist 2013-05-01 15:41:01 +00:00
Baris Soner Usakli
20aa5d439e log server errors in browser
added uid to posts
2013-04-30 12:40:16 -04:00
Julian Lam
a6cbed94fc changing some niggling CSS to turn on bootstrap-responsive 2013-04-29 22:23:40 -04:00
Julian Lam
cb9a110a5d RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
2013-04-29 12:22:02 -04:00
psychobunny
303452ef8c fixed conflicts 2013-04-28 20:10:11 +00:00
psychobunny
126f817f7d updates to posts 2013-04-28 20:07:42 +00:00
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.
2013-04-28 13:58:19 -04:00
Julian Lam
19cd9e05ed fixing login and logout sessions 2013-04-28 13:28:20 -04:00
psychobunny
7f4ea6e19b Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-04-25 21:55:23 +00:00
psychobunny
98ca14e31c started working on threadss, implemented slug url, fixed crashing bug during post creation 2013-04-25 21:55:11 +00:00
Julian Lam
2a9c33b9f8 user activity counter (bug present where all users register as same session? this isn't good....) 2013-04-25 16:27:22 -04:00
psychobunny
e5a6d1bf8b added a way to track socket listners added to the page to prevent memory leaks and duplicated definitions of events 2013-04-25 19:35:14 +00:00
psychobunny
faa3924734 prevent scripts in tpls from being executed more than once 2013-04-25 19:24:49 +00:00
psychobunny
880d6832be Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-04-25 19:13:31 +00:00
psychobunny
5173498180 client side templates in, fixed home page to parse templates on ajaxify, added footer to the page transition animation for smoothness 2013-04-25 19:13:23 +00:00
Julian Lam
81364580ed new 403 page 2013-04-25 14:21:00 -04:00
psychobunny
7e637a93bb added login message + ajaxify.go to homepage (should add redirect code to originating page later) 2013-04-25 18:00:11 +00:00
Julian Lam
f774974803 logout functionality 2013-04-25 12:59:31 -04:00
psychobunny
a16f72e11c redis - added mget and multi, finished initial topics listview on home page, finished get topics method calls 2013-04-24 22:24:20 +00:00
psychobunny
877219cb58 fixed conflicts 2013-04-24 21:19:04 +00:00
psychobunny
e50e136d83 inbetween some changes but asked to pull so I'll comment better later 2013-04-24 21:16:10 +00:00
Julian Lam
a98cd26fa6 Merge branch 'master' of github.com:psychobunny/node-forum 2013-04-24 17:14:14 -04:00
Julian Lam
0985087f5d auth... 2013-04-24 17:14:05 -04:00
psychobunny
78d753b8f9 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-04-24 20:47:46 +00:00
psychobunny
fffe5eb78c tried to get innerHTML of an input by accident 2013-04-24 20:47:41 +00:00
Julian Lam
71e410d571 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/webserver.js
2013-04-24 16:44:12 -04:00
Julian Lam
c1186f396e some work on session login etc 2013-04-24 16:42:12 -04:00
psychobunny
d711a4e334 added post button, post window, added click handler to toaster alert, started on posts and topics schema and code 2013-04-24 20:40:34 +00:00
Julian Lam
dfd5c9960b finished pw reset page, finally 2013-04-23 23:28:34 -04:00